Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | Always send a postScanFile event when done scanning a file | Olivier Paroz | 2015-09-30 | 1 | -2/+2 | |
|/ / / / | | | | | | | | | | | | | | | | | postScanFile is important when scanning external storage as it indicates when the file is ready to be used (cherry picked from commit 9ea05c8) | |||||
* | | | | Merge pull request #19450 from owncloud/stable8.1-backport-19440-19426 | Thomas Müller | 2015-09-30 | 6 | -57/+59 | |
|\ \ \ \ | | | | | | | | | | | Stable8.1 backport 19440 19426 | |||||
| * | | | | Add blob: scheme to default CSP policy | Lukas Reschke | 2015-09-29 | 6 | -57/+59 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/19438 (cherry picked from commit e735a99) | |||||
| * | | | | Fix CSP for images for legacy apps | Olivier Paroz | 2015-09-29 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #19425 (cherry picked from commit c4bac16) | |||||
* | | | | | Merge pull request #19475 from owncloud/thumbnail-temp-clean-81 | Thomas Müller | 2015-09-30 | 1 | -1/+5 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | [8.1] Clean temp files used for thumbnail generation | |||||
| * | | | | Clean temp files used for thumbnail generation | Robin Appelman | 2015-09-30 | 1 | -1/+5 | |
|/ / / / | ||||||
* | | | | Merge pull request #18572 from owncloud/stable8.1-backport-18553 | Morris Jobke | 2015-09-29 | 1 | -4/+12 | |
|\ \ \ \ | | | | | | | | | | | [stable8.1] Save detected l10n of browser on login | |||||
| * | | | | Save detected l10n of browser on login | Morris Jobke | 2015-09-28 | 1 | -4/+12 | |
| | | | | | | | | | | | | | | | | | | | | * fixes owncloud/activity#373 | |||||
* | | | | | Merge pull request #19446 from owncloud/stable8.1-backport-19441 | Morris Jobke | 2015-09-29 | 3 | -0/+28 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | [stable8.1][upgrade] switch to debug logging on upgrade | |||||
| * | | | | [upgrade] switch to debug logging on upgrade | Morris Jobke | 2015-09-29 | 3 | -0/+28 | |
| |/ / / | | | | | | | | | | | | | | | | | * resets afterwards * adds output about the previous log level | |||||
* | | | | Merge pull request #19439 from ↵ | Morris Jobke | 2015-09-29 | 1 | -0/+4 | |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | owncloud/stable8.1-share-disablepluginwhennocoreshare [stable8.1] Do not register JS share plugin if core sharing API is disabled | |||||
| * | | | Do not register JS share plugin if core sharing API is disabled | Vincent Petry | 2015-09-29 | 1 | -0/+4 | |
|/ / / | ||||||
* | | | Merge pull request #19216 from ↵ | Thomas Müller | 2015-09-24 | 1 | -0/+5 | |
|\ \ \ | | | | | | | | | | | | | | | | | owncloud/stable8.1-discardexpirationdatefornonlinkshares [stable8.1] Discard expiration date from result for non-link shares | |||||
| * | | | Discard expiration date from result for non-link shares | Vincent Petry | 2015-09-21 | 1 | -0/+5 | |
| | | | | ||||||
* | | | | Merge pull request #18957 from owncloud/stable8.1-backport-17791 | Thomas Müller | 2015-09-24 | 1 | -0/+11 | |
|\ \ \ \ | |_|_|/ |/| | | | [stable8.1] Add custom CSP for Win 10 compatibility | |||||
| * | | | Add custom CSP for Win 10 compatibility | Lukas Reschke | 2015-09-10 | 1 | -0/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default content-security-policy of ownCloud forbids inline JavaScript for security reasons. IE starting on Windows 10 will however also obey the CSP which will break the event source fallback. As a workaround thus we set a custom policy which allows the execution of inline JavaScript. This fixes https://github.com/owncloud/core/issues/14286 | |||||
* | | | | Merge pull request #19149 from owncloud/issue-19147-backport-update-break | Vincent Petry | 2015-09-22 | 4 | -25/+94 | |
|\ \ \ \ | | | | | | | | | | | Issue 19147 backport update break | |||||
| * | | | | Improved update version detection logic | Vincent Petry | 2015-09-18 | 1 | -7/+1 | |
| | | | | | ||||||
| * | | | | Simplify comparison algo | Vincent Petry | 2015-09-18 | 1 | -15/+1 | |
| | | | | | ||||||
| * | | | | Throw exception on downgrade attempt | Vincent Petry | 2015-09-18 | 1 | -1/+5 | |
| | | | | | ||||||
| * | | | | Restrict upgrades to explicit allowed version | Vincent Petry | 2015-09-18 | 3 | -20/+105 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | version.php now contains the previous ownCloud version from which upgrades are allowed. Any other upgrades will show a message that the upgrade/downgrade is not supported. Conflicts: version.php | |||||
* | | | | | Merge pull request #18747 from owncloud/fix_password_reset_8.1 | Björn Schießle | 2015-09-22 | 3 | -11/+40 | |
|\ \ \ \ \ | | | | | | | | | | | | | [stable8.1] use login name for password reset | |||||
| * | | | | | use login name for password reset | Bjoern Schiessle | 2015-09-01 | 3 | -11/+40 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #19051 from owncloud/backport-shibboleth-fix-stable8.1-2 | Thomas Müller | 2015-09-21 | 1 | -4/+6 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Repeated calls to loginWithApache() should not not try to set user in… | |||||
| * | | | | | | Repeated calls to loginWithApache() should not not try to set user ↵ | Thomas Müller | 2015-09-15 | 1 | -4/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | information in the session again | |||||
* | | | | | | | Merge pull request #18123 from GreenArchon/backport-17759-stable8.1 | blizzz | 2015-09-21 | 2 | -7/+35 | |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | [stable8.1]Properly nest groups when using memberOf to detect group membership, fixes #17759 | |||||
| * | | | | | | fix more review comments for #18042 / #17759 | Frédéric Fortier | 2015-08-07 | 1 | -4/+3 | |
| | | | | | | | ||||||
| * | | | | | | Take review comments into consideration for pr #18042 / issue #17759 | Frédéric Fortier | 2015-08-07 | 1 | -16/+13 | |
| | | | | | | | ||||||
| * | | | | | | Properly nest groups when using memberOf to detect group membership, fixes ↵ | Frédéric Fortier | 2015-08-07 | 2 | -7/+39 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | #17759 | |||||
* | | | | | | | Merge pull request #19011 from owncloud/fix_18926_8.1 | Björn Schießle | 2015-09-21 | 3 | -5/+71 | |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | [stable8.1] check for the right user if we can change his password | |||||
| * | | | | | | check for the right user if we can change his password | Bjoern Schiessle | 2015-09-14 | 3 | -5/+71 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #19075 from owncloud/check-maintenance-before-everything-else | Thomas Müller | 2015-09-16 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | Check for maintenance mode first so we send the 503 instead of login … | |||||
| * | | | | | | Check for maintenance mode first so we send the 503 instead of login ↵ | Joas Schilling | 2015-09-16 | 1 | -1/+1 | |
|/ / / / / / | | | | | | | | | | | | | | | | | | | verification | |||||
* | | | | | | Merge pull request #18816 from ↵ | Joas Schilling | 2015-09-15 | 7 | -8/+50 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/move-background-job-registration-to-install-update-8.1 Move background job registration to install update 8.1 | |||||
| * | | | | | | Move registration of LDAP background jobs to the install and update | Joas Schilling | 2015-09-14 | 3 | -3/+26 | |
| | | | | | | | ||||||
| * | | | | | | Move registration of background job to install/update | Joas Schilling | 2015-09-14 | 4 | -5/+24 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #18703 from owncloud/request-fix-stable8.1 | Morris Jobke | 2015-09-15 | 1 | -34/+49 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | [stable8.1] Decode request content only on getContent | |||||
| * | | | | | | Decode request content only on getContent | Robin McCorkell | 2015-08-31 | 1 | -34/+49 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge pull request #19013 from owncloud/stable8.1-backport-19006 | Individual IT Services | 2015-09-14 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | [stable8.1] allow ".." in folder names | |||||
| * | | | | | allow ".." in folder names | Individual IT Services | 2015-09-14 | 1 | -1/+1 | |
|/ / / / / | | | | | | | | | | | | | | | | backport of #19006 fix for #18987 | |||||
* | | / / | 8.1.3v8.1.3 | C Montero-Luque | 2015-09-10 | 2 | -3/+3 | |
| |_|/ / |/| | | | ||||||
* | | | | Merge pull request #18928 from owncloud/stable8.1-backport-18832 | Morris Jobke | 2015-09-09 | 1 | -0/+8 | |
|\ \ \ \ | | | | | | | | | | | [stable8.1] Avoid re-propagation of shares during one propagation run | |||||
| * | | | | Avoid re-propagation of shares during one propagation run | Morris Jobke | 2015-09-09 | 1 | -0/+8 | |
| | | | | | | | | | | | | | | | | | | | | * fix was proposed by @nickvergessen | |||||
* | | | | | Merge pull request #18904 from ↵ | Morris Jobke | 2015-09-09 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/missing-context-on-update-file-target_8.1 [stable8.1] Use context function call instead of static | |||||
| * | | | | | Use context function call instead of static | Joas Schilling | 2015-09-08 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #18903 from owncloud/fix_sharing_add_to_group_8.1 | Morris Jobke | 2015-09-09 | 4 | -32/+206 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | [stable8.1] fix addToGroup hook | |||||
| * | | | | | intproduce pre_addToGroup hook. we need to calculate the possible unique | Bjoern Schiessle | 2015-09-08 | 3 | -28/+196 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | targets before the user was added to the group otherwise we will always detect a name collision | |||||
| * | | | | | use the correct user if we update the share table | Bjoern Schiessle | 2015-09-08 | 1 | -4/+10 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #18814 from owncloud/shared-mount-delay-setup-8.1 | Morris Jobke | 2015-09-09 | 3 | -7/+8 | |
|\ \ \ \ \ | |/ / / / |/| | | | | [8.1] Delay setting up the filesystem for a share owner untill the share is used | |||||
| * | | | | setup owner when getting users for share | Robin Appelman | 2015-09-03 | 1 | -0/+2 | |
| | | | | |