wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
39557 commits 157 branches 562 tags 714 MiB
Commit graph

39557 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robin Appelman
e8f5c21db9
Fix trait usage 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-06-23 12:37:42 +02:00
Arthur Schiwon
28fd18de43
add missing pieces to Settings Manager and fix and extend its unit tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:37:41 +02:00
Arthur Schiwon
f873182965
remove obsolete files 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:37:41 +02:00
Arthur Schiwon
3dca4de8b3
add Additional (+ Fallback) section for Personal settings 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:36:38 +02:00
Arthur Schiwon
7f48b6f14f
Adopt DB and Manager to personal settings structure 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:36:38 +02:00
Arthur Schiwon
d56e86cfde
sync clients have their own place 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:36:38 +02:00
Arthur Schiwon
8c076e0bda
take over app passwords 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:36:38 +02:00
Arthur Schiwon
489ac4391b
convert Sessions section 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:36:38 +02:00
Arthur Schiwon
8bd887b2c6
add storage info, fix URL generation 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:36:38 +02:00
Arthur Schiwon
9e924d74c9
fix displaying groups in personal info 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:36:38 +02:00
Arthur Schiwon
045f652ef2
completing PersonalInfo 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:36:37 +02:00
Arthur Schiwon
039ee7e3aa
brief, incomplete personal info settings implementation 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:36:37 +02:00
Arthur Schiwon
b68fdb473d
Extend interfaces 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:36:37 +02:00
Arthur Schiwon
560ab2e911
one settings link, common template, styling 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:36:37 +02:00
Arthur Schiwon
247b305b79
add route and controller. consolidate common settings functions in a trait. 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:36:17 +02:00
blizzz
d9beeaec90 Merge pull request #5508 from nextcloud/no-activity-before-login 
Don't create activities for email and password change before login
 2017-06-23 12:04:49 +02:00
Nextcloud bot
c935f1f9cc
[tx-robot] updated from transifex 2017-06-23 00:09:12 +00:00
Morris Jobke
d611d9c126 Merge pull request #5498 from nextcloud/allow-to-force-a-language 
Allow to force a language and set it via the ocs api
 2017-06-22 12:47:00 -05:00
blizzz
65b4e2a1db Merge pull request #5491 from nextcloud/issue-5457-create-users-in-non-default-backends 
Create users in non default backends first
 2017-06-22 13:01:36 +02:00
Joas Schilling
c50cb6ad81
Don't create activities for email and password change before login 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-22 09:02:12 +02:00
Nextcloud bot
e1e4d188f9
[tx-robot] updated from transifex 2017-06-22 00:08:37 +00:00
Morris Jobke
18824d476e Merge pull request #5474 from nextcloud/wording-4925 
Improve wording of various error messages
 2017-06-21 17:28:54 -05:00
Morris Jobke
6a1c4990ab Merge pull request #5252 from derkostka/master 
Use realpath to obtain the webroot.
 2017-06-21 17:25:12 -05:00
Jan-Christoph Borchardt
fd63577089 Improve wording of various error messages 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-06-21 14:51:59 -05:00
Morris Jobke
07a0f95ebf Update autoloader 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-06-21 14:41:47 -05:00
Joas Schilling
fa717d9706
Add unit tests for the new code 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-21 12:21:21 +02:00
Joas Schilling
7816c54625
Allow to force a language and set it via the ocs api 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-21 11:34:52 +02:00
Nextcloud bot
146c699eb4
[tx-robot] updated from transifex 2017-06-21 00:08:15 +00:00
Sebastian Kostka
c7ce42e45b Squashed the webroot fix 
Signed-off-by: Sebastian Kostka <sebastian.kostka@gmail.com>
 2017-06-20 22:15:20 +02:00
Joas Schilling
b726204f91
Create users in non default backends first 
Most of the time, when people have multiple backends or add a
custom backend, they want to create the users there and not in
the default backend. But since that is registered first, users
were always created there.

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-20 19:59:41 +02:00
Morris Jobke
b556c4855c Merge pull request #5479 from nextcloud/pr-5459-follow-up 
Also allow group admins to toogle the storage location
 2017-06-20 10:47:50 -05:00
Joas Schilling
e30ed1de84
Also allow group admins to toogle the storage location 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-20 10:35:22 +02:00
Nextcloud bot
2660a3b49c
[tx-robot] updated from transifex 2017-06-20 00:08:41 +00:00
Morris Jobke
60edf2f18a Merge pull request #5459 from nextcloud/issue-5399-dont-reload-on-subadmin-setting-change 
Don't try to save the setting when its not an admin
 2017-06-19 11:35:46 -05:00
Morris Jobke
09a027ddff Merge pull request #5450 from nextcloud/fix-appmenu-more-theming 
Fix more icon in apps menu on bright backgrounds
 2017-06-19 08:28:02 -05:00
