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

31514 Commits

Author SHA1 Message Date
Marius Blüm efc4a1b3bf Merge pull request #228 from nextcloud/show-updater-all-the-time 
Revert "[stable9] Don't show the updater if updater is incompatible"
 2016-06-27 06:53:20 +02:00
Morris Jobke 62391e9776 Merge pull request #210 from Zollak/stable9-config-sample 
[stable9] changed ownCloud to Nextcloud, updated config options
 2016-06-26 23:59:44 +02:00
Patric Lenhart c9898fac4a removed more options that are not in stable9 2016-06-26 23:32:40 +02:00
Lukas Reschke f896470542
Revert "[stable9] Don't show the updater if updater is incompatible" 
This reverts commit 5e2bf16db1.
 2016-06-26 17:33:05 +02:00
Patric Lenhart 506e739a20 removed parameter that is not relevant for stable9 2016-06-26 15:17:38 +02:00
Lukas Reschke 49a916fb46 Merge pull request #225 from nextcloud/stable9-upstream-sync 
[Stable9] upstream sync
 2016-06-26 14:50:58 +02:00
Lukas Reschke dcb5f00461
Merge remote-tracking branch 'upstream/stable9' into stable9-upstream-sync 2016-06-26 12:48:19 +02:00
Christoph Wurst 907c90165a Merge pull request #25256 from owncloud/stable9-setupchecks-preventreload 
[stable9] Don't reload page in case of auth errors during setup checks
 2016-06-24 17:12:42 +02:00
Marius Blüm ea327cdea1 Merge pull request #216 from nextcloud/stable9-replace-occurence-of-owncloud-by-nextcloud 
[stable9] Replace occurence of "ownCloud" by "Nextcloud"
 2016-06-24 15:01:53 +02:00
Marius Blüm 7a3aafda96 Replace occurence of "ownCloud" by "Nextcloud" 
* backport of #214
 2016-06-24 12:50:43 +02:00
Vincent Petry e366ed6485
Don't reload page in case of auth errors during setup checks 
If an error occurs during setup checks, do not let the global ajax
error handler reload the page.
 2016-06-24 09:51:26 +02:00
Vincent Petry eb8e151458 Merge pull request #25248 from owncloud/stable9-unique_targets 
[stable9] On mount make sure multiple shares with same target map to unique one…
 2016-06-23 18:08:54 +02:00
