summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2016-09-0242-0/+108
|
* Merge pull request #1221 from nextcloud/proper_204_304_responseMorris Jobke2016-09-012-6/+42
|\ | | | | No body or content-length for 204 and 304 responses
| * No body or content-length for 204 and 304 responsesRoeland Jago Douma2016-08-312-6/+42
| | | | | | | | See: https://tools.ietf.org/html/rfc7230#section-3.3
* | Merge pull request #1194 from nextcloud/card-caldav-check-existsJoas Schilling2016-09-016-16/+49
|\ \ | | | | | | more efficient check if addressbook and calendar exists for user
| * | more efficient check if addressbook and calendar exists for userRobin Appelman2016-08-316-16/+49
| | |
* | | Merge pull request #1219 from coderkun/issue-1110-tabindexRoeland Jago Douma2016-09-011-5/+5
|\ \ \ | | | | | | | | Add attribute “tabindex” to login form (fixes #1110)
| * | | Add attribute “tabindex” to login form (fixes #1110)coderkun2016-08-311-5/+5
| | |/ | |/|
* | | Merge pull request #1215 from ↵Roeland Jago Douma2016-09-015-4/+15
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/issue-1083-update-live-relative-timestamps Update relative timestamps for a better "live" feeling
| * | | Use live timestamp on comments tabJoas Schilling2016-09-011-1/+2
| | | |
| * | | Use live timestamps in the versions tab of the sidebarJoas Schilling2016-09-011-1/+2
| | | |
| * | | Use live timestamp in the sidebar detailsJoas Schilling2016-09-011-1/+2
| | | |
| * | | Update live timestamps to give a more live feelingJoas Schilling2016-09-012-1/+9
| | | |
* | | | Merge pull request #1224 from nextcloud/do-not-allow-linebreak-in-pathsRoeland Jago Douma2016-09-013-2/+11
|\ \ \ \ | | | | | | | | | | Do not allow linebreaks and null bytes in paths
| * | | | Also prevent null byte characterJoas Schilling2016-09-012-1/+3
| | | | |
| * | | | Add PhantomJS to gitignoreJoas Schilling2016-09-011-0/+1
| | | | |
| * | | | Filter out %0A from pathsJoas Schilling2016-09-012-2/+8
| |/ / /
* | | | Merge pull request #1227 from nextcloud/improve-testsJoas Schilling2016-09-013-33/+1
|\ \ \ \ | | | | | | | | | | Improve tests
| * | | | properly load APCu extension on CLI to execute APCu testsMorris Jobke2016-09-011-1/+1
| | | | |
| * | | | Remove unneeded Windows logicMorris Jobke2016-09-012-32/+0
| |/ / /
* | | | Merge pull request #1230 from nextcloud/php7-apcuRoeland Jago Douma2016-09-012-3/+31
|\ \ \ \ | | | | | | | | | | Activate APCu on PHP 7
| * | | | Activate APCu on PHP 7Morris Jobke2016-09-012-3/+31
|/ / / / | | | | | | | | | | | | | | | | | | | | Fix an issue with APCus inc and dec methods on PHP 7 see https://github.com/krakjoe/apcu/issues/183#issuecomment-244038221 for details
* | | | Merge pull request #1143 from nextcloud/ldap-smells-for-fun-and-profitJoas Schilling2016-09-0112-24/+12
|\ \ \ \ | | | | | | | | | | fix a few minor code smells
| * | | | Fix phpdocRoeland Jago Douma2016-08-291-1/+1
| | | | |
| * | | | fix a few minor code smellsJörn Friedrich Dreyer2016-08-2912-23/+11
| | | | |
* | | | | Merge pull request #1217 from nextcloud/federation_phpunit_fixesJoas Schilling2016-09-016-29/+33
|\ \ \ \ \ | | | | | | | | | | | | Fix deprecated getMock call in Federation app
| * | | | | Fix deprecated getMock call in Federation appRoeland Jago Douma2016-08-316-29/+33
| | |_|/ / | |/| | |
* | | | | Merge pull request #1223 from nextcloud/core_command_phpunt_getmockJoas Schilling2016-09-0122-90/+167
|\ \ \ \ \ | |_|_|/ / |/| | | | Fix depreccated getMock in Core/Command tests
| * | | | Fix depreccated getMock in Core/Command testsRoeland Jago Douma2016-09-0122-90/+167
|/ / / /
* | | | [tx-robot] updated from transifexNextcloud bot2016-09-01280-1454/+2330
| | | |
* | | | Merge pull request #1216 from nextcloud/theming_phpunit_fixesJulius Härtl2016-08-311-5/+5
|\ \ \ \ | |/ / / |/| | | Fix ThemingDefaults getMock deprecation
| * | | Fix ThemingDefaults getMock deprecationRoeland Jago Douma2016-08-311-5/+5
|/ / /
* | | Merge pull request #1188 from nextcloud/2fa-redirect-default-appLukas Reschke2016-08-312-17/+15
|\ \ \ | | | | | | | | redirect to default app after solving the 2FA challenge
| * | | check same URL in unit testsChristoph Wurst2016-08-301-11/+12
| | | |
| * | | redirect to default app after solving the 2FA challengeChristoph Wurst2016-08-302-8/+5
| | | |
* | | | Merge pull request #1212 from nextcloud/fix_federatedfilesharingtestsRoeland Jago Douma2016-08-315-27/+35
|\ \ \ \ | | | | | | | | | | Fix deprecated usages of getMock in federatedfilesharing
| * | | | Fix deprecated usages of getMock in federatedfilesharingRoeland Jago Douma2016-08-315-27/+35
| | | | |
* | | | | Merge pull request #797 from nextcloud/only-match-for-auth-cookieJoas Schilling2016-08-312-3/+92
|\ \ \ \ \ | | | | | | | | | | | | Match only for actual session cookie
| * | | | | Match only for actual session cookieLukas Reschke2016-08-092-3/+92
| | | | | | | | | | | | | | | | | | | | | | | | 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-312-2/+9
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | [master] Usermountcache orphanedshare
| * | | | | Added closeCursor in SharedMount numeric idVincent Petry2016-08-301-0/+1
| | | | | |
| * | | | | Prevent error with orphaned shares when updating user mount cacheVincent Petry2016-08-302-2/+8
| | | | | |
* | | | | | Merge pull request #608 from nextcloud/small-encryption-improvementJoas Schilling2016-08-312-3/+18
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | 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-272-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | shouldn't touch files owned by a different user.
* | | | | | Merge pull request #1202 from nextcloud/remove_polyfills_for_55_56Roeland Jago Douma2016-08-311-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove 3rdparty for polyfills for php5.4 and php5.5
| * | | | | | Update third-party referenceLukas Reschke2016-08-311-0/+0
| | | | | | |
| * | | | | | Remove 3rdparty for polyfills for php5.4 and php5.5Roeland Jago Douma2016-08-311-0/+0
| | | | | | |
* | | | | | | Merge pull request #1137 from nextcloud/external_storage_lnkLukas Reschke2016-08-311-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | External storage lnk
| * | | | | | | add in files view a link to personal files externaldavitol2016-08-291-1/+0
| | | | | | | |
| * | | | | | | add link to personal files externaldavitol2016-08-291-0/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #1196 from ↵Lukas Reschke2016-08-314-6/+72
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | nextcloud/oc-integration_tests_local_external_storage Integration test on a local storage