Robin Appelman
c9ef998f17 Merge pull request #5091 from nextcloud/shared-cache-during-init 
dont die if we try to access the shared cache while setting up the shared storage
 2017-06-19 13:47:59 +02:00
Jan-Christoph Borchardt
a5ad6def3d Merge pull request #5447 from nextcloud/calendar-icon-white 
Add white version of the calendar.svg icon
 2017-06-19 13:18:46 +02:00
Joas Schilling
35413d9912
Don't try to save the setting when its not an admin 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-19 12:55:00 +02:00
Morris Jobke
381850bd07 Merge pull request #5429 from nextcloud/cache-baseurl 
Use base url for cache prefix and SCSS caching
 2017-06-18 22:21:40 -05:00
Nextcloud bot
76d10bc46b
[tx-robot] updated from transifex 2017-06-19 00:08:20 +00:00
Morris Jobke
38cf9b8dc0 Merge pull request #5423 from nextcloud/better-svg-optimization 
Remove XML header and line breaks in SVG files.
 2017-06-17 18:35:14 -05:00
Marin Treselj
d3d0ce8df3
Add CSS class for icon-calendar 
Signed-off-by: Marin Treselj <marin@pixelipo.com>
 2017-06-17 12:27:05 +02:00
Julius Härtl
adf2f88873
Fix more icon in apps menu on bright backgrounds 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-06-17 10:14:21 +02:00
Marin Treselj
9d25b86a83
Add viewport to all core/img/places/* icons. 
Also removed some unneeded style declarations.

Signed-off-by: Marin Treselj <marin@pixelipo.com>
 2017-06-17 09:32:59 +02:00
Lukas Reschke
d7ebe0b37b Merge pull request #5436 from jplitza/patch-1 
Fix 500 Internal Server Error on writing
 2017-06-17 08:21:03 +02:00
Nextcloud bot
26d6c4a64a
[tx-robot] updated from transifex 2017-06-17 00:08:26 +00:00
Marin Treselj
40c1f3e3ce
Add white version of the calendar.svg icon 
There's no reason for not including it and it is needed for Deck app.

Signed-off-by: Marin Treselj <marin@pixelipo.com>
 2017-06-16 23:06:25 +02:00
Robin Appelman
cc0ff6f5e3 Merge pull request #5177 from Bekcpear/master 
Fix upload remaining time
 2017-06-16 14:11:55 +02:00
Jan-Philipp Litza
0b066d9297 Fix 500 Internal Server Error on writing 
In some not yet completely determined configurations, the following error could occur while writing a file:

Error: Call to a member function getUsers() on null
    /var/www/nextcloud/lib/private/Share20/Manager.php - line 1277: OC\Share20\DefaultShareProvider->getAccessList(Array, true)
    /var/www/nextcloud/lib/private/Share20/ShareHelper.php - line 51: OC\Share20\Manager->getAccessList(Object(OC\Files\Node\Folder), true, true)
    /var/www/nextcloud/apps/activity/lib/FilesHooks.php - line 616: OC\Share20\ShareHelper->getPathsForAccessList(Object(OC\Files\Node\File))
    /var/www/nextcloud/apps/activity/lib/FilesHooks.php - line 196: OCA\Activity\FilesHooks->getUserPathsFromPath('/path/to/file', 'user')
    /var/www/nextcloud/apps/activity/lib/FilesHooks.php - line 157: OCA\Activity\FilesHooks->addNotificationsForFileAction('/path/to/file', 'file_changed', 'changed_self', 'changed_by')
    /var/www/nextcloud/apps/activity/lib/FilesHooksStatic.php - line 55: OCA\Activity\FilesHooks->fileUpdate('/path/to/file')
    /var/www/nextcloud/lib/private/legacy/hook.php - line 106: OCA\Activity\FilesHooksStatic fileUpdate(Array)
    /var/www/nextcloud/lib/private/Files/View.php - line 1245: OC_Hook emit('OC_Filesystem', 'post_update', Array)
    /var/www/nextcloud/lib/private/Files/View.php - line 1173: OC\Files\View->runHooks(Array, '/path/to/file', true)
    /var/www/nextcloud/lib/private/Files/View.php - line 679: OC\Files\View->basicOperation('file_put_conten...', '/path/to/file', Array, '<?xml version="...')
    /var/www/nextcloud/lib/private/Files/Node/File.php - line 64: OC\Files\View->file_put_contents('/path/to/file', '<?xml version="...')
    [...]

Signed-off-by: Jan-Philipp Litza <janphilipp@litza.de>
 2017-06-16 11:38:22 +02:00
Julius Härtl
41621d3b59
Fix tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-06-16 11:06:26 +02:00