summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Always send a postScanFile event when done scanning a fileOlivier Paroz2015-09-301-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-19426Thomas Müller2015-09-306-57/+59
|\ \ \ \ | | | | | | | | | | Stable8.1 backport 19440 19426
| * | | | Add blob: scheme to default CSP policyLukas Reschke2015-09-296-57/+59
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/19438 (cherry picked from commit e735a99)
| * | | | Fix CSP for images for legacy appsOlivier Paroz2015-09-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes #19425 (cherry picked from commit c4bac16)
* | | | | Merge pull request #19475 from owncloud/thumbnail-temp-clean-81Thomas Müller2015-09-301-1/+5
|\ \ \ \ \ | |_|_|/ / |/| | | | [8.1] Clean temp files used for thumbnail generation
| * | | | Clean temp files used for thumbnail generationRobin Appelman2015-09-301-1/+5
|/ / / /
* | | | Merge pull request #18572 from owncloud/stable8.1-backport-18553Morris Jobke2015-09-291-4/+12
|\ \ \ \ | | | | | | | | | | [stable8.1] Save detected l10n of browser on login
| * | | | Save detected l10n of browser on loginMorris Jobke2015-09-281-4/+12
| | | | | | | | | | | | | | | | | | | | * fixes owncloud/activity#373
* | | | | Merge pull request #19446 from owncloud/stable8.1-backport-19441Morris Jobke2015-09-293-0/+28
|\ \ \ \ \ | |_|/ / / |/| | | | [stable8.1][upgrade] switch to debug logging on upgrade
| * | | | [upgrade] switch to debug logging on upgradeMorris Jobke2015-09-293-0/+28
| |/ / / | | | | | | | | | | | | | | | | * resets afterwards * adds output about the previous log level
* | | | Merge pull request #19439 from ↵Morris Jobke2015-09-291-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 disabledVincent Petry2015-09-291-0/+4
|/ / /
* | | Merge pull request #19216 from ↵Thomas Müller2015-09-241-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 sharesVincent Petry2015-09-211-0/+5
| | | |
* | | | Merge pull request #18957 from owncloud/stable8.1-backport-17791Thomas Müller2015-09-241-0/+11
|\ \ \ \ | |_|_|/ |/| | | [stable8.1] Add custom CSP for Win 10 compatibility
| * | | Add custom CSP for Win 10 compatibilityLukas Reschke2015-09-101-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-breakVincent Petry2015-09-224-25/+94
|\ \ \ \ | | | | | | | | | | Issue 19147 backport update break
| * | | | Improved update version detection logicVincent Petry2015-09-181-7/+1
| | | | |
| * | | | Simplify comparison algoVincent Petry2015-09-181-15/+1
| | | | |
| * | | | Throw exception on downgrade attemptVincent Petry2015-09-181-1/+5
| | | | |
| * | | | Restrict upgrades to explicit allowed versionVincent Petry2015-09-183-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.1Björn Schießle2015-09-223-11/+40
|\ \ \ \ \ | | | | | | | | | | | | [stable8.1] use login name for password reset
| * | | | | use login name for password resetBjoern Schiessle2015-09-013-11/+40
| | | | | |
* | | | | | Merge pull request #19051 from owncloud/backport-shibboleth-fix-stable8.1-2Thomas Müller2015-09-211-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üller2015-09-151-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | information in the session again
* | | | | | | Merge pull request #18123 from GreenArchon/backport-17759-stable8.1blizzz2015-09-212-7/+35
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | [stable8.1]Properly nest groups when using memberOf to detect group membership, fixes #17759
| * | | | | | fix more review comments for #18042 / #17759Frédéric Fortier2015-08-071-4/+3
| | | | | | |
| * | | | | | Take review comments into consideration for pr #18042 / issue #17759Frédéric Fortier2015-08-071-16/+13
| | | | | | |
| * | | | | | Properly nest groups when using memberOf to detect group membership, fixes ↵Frédéric Fortier2015-08-072-7/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | #17759
* | | | | | | Merge pull request #19011 from owncloud/fix_18926_8.1Björn Schießle2015-09-213-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 passwordBjoern Schiessle2015-09-143-5/+71
| | | | | | |
* | | | | | | Merge pull request #19075 from owncloud/check-maintenance-before-everything-elseThomas Müller2015-09-161-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 Schilling2015-09-161-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | verification
* | | | | | Merge pull request #18816 from ↵Joas Schilling2015-09-157-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 updateJoas Schilling2015-09-143-3/+26
| | | | | | |
| * | | | | | Move registration of background job to install/updateJoas Schilling2015-09-144-5/+24
| |/ / / / /
* | | | | | Merge pull request #18703 from owncloud/request-fix-stable8.1Morris Jobke2015-09-151-34/+49
|\ \ \ \ \ \ | | | | | | | | | | | | | | [stable8.1] Decode request content only on getContent
| * | | | | | Decode request content only on getContentRobin McCorkell2015-08-311-34/+49
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #19013 from owncloud/stable8.1-backport-19006Individual IT Services2015-09-141-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | [stable8.1] allow ".." in folder names
| * | | | | allow ".." in folder namesIndividual IT Services2015-09-141-1/+1
|/ / / / / | | | | | | | | | | | | | | | backport of #19006 fix for #18987
* | | / / 8.1.3v8.1.3C Montero-Luque2015-09-102-3/+3
| |_|/ / |/| | |
* | | | Merge pull request #18928 from owncloud/stable8.1-backport-18832Morris Jobke2015-09-091-0/+8
|\ \ \ \ | | | | | | | | | | [stable8.1] Avoid re-propagation of shares during one propagation run
| * | | | Avoid re-propagation of shares during one propagation runMorris Jobke2015-09-091-0/+8
| | | | | | | | | | | | | | | | | | | | * fix was proposed by @nickvergessen
* | | | | Merge pull request #18904 from ↵Morris Jobke2015-09-091-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 staticJoas Schilling2015-09-081-1/+1
| | | | | |
* | | | | | Merge pull request #18903 from owncloud/fix_sharing_add_to_group_8.1Morris Jobke2015-09-094-32/+206
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | [stable8.1] fix addToGroup hook
| * | | | | intproduce pre_addToGroup hook. we need to calculate the possible uniqueBjoern Schiessle2015-09-083-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 tableBjoern Schiessle2015-09-081-4/+10
| |/ / / /
* | | | | Merge pull request #18814 from owncloud/shared-mount-delay-setup-8.1Morris Jobke2015-09-093-7/+8
|\ \ \ \ \ | |/ / / / |/| | | | [8.1] Delay setting up the filesystem for a share owner untill the share is used
| * | | | setup owner when getting users for shareRobin Appelman2015-09-031-0/+2
| | | | |