summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Correctly remove the charset from finfo mimetypeJoas Schilling2016-09-051-2/+3
|
* [tx-robot] updated from transifexNextcloud bot2016-09-054-4/+48
|
* [tx-robot] updated from transifexNextcloud bot2016-09-044-0/+24
|
* Merge pull request #1225 from nextcloud/allow-to-validate-password-policyRoeland Jago Douma2016-09-021-3/+9
|\ | | | | Allow to validate the password_policy app
| * Allow to validate the password_policy appJoas Schilling2016-09-011-3/+9
| |
* | Cache parsing of info.xmlRoeland Jago Douma2016-09-021-2/+11
| |
* | Merge pull request #1221 from nextcloud/proper_204_304_responseMorris Jobke2016-09-011-5/+14
|\ \ | | | | | | No body or content-length for 204 and 304 responses
| * | No body or content-length for 204 and 304 responsesRoeland Jago Douma2016-08-311-5/+14
| | | | | | | | | | | | See: https://tools.ietf.org/html/rfc7230#section-3.3
* | | Merge pull request #1227 from nextcloud/improve-testsJoas Schilling2016-09-011-17/+0
|\ \ \ | | | | | | | | Improve tests
| * | | Remove unneeded Windows logicMorris Jobke2016-09-011-17/+0
| | |/ | |/|
* / | Activate APCu on PHP 7Morris Jobke2016-09-011-2/+30
|/ / | | | | | | | | | | Fix an issue with APCus inc and dec methods on PHP 7 see https://github.com/krakjoe/apcu/issues/183#issuecomment-244038221 for details
* / [tx-robot] updated from transifexNextcloud bot2016-09-0110-6/+112
|/
* Merge pull request #797 from nextcloud/only-match-for-auth-cookieJoas Schilling2016-08-311-2/+15
|\ | | | | Match only for actual session cookie
| * Match only for actual session cookieLukas Reschke2016-08-091-2/+15
| | | | | | | | OVH has implemented load balancing in a very questionable way where the reverse proxy actually internally adds some cookies which would trigger a security exception. To work around this, this change only checks for the session cookie.
* | Merge pull request #1201 from nextcloud/usermountcache-orphanedshareRoeland Jago Douma2016-08-311-1/+2
|\ \ | | | | | | [master] Usermountcache orphanedshare
| * | Prevent error with orphaned shares when updating user mount cacheVincent Petry2016-08-301-1/+2
| | |
* | | Merge pull request #608 from nextcloud/small-encryption-improvementJoas Schilling2016-08-311-0/+4
|\ \ \ | |/ / |/| | skip shared files, if files get decrypted only for a specific user we…
| * | skip shared files, if files get decrypted only for a specific user we ↵Bjoern Schiessle2016-07-271-0/+4
| | | | | | | | | | | | shouldn't touch files owned by a different user.
* | | Merge pull request #1087 from nextcloud/get-delay-twiceLukas Reschke2016-08-302-3/+5
|\ \ \ | | | | | | | | dont get bruteforce delay twice
| * | | dont get bruteforce delay twiceRobin Appelman2016-08-292-3/+5
| | | |
* | | | Short circuit processing of the heartbeat requestRobin Appelman2016-08-301-0/+3
| | | |
* | | | Merge pull request #1089 from nextcloud/allow-to-prevent-previewsRoeland Jago Douma2016-08-301-1/+1
|\ \ \ \ | | | | | | | | | | Check if the file isReadable() before sending a (cached) preview
| * | | | Check if the file isReadable() before sending a (cached) previewJoas Schilling2016-08-291-1/+1
| |/ / /
* | | | Merge pull request #891 from nextcloud/us_25810Morris Jobke2016-08-301-2/+48
|\ \ \ \ | | | | | | | | | | [OC] Fix unmerged shares repair targetdecision
| * | | | Improve regexp to detect duplicate folders when repairing unmerged sharesVincent Petry2016-08-171-8/+6
| | | | |
| * | | | Fix unmerged shares repair with mixed group and direct sharesVincent Petry2016-08-171-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever a group share is created after a direct share, the stime order needs to be properly considered in the repair routine, considering that the direct user share is appended to the $subShares array and breaking its order.
| * | | | Improve file_target finding logic when repairing unmerged sharesVincent Petry2016-08-171-1/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pick the most recent subshare that has no parenthesis from duplication which should match whichever name the user picked last. If all subshares have duplicate parenthesis names, use the least recent group share's target instead.
* | | | | Merge pull request #1142 from nextcloud/fix-case-sensitive-settingsRoeland Jago Douma2016-08-291-0/+10
|\ \ \ \ \ | | | | | | | | | | | | Fix issues where some user settings cannot be loaded when the user id…
| * | | | | Fix issues where some user settings cannot be loaded when the user id ↵Thomas Müller2016-08-291-0/+10
| | |/ / / | |/| | | | | | | | | | | | | differs in case sensitivity - fixes #25684 (#25686)
* | | | | Merge pull request #1139 from nextcloud/clean-code-imageRoeland Jago Douma2016-08-291-15/+11
|\ \ \ \ \ | | | | | | | | | | | | Some cleanup within OC_Image (#25875)
| * | | | | Some cleanup within OC_Image (#25875)Thomas Müller2016-08-291-15/+11
| |/ / / /
* | | | | Merge pull request #1134 from nextcloud/fix_redirectionJoas Schilling2016-08-291-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix redirection taking care of protocol and port
| * | | | | Fix redirection taking care of protocol and portJuan Pablo Villafáñez2016-08-291-1/+1
| |/ / / /
* / / / / always return numeric storage id as int, also check type equality in test ↵Jörn Friedrich Dreyer2016-08-291-4/+4
|/ / / / | | | | | | | | | | | | asserts
* | | | Merge pull request #847 from nextcloud/quota-mount-in-homefolderLukas Reschke2016-08-281-1/+1
|\ \ \ \ | | | | | | | | | | fix quota calculation when a filesystem is mounted in a user home
| * | | | fix quota calculation when a filesystem is mounted in a user homeRobin Appelman2016-08-121-1/+1
| | | | |
* | | | | Merge pull request #1105 from nextcloud/usermenu-orderingRaghu Nayyar2016-08-281-3/+3
|\ \ \ \ \ | | | | | | | | | | | | fix ordering of user menu entries
| * | | | | fix ordering of user menu entriesJan-Christoph Borchardt2016-08-271-3/+3
| | | | | |
* | | | | | Merge pull request #1054 from nextcloud/less-cache-hitsLukas Reschke2016-08-273-17/+27
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Reduce the number of cache operations for dav operations
| * | | | | optimize getUserFolder for the common caseRobin Appelman2016-08-251-11/+6
| | | | | |
| * | | | | cache user foldersRobin Appelman2016-08-252-16/+27
| | | | | |
| * | | | | cache root id in mountpointRobin Appelman2016-08-251-1/+5
| | | | | |
* | | | | | Merge pull request #1088 from nextcloud/core_tags_cleanupLukas Reschke2016-08-262-2/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Tag cleanup
| * | | | | | Autoloader updateRoeland Jago Douma2016-08-262-2/+0
| | | | | | |
* | | | | | | Merge pull request #1031 from nextcloud/2fa-infinite-redirect-loopJoas Schilling2016-08-264-5/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | prevent infinite redirect loops if the there is no 2fa provider to pass
| * | | | | | | prevent infinite redirect loops if the there is no 2fa provider to passChristoph Wurst2016-08-244-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes infinite loops that are caused whenever a user is about to solve a 2FA challenge, but the provider app is disabled at the same time. Since the session value usually indicates that the challenge needs to be solved before we grant access we have to remove that value instead in this special case.
* | | | | | | | Merge pull request #771 from nextcloud/theming-fixesRoeland Jago Douma2016-08-261-1/+0
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Theming: Fix missing color usage
| * | | | | | | Remove internal from getThemingDefaultsJulius Haertl2016-08-261-1/+0
| | | | | | | |
* | | | | | | | Merge pull request #1080 from nextcloud/always_lazyrootLukas Reschke2016-08-262-3/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Always use the LazyRoot
| * | | | | | | Always use the LazyRootRoeland Jago Douma2016-08-262-3/+3
| | | | | | | |