Commit Graph

41159 Commits

Author SHA1 Message Date
Morris Jobke f368481c23 Merge pull request #6928 from nextcloud/remove-unneeded-method
Remove unused method of OC_App
2017-10-24 17:50:43 +02:00
Morris Jobke 77697288de Merge pull request #6930 from nextcloud/use-proper-di-for-repair-step
Use proper DI for repair command
2017-10-24 17:50:03 +02:00
Morris Jobke 43e498844e
Use ::class in test mocks
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-24 17:45:32 +02:00
Morris Jobke dc823043e0
Replace ... with …
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-24 17:38:30 +02:00
Morris Jobke b1f77aca4e Merge pull request #6919 from nextcloud/di-appmanager-encryption-migration
Use DI for IAppManager to encryption migration
2017-10-24 16:33:03 +02:00
Björn Schießle 306d4e1d40 Merge pull request #6922 from nextcloud/unneeded-isEnabled-check
Remove unneeded check if app is enabled
2017-10-24 15:59:13 +02:00
Björn Schießle f8e4d0d564 Merge pull request #6929 from nextcloud/deprecate-private-method
Deprecate OC_App:isEnabled
2017-10-24 15:56:54 +02:00
Morris Jobke 99934134dc
Use DI for IAppManager to encryption migration
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-24 15:52:00 +02:00
Morris Jobke ce0c45a4ea
Use proper DI for security middleware for app enabled check
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-24 15:36:28 +02:00
Joas Schilling 2b425960b8
Define constants for the talk user agents
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-24 15:10:35 +02:00
Morris Jobke dd192e5df9
Use proper DI for repair command
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-24 14:13:45 +02:00
Morris Jobke 7b7bf73670
Deprecate OC_App:isEnabled
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-24 14:05:46 +02:00
Morris Jobke df85b13296
Remove unused method of OC_App
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-24 14:04:09 +02:00
Morris Jobke 3eaf23f29f Merge pull request #6920 from nextcloud/appmanager-usage
Use appmanager instead of OC_App for check for enabled app
2017-10-24 13:53:17 +02:00
Roeland Jago Douma 80e4d48db9
Update autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 08:28:07 +02:00
Roeland Jago Douma e2139d4b56
Add logrote as a default background job
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 08:28:06 +02:00
Nextcloud bot 1860190305
[tx-robot] updated from transifex 2017-10-24 00:08:45 +00:00
Morris Jobke 3aa3e92281 Merge pull request #6864 from nextcloud/phpdoc-fix-issues
Fix some issues in phpDoc comments
2017-10-23 14:52:07 -07:00
Morris Jobke 5987099d2a
Remove unneeded check if app is enabled
App code will not be executable if the app is not enabled, because the autoloader refuses to load that class.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-23 23:47:06 +02:00
Morris Jobke f884e762bc
Use appmanager instead of OC_App for check for enabled app
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-23 23:31:17 +02:00
Julius Härtl b3c025fd08
Revert copyright changes
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-10-23 23:23:56 +02:00
Julius Härtl 4cfa1c66b8
Doc: Fix phpDoc issues
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-10-23 23:23:56 +02:00
Joas Schilling 8062547e66 Merge pull request #6915 from nextcloud/css-border-radius
Border-radius does not need the vendor prefixes anymore
2017-10-23 21:47:20 +02:00
John Molakvoæ 59598b8a27 Merge pull request #6916 from nextcloud/css-box-sizing
Box-sizing does not need vendor prefix anymore
2017-10-23 21:13:17 +02:00
John Molakvoæ c68a44d5f0 Merge pull request #6917 from nextcloud/css-box-shadow
Box-shadow does not need vendor prefix anymore
2017-10-23 21:12:29 +02:00
Morris Jobke 28016a2a70
Box-shadow does not need vendor prefix anymore
https://developer.mozilla.org/en-US/docs/Web/CSS/box-shadow
http://caniuse.com/#search=box-shadow

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-23 20:14:31 +02:00
Morris Jobke c2004afb4f
Box-sizing does not need vendor prefix anymore
http://caniuse.com/#search=box-sizing

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-23 20:10:39 +02:00
Morris Jobke b29fa32939
Border-radius does not need the vendor prefixes anymore
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-23 20:04:36 +02:00
Morris Jobke 2f8c7f0de2 Merge pull request #6780 from nextcloud/rakekniven-patch-1
Update file-upload.js
2017-10-23 09:15:57 -07:00
Arthur Schiwon fb40afc4d4
enable autocomplete when editing comments
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-23 18:00:39 +02:00
John Molakvoæ e5b619d0a6 Merge pull request #6848 from nextcloud/user-app-nav-to-css-guidelines
User settings app-navigation to css guidelines
2017-10-23 17:51:03 +02:00
Lukas Reschke 14a37d3512 Merge pull request #6892 from nextcloud/rakekniven-patch-2
Update settings-admin-caldav.php
2017-10-23 16:17:18 +02:00
Arthur Schiwon eb8f1247fe
fix unstable comment order
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-23 15:37:36 +02:00
Lukas Reschke 886bb31ec3 Merge pull request #6913 from nextcloud/tests-for-6837
Provide tests for future timestamp formatting
2017-10-23 14:46:10 +02:00
Morris Jobke ca4278a4d7
Provide tests for future timestamp formatting
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-23 14:20:21 +02:00
Joas Schilling 143ff6a622
Add a doc why this should not be removed
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-23 12:35:55 +02:00
Nextcloud bot db1096bcfd
[tx-robot] updated from transifex 2017-10-23 00:08:39 +00:00
Georg Ehrke 1855204ad9
remove reminders from read-only shared calendars
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-10-22 14:19:29 +02:00
Arthur Schiwon de8a475b0b
fix contactsmenu-popup
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:14:34 +02:00
Arthur Schiwon ccbcce978f
convert mentions after save to the plain format we use
also ensures proper rendering, even of edited comments

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:14:34 +02:00
Arthur Schiwon 8d9f485b35
when writing a comment, render mentions as they'd appear anywhere
i.e. avatar with displaymenu and contactsmenu-popover

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:14:33 +02:00
Arthur Schiwon ec5607544c
turn textarea to contenteditable div
we will need it for nice formatting of the mentioned user

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:14:33 +02:00
Arthur Schiwon df0e72d8d9
contenteditable divs should look like textareas
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:14:33 +02:00
Arthur Schiwon d1afbedc5f
setup atwho autocomplete
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:14:33 +02:00
Arthur Schiwon 8e60a2bd28
add At.js and dependencies
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:14:33 +02:00
Arthur Schiwon 04fafdd505
fix class name in info.xml
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:13:37 +02:00
Arthur Schiwon 8722458d2a
ensure that sorting is stable
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:13:37 +02:00
Arthur Schiwon 8f0a9ae51f
split walking the tree from operating on it
so walking it is reusable

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:13:37 +02:00
Arthur Schiwon fd6daf8d19
AutoCompletion backend
* introduce a Controller for requests
* introduce result sorting mechanism
* extend Comments to retrieve commentors (actors) in a tree
* add commenters sorter
* add share recipients sorter

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:13:32 +02:00
blizzz cd80e5dc7c Merge pull request #6758 from nextcloud/allow-0-quota-again
Allow quota of 0 again
2017-10-22 14:10:55 +02:00