e6895cb3b5
Merge pull request #186 from nextcloud/master-sync-upstream
...
[master] sync upstream - 21.06.2016
2016-06-21 11:43:15 +02:00
ca168265ef
Filter out group shares for owner where owner is included ( #25190 )
2016-06-21 11:36:28 +02:00
191a6c65d9
Show error message if config file is not readable
...
* when the config file is not writable there is a error message shown
* same happens now if the config file is not readable
* fixes #180
2016-06-21 11:25:38 +02:00
2b493e2f9d
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
2016-06-21 11:18:22 +02:00
b805908dca
update session token password on user password change
2016-06-21 10:24:25 +02:00
0e575c7eea
[tx-robot] updated from transifex
2016-06-21 03:49:50 -04:00
b4df57f3f0
Merge pull request #176 from Zollak/replace-owncloud-configsample
...
replaced ownCloud by Nextcloud in config sample
2016-06-20 23:27:44 +02:00
bb465a7ab4
Catch exceptions while creating shared mounts ( #25077 )
2016-06-20 22:11:05 +02:00
dcee528482
Don't send activity to non-admins when assigning invisible tags ( #25192 )
2016-06-20 22:06:34 +02:00
46d6839914
replaced ownCloud by Nextcloud in config sample
2016-06-20 20:00:18 +02:00
ef5217d6e8
Merge pull request #25173 from owncloud/fix_conversion_issues
...
Fix conversion issues
2016-06-20 17:15:45 +02:00
88b9f5a357
Merge pull request #25162 from owncloud/password-login-forbidden-hint
...
Password login forbidden hint
2016-06-20 17:05:20 +02:00
232ab8f6dd
Merge pull request #122 from nextcloud/readd-labels-for-usability
...
Re-add labels for password inputs for usability
2016-06-20 15:14:00 +02:00
987704b27b
Merge pull request #168 from nextcloud/fix-references-trash-and-versions
...
no need to mention ownCloud explicitely in the versions and trash bin app
2016-06-20 15:12:29 +02:00
8bcc39ff1b
Merge pull request #159 from nextcloud/stable9-reintroduce-hackerone
...
[stable9] Reintroduce HackerOne into CONTRIBUTING.md
2016-06-20 15:08:48 +02:00
2a79cba955
Merge pull request #158 from nextcloud/reintroduce-hackerone
...
Reintroduce HackerOne into CONTRIBUTING.md
2016-06-20 15:08:34 +02:00
bb24e40bf4
Fix conversion issues
...
Change to phpdoc type for automatic conversion
2016-06-20 14:51:36 +02:00
548b8848ee
no need to mention ownCloud explicitely
2016-06-20 14:46:13 +02:00
61a3daa55d
Merge pull request #165 from nextcloud/fix-owncloud-references-federated
...
fix references to ownCloud in the federated files sharing app
2016-06-20 14:40:33 +02:00
9eaccaf2b1
s/ownCloud/Nextcloud
2016-06-20 14:20:48 +02:00
22fd33137f
Merge pull request #162 from nextcloud/fix-owncloud-reference
...
Fix references
2016-06-20 14:19:30 +02:00
62e6de5df3
fix unit tests
2016-06-20 13:52:51 +02:00
c1770d746d
Merge pull request #25159 from owncloud/share-app-initorder
...
Delay files_sharing's registerMountProviders
2016-06-20 13:31:36 +02:00
1cba82ae7d
Merge pull request #164 from nextcloud/fix_audit_log
...
don't try to log the currently logged in user, this fails on cronjobs…
2016-06-20 13:27:25 +02:00
0194873c55
fix german l10n
2016-06-20 13:14:24 +02:00
e95c15e53a
fix more strings
2016-06-20 13:14:24 +02:00
19b531fd14
fix more strings
2016-06-20 13:14:24 +02:00
9107fd6cd6
fix federation strings
2016-06-20 13:13:37 +02:00
416466b700
fix l10n
2016-06-20 13:13:37 +02:00
9327ded595
fix l10n
2016-06-20 13:13:37 +02:00
ca4fd9d25b
fix l10n
2016-06-20 13:13:37 +02:00
e7e0dc608b
fix strings
2016-06-20 13:13:37 +02:00
451b630ec8
Fix themes readme
2016-06-20 13:13:37 +02:00
fffe1be609
Merge pull request #157 from nblock/dev/remove-old-contacts-table
...
Remove obsolete contacts_cards_properties table
2016-06-20 12:18:13 +02:00
2951a70fcb
Update ExcludeFileByNameFilterIterator.php ( #25184 )
...
Gentoo & derivatives use a tool named webapp-config which places two files in a webapp-config manager web application:
1: .webapp tag with more detailed info on the configuration done by webapp-config
2: .webapp-appname with the list of files installed by the tool to be able to later only delete stuff that was installed (in case of upgrade) and updated configurations.
2016-06-20 12:02:23 +02:00
99833ecffa
Merge pull request #163 from nextcloud/loading-spinner
...
make loading spinner thicker and color lighter
2016-06-20 10:45:55 +01:00
f9fd7093c0
don't try to log the currently logged in user, this fails on cronjobs. The users are logged anyway
2016-06-20 11:21:27 +02:00
09261fca86
Merge pull request #25010 from owncloud/gdrive-fix-tests
...
Fix GDrive test rename overwrite folder
2016-06-20 11:02:24 +02:00
5df13ec5c4
make loading spinner thicker and color lighter
2016-06-20 11:00:42 +02:00
56199eba37
fix unit test warning/errors
2016-06-20 10:41:23 +02:00
fa533e72cd
Merge pull request #25161 from owncloud/fixgetsharefolder
...
Make getShareFolder use given view instead of static FS
2016-06-20 10:26:03 +02:00
e3ddbeb755
Merge pull request #25120 from owncloud/settings_fix_checkbox_newline
...
files_external: Keep checkbox and its label on one line
2016-06-20 10:00:25 +02:00
e2b0a0f18f
Merge pull request #25174 from owncloud/tokenmapper-close-cursor
...
close cursor after loading a token
2016-06-20 09:54:15 +02:00
01041045da
Merge pull request #25168 from owncloud/capped-user-cache
...
Capped cache for user config
2016-06-20 09:53:58 +02:00
fb36fd495b
fix DefaultTokenMapperTest
2016-06-20 09:25:15 +02:00
5c68084823
fix default token provider tests
2016-06-20 09:17:19 +02:00
9d74ff02a4
fix nitpick
2016-06-20 09:13:47 +02:00
8ef5431e7a
fix user session tests
2016-06-20 09:10:11 +02:00
e4996305fc
Merge pull request #160 from nextcloud/rename_in_apps
...
rename owncloud to nextcloud in Official apps button popup
2016-06-20 08:53:02 +02:00
7a09b3daff
fix translations
2016-06-20 08:28:54 +02:00
Lukas Reschke
Vincent Petry
Morris Jobke
Lukas Reschke
Christoph Wurst
Jenkins for ownCloud
Robin Appelman
Patric Lenhart
Björn Schießle
Juan Pablo Villafáñez
Marius Blüm
Thomas Müller
William Bargent
Jan-Christoph Borchardt