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

7489 commits

Author SHA1 Message Date
blizzz
72d3bfcf56 Merge pull request #4890 from nextcloud/unify-settings 
Unify settings
 2017-06-29 20:02:09 +02:00
Roeland Jago Douma
4a9277d8da Merge pull request #5460 from nextcloud/objectstore-error-logging 
improved logging of objectore errors
 2017-06-29 11:22:17 +02:00
Arthur Schiwon
005ef115fb
move admin templates to the right place 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-27 12:25:37 +02:00
Morris Jobke
86efe9569a Merge pull request #5518 from nextcloud/deprecate-old-log 
Deprecate static writeLog() method
 2017-06-23 16:03:13 -05:00
Morris Jobke
d6adc0eba1 Deprecate static writeLog() method 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-06-23 11:21:46 -05:00
Arthur Schiwon
d881a3c37b
adapt to force language changes 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 13:15:08 +02:00
Arthur Schiwon
7817811d13
do not offer additional settings when there is no content 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:38:05 +02:00
Arthur Schiwon
07cf046216
take over changes from #5166 and follow #5267 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:37:42 +02:00
Arthur Schiwon
d7a2290ce1
take over changes from #5084 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:37:42 +02:00
Robin Appelman
6e314ddabe
fix getting sections 
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
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
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
Robin Appelman
0a12b5d38d improved logging of objectore errors 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-06-21 17:33:26 -05: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
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
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
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
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
517dfdda0d
Fix theming app to also use the prefix 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-06-16 10:51:37 +02:00
Julius Härtl
f039ba7480
Add tests and inject IRequest 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-06-16 10:51:31 +02:00
Morris Jobke
5bf447649d Merge pull request #5421 from nextcloud/5190-master 
[master] Treat PHP Errors on User session regenerate
 2017-06-15 10:11:56 -05:00
blizzz
8ccc2e2758 Merge pull request #5396 from nextcloud/gpx-mimetype 
add gpx mimetype
 2017-06-15 13:23:32 +02:00
Julius Härtl
0999ed1778
Do not open version file again 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-06-15 12:46:51 +02:00
Julius Härtl
0789adaf95
Make cache and scss caching depend on the baseUrl 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-06-15 12:46:24 +02:00
Arthur Schiwon
d1a8269de3
Forward port of #5190 to master 
Treat PHP Errors on User session regenerate

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

remove unnecessary lines…

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

change PHP errors to ErrorException in the session (PHP >=7)

Otherwise it might be that authentication apps are being disabled on
during operation while in fact the session handler has hiccup.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-15 11:20:49 +02:00
Morris Jobke
8eb955d5c6 Merge pull request #4993 from michaelletzgus/emit_css-tags 
Emit css tags
 2017-06-14 11:29:25 -05:00
Arthur Schiwon
ed49d9b9ed
a parameter too much 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-14 14:41:30 +02:00
Arthur Schiwon
c1d9565131
added kml, kmz, tcx types as well while at it 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-14 11:02:05 +02:00
Arthur Schiwon
addcda9325
add geospatial mime types repair step 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-14 10:48:56 +02:00
Lukas Reschke
b76e43e0a3 Merge pull request #5361 from nextcloud/exclude-files-external-dir-from-encryption 
don't try to encrypt/decrypt the certificate bundle
 2017-06-14 09:50:45 +02:00
Morris Jobke
0b92700b52 Merge pull request #5072 from mjmunger/master 
Fixed a crash caused by Local::copyFromStorage() not conforming to Co…
 2017-06-13 17:51:16 -05:00
Joas Schilling
0f8c1b13a3
Fix unknown share token 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-13 18:44:50 +02:00
Lukas Reschke
c46422b780 Merge pull request #5343 from nextcloud/share-filter-missing-groups 
filter missing groups in share provider
 2017-06-13 10:53:26 +02:00
Bjoern Schiessle
86eb23b91e
don't try to encrypt/decrypt the certificate bundle 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-06-13 09:50:45 +02:00
Morris Jobke
6a06df824e Merge pull request #5027 from nextcloud/require-nextcloud-version-as-per-docs 
Version and dependency are now required
 2017-06-12 22:33:16 -05:00