mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
33,153 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

33153 Commits

Author SHA1 Message Date
Lukas Reschke 3985055cda Merge pull request #188 from nextcloud/add-wnd 
Add "Global Auth" option to external storage
 2016-06-21 14:53:44 +02:00
Robin Appelman 6affbdc6e7
Add "Global Auth" option to external storage 
This adds the "Global Auth" option to the external storage implementation, it is basically done by reverting c2c6caee93 from https://github.com/owncloud/core/pull/22468.

This was taken from owncloud/core which is AGPL licensed. Commited with "icewind@owncloud.com" to keep the license header signature in sync.

![2016-06-21_14-01-06](https://cloud.githubusercontent.com/assets/878997/16228662/9c243136-37b8-11e6-9700-c1076ddb3d17.png)
 2016-06-21 14:16:45 +02:00
Thomas Müller f2f1eab7f4 fix broken unit test (#25198) 2016-06-21 13:55:11 +02:00
Vincent Petry af98e3e641 Merge pull request #25042 from owncloud/session-settings-ellipsis 
add overflow ellipsis to session and device tokens list
 2016-06-21 12:15:38 +02:00
Lukas Reschke 097cba8b38 Merge pull request #185 from nextcloud/fix-permission-issue 
Show error message if config file is not readable
 2016-06-21 12:14:24 +02:00
Christoph Wurst db11c20dcb
pass new password instead of username 2016-06-21 11:54:54 +02:00
Lukas Reschke e6895cb3b5 Merge pull request #186 from nextcloud/master-sync-upstream 
[master] sync upstream - 21.06.2016
 2016-06-21 11:43:15 +02:00
Vincent Petry ca168265ef Filter out group shares for owner where owner is included (#25190) 2016-06-21 11:36:28 +02:00
Morris Jobke 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
Lukas Reschke 2b493e2f9d
Merge remote-tracking branch 'upstream/master' into master-sync-upstream 2016-06-21 11:18:22 +02:00
Christoph Wurst b805908dca
update session token password on user password change 2016-06-21 10:24:25 +02:00
Jenkins for ownCloud 0e575c7eea [tx-robot] updated from transifex 2016-06-21 03:49:50 -04:00
Morris Jobke 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
Robin Appelman bb465a7ab4 Catch exceptions while creating shared mounts (#25077) 2016-06-20 22:11:05 +02:00
Vincent Petry dcee528482 Don't send activity to non-admins when assigning invisible tags (#25192) 2016-06-20 22:06:34 +02:00
Patric Lenhart 46d6839914 replaced ownCloud by Nextcloud in config sample 2016-06-20 20:00:18 +02:00
Vincent Petry ef5217d6e8 Merge pull request #25173 from owncloud/fix_conversion_issues 
Fix conversion issues
 2016-06-20 17:15:45 +02:00
Vincent Petry 88b9f5a357 Merge pull request #25162 from owncloud/password-login-forbidden-hint 
Password login forbidden hint
 2016-06-20 17:05:20 +02:00
Morris Jobke 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
Björn Schießle 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
Morris Jobke 8bcc39ff1b Merge pull request #159 from nextcloud/stable9-reintroduce-hackerone 
[stable9] Reintroduce HackerOne into CONTRIBUTING.md
 2016-06-20 15:08:48 +02:00
Morris Jobke 2a79cba955 Merge pull request #158 from nextcloud/reintroduce-hackerone 
Reintroduce HackerOne into CONTRIBUTING.md
 2016-06-20 15:08:34 +02:00
Juan Pablo Villafáñez bb24e40bf4 Fix conversion issues 
Change to phpdoc type for automatic conversion
 2016-06-20 14:51:36 +02:00
Bjoern Schiessle 548b8848ee
no need to mention ownCloud explicitely 2016-06-20 14:46:13 +02:00
Björn Schießle 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
Bjoern Schiessle 9eaccaf2b1
s/ownCloud/Nextcloud 2016-06-20 14:20:48 +02:00
Morris Jobke 22fd33137f Merge pull request #162 from nextcloud/fix-owncloud-reference 
Fix references
 2016-06-20 14:19:30 +02:00
Morris Jobke 62e6de5df3
fix unit tests 2016-06-20 13:52:51 +02:00
Vincent Petry c1770d746d Merge pull request #25159 from owncloud/share-app-initorder 
Delay files_sharing's registerMountProviders
 2016-06-20 13:31:36 +02:00
Morris Jobke 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
Morris Jobke 0194873c55
fix german l10n 2016-06-20 13:14:24 +02:00
Morris Jobke e95c15e53a
fix more strings 2016-06-20 13:14:24 +02:00
Morris Jobke 19b531fd14
fix more strings 2016-06-20 13:14:24 +02:00
Morris Jobke 9107fd6cd6
fix federation strings 2016-06-20 13:13:37 +02:00
Morris Jobke 416466b700
fix l10n 2016-06-20 13:13:37 +02:00
Morris Jobke 9327ded595
fix l10n 2016-06-20 13:13:37 +02:00
Morris Jobke ca4fd9d25b
fix l10n 2016-06-20 13:13:37 +02:00
Morris Jobke e7e0dc608b
fix strings 2016-06-20 13:13:37 +02:00
Morris Jobke 451b630ec8
Fix themes readme 2016-06-20 13:13:37 +02:00
Marius Blüm 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
Thomas Müller 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
William Bargent 99833ecffa Merge pull request #163 from nextcloud/loading-spinner 
make loading spinner thicker and color lighter
 2016-06-20 10:45:55 +01:00
Bjoern Schiessle 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
Vincent Petry 09261fca86 Merge pull request #25010 from owncloud/gdrive-fix-tests 
Fix GDrive test rename overwrite folder
 2016-06-20 11:02:24 +02:00
Jan-Christoph Borchardt 5df13ec5c4 make loading spinner thicker and color lighter 2016-06-20 11:00:42 +02:00
Christoph Wurst 56199eba37
fix unit test warning/errors 2016-06-20 10:41:23 +02:00
Vincent Petry 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
Vincent Petry 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
Vincent Petry e2b0a0f18f Merge pull request #25174 from owncloud/tokenmapper-close-cursor 
close cursor after loading a token
 2016-06-20 09:54:15 +02:00
Vincent Petry 01041045da Merge pull request #25168 from owncloud/capped-user-cache 
Capped cache for user config
 2016-06-20 09:53:58 +02:00