summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1259 from nextcloud/language_orderJoas Schilling2016-09-054-20/+65
|\
| * Autoloader updateRoeland Jago Douma2016-09-042-0/+2
| * ACCEPT_LANGUAGE goes before default_langaugeRoeland Jago Douma2016-09-042-20/+63
* | Merge pull request #1171 from nextcloud/2fa-backup-codesMarius Blüm2016-09-051-2/+18
|\ \
| * | add 2fa backup codes appChristoph Wurst2016-09-051-2/+18
* | | Merge pull request #1269 from nextcloud/deprecate_ocs_responseLukas Reschke2016-09-051-2/+3
|\ \ \
| * | | Deprecate OCSResponeRoeland Jago Douma2016-09-051-2/+3
| |/ /
* / / Use proper ALTER ROLE syntaxRoeland Jago Douma2016-09-051-1/+1
|/ /
* | [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 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 responsesRoeland Jago Douma2016-08-311-5/+14
* | | Merge pull request #1227 from nextcloud/improve-testsJoas Schilling2016-09-011-17/+0
|\ \ \
| * | | Remove unneeded Windows logicMorris Jobke2016-09-011-17/+0
| | |/ | |/|
* / | Activate APCu on PHP 7Morris Jobke2016-09-011-2/+30
|/ /
* / [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 cookieLukas Reschke2016-08-091-2/+15
* | Merge pull request #1201 from nextcloud/usermountcache-orphanedshareRoeland Jago Douma2016-08-311-1/+2
|\ \
| * | 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 shouldn...Bjoern Schiessle2016-07-271-0/+4
* | | Merge pull request #1087 from nextcloud/get-delay-twiceLukas Reschke2016-08-302-3/+5
|\ \ \
| * | | 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) previewJoas Schilling2016-08-291-1/+1
| |/ / /
* | | | Merge pull request #891 from nextcloud/us_25810Morris Jobke2016-08-301-2/+48
|\ \ \ \
| * | | | 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
| * | | | Improve file_target finding logic when repairing unmerged sharesVincent Petry2016-08-171-1/+39
* | | | | 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 differs...Thomas Müller2016-08-291-0/+10
| | |/ / / | |/| | |
* | | | | Merge pull request #1139 from nextcloud/clean-code-imageRoeland Jago Douma2016-08-291-15/+11
|\ \ \ \ \
| * | | | | 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 portJuan Pablo Villafáñez2016-08-291-1/+1
| |/ / / /
* / / / / always return numeric storage id as int, also check type equality in test ass...Jörn Friedrich Dreyer2016-08-291-4/+4
|/ / / /
* | | | 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 homeRobin Appelman2016-08-121-1/+1
* | | | | Merge pull request #1105 from nextcloud/usermenu-orderingRaghu Nayyar2016-08-281-3/+3
|\ \ \ \ \
| * | | | | 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
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | 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
|\ \ \ \ \ \