Patric Lenhart 2cf4ae2925 changed ownCloud to Nextcloud, updated config options 2016-06-23 16:11:56 +02:00
Roeland Douma b6192c39d8
On mount make sure multiple shares with same target map to unique ones (#23937) 
Scenario:
user0 shares a folder 'foo' with user2
user1 shares a folder 'foo' with user2
user2 logs in

Before: show only the 'foo' from user1

After: show both.

* Added intergration tests
 2016-06-23 14:27:51 +02:00
Vincent Petry 3aaa33d9d4 Merge pull request #25228 from owncloud/stable9-enc-revertversionsize 
[stable9] Rollback version must also adjust cached size
 2016-06-22 18:11:20 +02:00
Vincent Petry 880ff122f1
Rollback version must also adjust cached size 2016-06-22 15:18:19 +02:00
Lukas Reschke bab4f65388 Merge pull request #203 from nextcloud/fix_audit_log-stable9 
[stable9] don't try to log the currently logged in user, this fails on cronjobs
 2016-06-22 15:09:57 +02:00
Bjoern Schiessle a7766ca72e
don't try to log the currently logged in user, this fails on cronjobs. The users are logged anyway 2016-06-22 14:39:07 +02:00
Morris Jobke e26386e372 Merge pull request #200 from nextcloud/stable9-backport-197 
[stable9] some text-changes to nextcloud
 2016-06-22 11:01:55 +02:00
Björn Schießle 29a83d8ac6 Merge pull request #199 from nextcloud/stable9-backport-194 
[stable9] default.php for nextcloud
 2016-06-22 10:40:42 +02:00
Joachim Sokolowski b1d60eb738
some text-changes to nextcloud 2016-06-22 10:22:55 +02:00
Joachim Sokolowski e69f0cbdec
default.php for nextcloud 
changing it to nextcloud
 2016-06-22 10:10:09 +02:00
Marius Blüm a9a7e0edee Merge pull request #192 from nextcloud/drop-authtoken 
Drop old authtoken table (pre 5.0.0)
 2016-06-21 21:28:01 +02:00
Marius Blüm ce3437e755 Merge pull request #193 from nextcloud/stable9-backport-191 
[stable9] Add postgres to CI
 2016-06-21 21:23:20 +02:00
Morris Jobke 8153290dd6
Add postgres to CI 2016-06-21 16:49:40 +02:00
Morris Jobke ce7d9998dc
Drop old authtoken table (pre 5.0.0) 
* fixes #155
 2016-06-21 16:35:08 +02:00
Vincent Petry 54209abb74 Merge pull request #25197 from owncloud/fix-npe-in-user-ldap-stable9 
[stable9] Fix null pointer exception in user_ldap
 2016-06-21 16:10:48 +02:00
Vincent Petry ddd4f367c3 Merge pull request #25199 from owncloud/shared-mount-catch-9 
[9.0] Catch exceptions while creating shared mounts
 2016-06-21 16:07:44 +02:00
Juan Pablo Villafañez bf7a08f62d dd support to know where the storage test comes from (#25166) 2016-06-21 15:04:08 +02:00
Robin Appelman fa9ba64552 Catch exceptions while creating shared mounts 2016-06-21 12:45:33 +02:00
Jörn Friedrich Dreyer 11c1d399af
Fix null pointer exception in user_ldap 2016-06-21 11:16:15 +02:00
Lukas Reschke 0236535fd3 Merge pull request #178 from nextcloud/fix-it 
[stable9] Branding
 2016-06-20 22:43:28 +02:00
Lukas Reschke 851b277a8e
Adjust integration test 2016-06-20 22:28:13 +02:00
Lukas Reschke 9a0b78e757 Merge pull request #177 from nextcloud/v9.0.51 
v9.0.51
 2016-06-20 22:21:35 +02:00
Lukas Reschke a11896766c
Some more branding 2016-06-20 22:10:20 +02:00
Lukas Reschke ceea666190
v9.0.51 2016-06-20 21:46:06 +02:00
Morris Jobke 8abf6e0ed1
fixed code 2016-06-20 18:50:56 +02:00
Morris Jobke 555a3b597e
fixed translations 2016-06-20 18:50:46 +02:00
Morris Jobke bbe16db5a6 Merge pull request #174 from nextcloud/stable9-upstream-sync 
[stable9] Upstream Sync
 2016-06-20 18:02:18 +02:00
Vincent Petry dc3db4e1c0
Delay files_sharing's registerMountProviders 
This moves registerMountProviders until after the sharing backends were
registered. In some situations registerMountProviders will trigger
listeners which might require filesystem access which itself would
mount shares, which itself requires the sharing backends to be
initialized.
 2016-06-20 17:39:00 +02:00
Vincent Petry f11e486025
Make getShareFolder use given view instead of static FS (#25150) 2016-06-20 17:39:00 +02:00
Jörn Friedrich Dreyer cf3b5e3e86
Capped cache for user config 2016-06-20 17:39:00 +02:00
Roeland Jago Douma 07436d089b
Do not recurse link share fetching 
* Might fix an issue on oracle
 2016-06-20 17:38:59 +02:00
Vincent Petry 280c288bc0
Convert Dropbox Forbidden exception to StorageNotAvailableException 2016-06-20 17:37:55 +02:00
Jan-Christoph Borchardt 5e6a724c5c
fix grouped input fields, make sure they take precedence 2016-06-20 17:37:50 +02:00
Christoph Wurst 43065e7369
load authentication apps first 2016-06-20 17:37:45 +02:00
Vincent Petry ac56629c86
Capped cache for cache info in UserMountCache 2016-06-20 17:37:38 +02:00
Jörn Friedrich Dreyer 38663e13cc
Allow empty host when installing on oracle via CLI (#25034) 2016-06-20 17:37:31 +02:00
Jörn Friedrich Dreyer 459aa933b9
decrease initial users to load to 50 
Prevents timeouts on the initial loading of users. proper fix will be in https://github.com/owncloud/core/pull/10994
Workaround for https://github.com/owncloud/core/issues/24734
 2016-06-20 17:37:25 +02:00
Thomas Müller 0934153ed2
Use an explicit version of sabre/dav to allow caching on the jenkins slaves - fixes #25087 (#25089) 2016-06-20 17:37:17 +02:00