summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1121 from nextcloud/avatar_304Lukas Reschke2016-09-055-8/+184
|\ | | | | Proper 304 response
| * Update autoloaderRoeland Jago Douma2016-09-052-0/+2
| |
| * Move AvatarController over to FileDisplayResponseRoeland Jago Douma2016-09-051-8/+3
| |
| * Add FileDisplayResponseRoeland Jago Douma2016-09-052-0/+179
|/ | | | | 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-0512-36/+133
|\ | | | | Cache avatars
| * Fix testsRoeland Jago Douma2016-08-302-14/+35
| |
| * Cache avatars properlyRoeland Jago Douma2016-08-3010-22/+98
| | | | | | | | | | * 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 #1270 from ↵Morris Jobke2016-09-051-4/+1
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/issue-1265-always-use-js-console-when-available Always use the js console when available
| * | | Always use the js console when availableJoas Schilling2016-09-051-4/+1
| |/ /
* | | Merge pull request #1259 from nextcloud/language_orderJoas Schilling2016-09-055-33/+162
|\ \ \ | | | | | | | | ACCEPT_LANGUAGE goes before default_langauge
| * | | Autoloader updateRoeland Jago Douma2016-09-042-0/+2
| | | |
| * | | ACCEPT_LANGUAGE goes before default_langaugeRoeland Jago Douma2016-09-043-33/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0533-22/+1510
|\ \ \ \ | | | | | | | | | | add 2fa backup codes app
| * | | | Fix AppTest and intergration testRoeland Jago Douma2016-09-052-2/+8
| | | | |
| * | | | increase core version number to trigger db ugprade and fix app manager testsChristoph Wurst2016-09-052-3/+15
| | | | |
| * | | | add 2fa backup codes appChristoph Wurst2016-09-0529-17/+1487
| | |/ / | |/| | | | | | | | | | | | | | * 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.
* | | | Merge pull request #1268 from nextcloud/fix_1260Morris Jobke2016-09-051-1/+1
|\ \ \ \ | |/ / / |/| | | Use proper ALTER ROLE syntax
| * | | 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-0546-22/+202
| | |
* | | [tx-robot] updated from transifexNextcloud bot2016-09-0444-156/+430
|/ /
* | [tx-robot] updated from transifexNextcloud bot2016-09-0330-104/+304
| |
* | 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
| | |
* | | Merge pull request #1246 from nextcloud/federation_dead_codeLukas Reschke2016-09-021-34/+0
|\ \ \ | | | | | | | | Remove dead OCS register code
| * | | Remove dead OCS register codeRoeland Jago Douma2016-09-021-34/+0
|/ / /
* | | Merge pull request #1239 from nextcloud/cache_info_parsingMorris Jobke2016-09-021-2/+11
|\ \ \ | | | | | | | | Cache parsing of info.xml
| * | | Cache parsing of info.xmlRoeland Jago Douma2016-09-021-2/+11
|/ / /
* | | [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
| |/ / / /