summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Deprecate getEditionString()Joas Schilling2016-09-064-20/+5
|
* Merge pull request #1284 from nextcloud/allow-status.php-before-installRoeland Jago Douma2016-09-061-1/+1
|\ | | | | Allow status.php before install
| * Allow to call status.php before the instance is installedJoas Schilling2016-09-061-1/+1
| |
* | Merge pull request #1275 from nextcloud/OCS_forward_headers_cleanupMorris Jobke2016-09-067-51/+311
|\ \ | | | | | | Internal OCS Controller cleanup
| * | Fix autoloaderRoeland Jago Douma2016-09-062-0/+6
| | |
| * | Split OCS version handlingRoeland Jago Douma2016-09-065-51/+305
| |/ | | | | | | | | | | This cleans up a bit the OCSController/Middleware. Since the 2 versions of OCS differ a bit. Moved a lot of stuff internal since it is of no concern to the outside.
* | Merge pull request #1235 from ↵Morris Jobke2016-09-061-1/+9
|\ \ | |/ |/| | | | | nextcloud/issue-1192-move-navigation-entries-without-order-to-the-end Move navigation entries without order to the end
| * Move navigation entries without order to the endJoas Schilling2016-09-021-1/+9
| |
* | Update autoloaderRoeland Jago Douma2016-09-052-0/+2
| |
* | Add FileDisplayResponseRoeland Jago Douma2016-09-051-0/+70
| | | | | | | | | | A lazy implementation of the DisplayResponse that only hits the filesystem if the etag and mtime do not match.
* | Merge pull request #1158 from nextcloud/cache_avatarsLukas Reschke2016-09-055-6/+26
|\ \ | | | | | | Cache avatars
| * | Cache avatars properlyRoeland Jago Douma2016-08-305-6/+26
| | | | | | | | | | | | | | | * Set proper caching headers for avatars (15 minutes) * For our own avatar use some extra logic to invalidate when we update
* | | Merge pull request #1271 from nextcloud/fix-docs-for-notificationsJoas Schilling2016-09-053-7/+0
|\ \ \ | | | | | | | | Null !== void, those methods are void
| * | | Null !== void, those methods are voidJoas Schilling2016-09-053-7/+0
| | | |
* | | | Merge pull request #1259 from nextcloud/language_orderJoas Schilling2016-09-054-20/+65
|\ \ \ \ | | | | | | | | | | ACCEPT_LANGUAGE goes before default_langauge
| * | | | Autoloader updateRoeland Jago Douma2016-09-042-0/+2
| | | | |
| * | | | ACCEPT_LANGUAGE goes before default_langaugeRoeland Jago Douma2016-09-042-20/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://github.com/nextcloud/server/issues/970 Before we had 1. Users settings in personal settings 2. Admins default language settings 3. Accept-Language settings of the browser However this is not in line with https://www.w3.org/International/questions/qa-lang-priorities So this changes the order to 1. Users settings in personal settings 3. Accept-Language settings of the browser 2. Admins default language settings
* | | | | Merge pull request #1171 from nextcloud/2fa-backup-codesMarius Blüm2016-09-051-2/+18
|\ \ \ \ \ | | | | | | | | | | | | add 2fa backup codes app
| * | | | | add 2fa backup codes appChristoph Wurst2016-09-051-2/+18
| | |/ / / | |/| | | | | | | | | | | | | | | | | | * add backup codes app unit tests * add integration tests for the backup codes app
* | | | | Merge pull request #1269 from nextcloud/deprecate_ocs_responseLukas Reschke2016-09-051-2/+3
|\ \ \ \ \ | | | | | | | | | | | | Deprecate OCSRespone
| * | | | | Deprecate OCSResponeRoeland Jago Douma2016-09-051-2/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | The OCSResponse should not be used by apps. They should extend the OCSController and use normal DataResponses instead.
* / / / / Use proper ALTER ROLE syntaxRoeland Jago Douma2016-09-051-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | Fixes #1260 See https://www.postgresql.org/docs/9.0/static/sql-alterrole.html
* | | | [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)