Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Correctly remove the charset from finfo mimetype | Joas Schilling | 2016-09-05 | 1 | -2/+3 |
| | |||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2016-09-05 | 4 | -4/+48 |
| | |||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2016-09-04 | 4 | -0/+24 |
| | |||||
* | Merge pull request #1225 from nextcloud/allow-to-validate-password-policy | Roeland Jago Douma | 2016-09-02 | 1 | -3/+9 |
|\ | | | | | Allow to validate the password_policy app | ||||
| * | Allow to validate the password_policy app | Joas Schilling | 2016-09-01 | 1 | -3/+9 |
| | | |||||
* | | Cache parsing of info.xml | Roeland Jago Douma | 2016-09-02 | 1 | -2/+11 |
| | | |||||
* | | Merge pull request #1221 from nextcloud/proper_204_304_response | Morris Jobke | 2016-09-01 | 1 | -5/+14 |
|\ \ | | | | | | | No body or content-length for 204 and 304 responses | ||||
| * | | No body or content-length for 204 and 304 responses | Roeland Jago Douma | 2016-08-31 | 1 | -5/+14 |
| | | | | | | | | | | | | See: https://tools.ietf.org/html/rfc7230#section-3.3 | ||||
* | | | Merge pull request #1227 from nextcloud/improve-tests | Joas Schilling | 2016-09-01 | 1 | -17/+0 |
|\ \ \ | | | | | | | | | Improve tests | ||||
| * | | | Remove unneeded Windows logic | Morris Jobke | 2016-09-01 | 1 | -17/+0 |
| | |/ | |/| | |||||
* / | | Activate APCu on PHP 7 | Morris Jobke | 2016-09-01 | 1 | -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 transifex | Nextcloud bot | 2016-09-01 | 10 | -6/+112 |
|/ | |||||
* | Merge pull request #797 from nextcloud/only-match-for-auth-cookie | Joas Schilling | 2016-08-31 | 1 | -2/+15 |
|\ | | | | | Match only for actual session cookie | ||||
| * | Match only for actual session cookie | Lukas Reschke | 2016-08-09 | 1 | -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-orphanedshare | Roeland Jago Douma | 2016-08-31 | 1 | -1/+2 |
|\ \ | | | | | | | [master] Usermountcache orphanedshare | ||||
| * | | Prevent error with orphaned shares when updating user mount cache | Vincent Petry | 2016-08-30 | 1 | -1/+2 |
| | | | |||||
* | | | Merge pull request #608 from nextcloud/small-encryption-improvement | Joas Schilling | 2016-08-31 | 1 | -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 Schiessle | 2016-07-27 | 1 | -0/+4 |
| | | | | | | | | | | | | shouldn't touch files owned by a different user. | ||||
* | | | Merge pull request #1087 from nextcloud/get-delay-twice | Lukas Reschke | 2016-08-30 | 2 | -3/+5 |
|\ \ \ | | | | | | | | | dont get bruteforce delay twice | ||||
| * | | | dont get bruteforce delay twice | Robin Appelman | 2016-08-29 | 2 | -3/+5 |
| | | | | |||||
* | | | | Short circuit processing of the heartbeat request | Robin Appelman | 2016-08-30 | 1 | -0/+3 |
| | | | | |||||
* | | | | Merge pull request #1089 from nextcloud/allow-to-prevent-previews | Roeland Jago Douma | 2016-08-30 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Check if the file isReadable() before sending a (cached) preview | ||||
| * | | | | Check if the file isReadable() before sending a (cached) preview | Joas Schilling | 2016-08-29 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #891 from nextcloud/us_25810 | Morris Jobke | 2016-08-30 | 1 | -2/+48 |
|\ \ \ \ | | | | | | | | | | | [OC] Fix unmerged shares repair targetdecision | ||||
| * | | | | Improve regexp to detect duplicate folders when repairing unmerged shares | Vincent Petry | 2016-08-17 | 1 | -8/+6 |
| | | | | | |||||
| * | | | | Fix unmerged shares repair with mixed group and direct shares | Vincent Petry | 2016-08-17 | 1 | -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 shares | Vincent Petry | 2016-08-17 | 1 | -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-settings | Roeland Jago Douma | 2016-08-29 | 1 | -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üller | 2016-08-29 | 1 | -0/+10 |
| | |/ / / | |/| | | | | | | | | | | | | | differs in case sensitivity - fixes #25684 (#25686) | ||||
* | | | | | Merge pull request #1139 from nextcloud/clean-code-image | Roeland Jago Douma | 2016-08-29 | 1 | -15/+11 |
|\ \ \ \ \ | | | | | | | | | | | | | Some cleanup within OC_Image (#25875) | ||||
| * | | | | | Some cleanup within OC_Image (#25875) | Thomas Müller | 2016-08-29 | 1 | -15/+11 |
| |/ / / / | |||||
* | | | | | Merge pull request #1134 from nextcloud/fix_redirection | Joas Schilling | 2016-08-29 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix redirection taking care of protocol and port | ||||
| * | | | | | Fix redirection taking care of protocol and port | Juan Pablo Villafáñez | 2016-08-29 | 1 | -1/+1 |
| |/ / / / | |||||
* / / / / | always return numeric storage id as int, also check type equality in test ↵ | Jörn Friedrich Dreyer | 2016-08-29 | 1 | -4/+4 |
|/ / / / | | | | | | | | | | | | | asserts | ||||
* | | | | Merge pull request #847 from nextcloud/quota-mount-in-homefolder | Lukas Reschke | 2016-08-28 | 1 | -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 home | Robin Appelman | 2016-08-12 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #1105 from nextcloud/usermenu-ordering | Raghu Nayyar | 2016-08-28 | 1 | -3/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | fix ordering of user menu entries | ||||
| * | | | | | fix ordering of user menu entries | Jan-Christoph Borchardt | 2016-08-27 | 1 | -3/+3 |
| | | | | | | |||||
* | | | | | | Merge pull request #1054 from nextcloud/less-cache-hits | Lukas Reschke | 2016-08-27 | 3 | -17/+27 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Reduce the number of cache operations for dav operations | ||||
| * | | | | | optimize getUserFolder for the common case | Robin Appelman | 2016-08-25 | 1 | -11/+6 |
| | | | | | | |||||
| * | | | | | cache user folders | Robin Appelman | 2016-08-25 | 2 | -16/+27 |
| | | | | | | |||||
| * | | | | | cache root id in mountpoint | Robin Appelman | 2016-08-25 | 1 | -1/+5 |
| | | | | | | |||||
* | | | | | | Merge pull request #1088 from nextcloud/core_tags_cleanup | Lukas Reschke | 2016-08-26 | 2 | -2/+0 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Tag cleanup | ||||
| * | | | | | | Autoloader update | Roeland Jago Douma | 2016-08-26 | 2 | -2/+0 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #1031 from nextcloud/2fa-infinite-redirect-loop | Joas Schilling | 2016-08-26 | 4 | -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 pass | Christoph Wurst | 2016-08-24 | 4 | -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-fixes | Roeland Jago Douma | 2016-08-26 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | Theming: Fix missing color usage | ||||
| * | | | | | | | Remove internal from getThemingDefaults | Julius Haertl | 2016-08-26 | 1 | -1/+0 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #1080 from nextcloud/always_lazyroot | Lukas Reschke | 2016-08-26 | 2 | -3/+3 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Always use the LazyRoot | ||||
| * | | | | | | | Always use the LazyRoot | Roeland Jago Douma | 2016-08-26 | 2 | -3/+3 |
| | | | | | | | |