Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1259 from nextcloud/language_order | Joas Schilling | 2016-09-05 | 5 | -33/+162 |
|\ | | | | | ACCEPT_LANGUAGE goes before default_langauge | ||||
| * | Autoloader update | Roeland Jago Douma | 2016-09-04 | 2 | -0/+2 |
| | | |||||
| * | ACCEPT_LANGUAGE goes before default_langauge | Roeland Jago Douma | 2016-09-04 | 3 | -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-codes | Marius Blüm | 2016-09-05 | 33 | -22/+1510 |
|\ \ | | | | | | | add 2fa backup codes app | ||||
| * | | Fix AppTest and intergration test | Roeland Jago Douma | 2016-09-05 | 2 | -2/+8 |
| | | | |||||
| * | | increase core version number to trigger db ugprade and fix app manager tests | Christoph Wurst | 2016-09-05 | 2 | -3/+15 |
| | | | |||||
| * | | add 2fa backup codes app | Christoph Wurst | 2016-09-05 | 29 | -17/+1487 |
| | | | | | | | | | | | | | | | * add backup codes app unit tests * add integration tests for the backup codes app | ||||
* | | | Merge pull request #1269 from nextcloud/deprecate_ocs_response | Lukas Reschke | 2016-09-05 | 1 | -2/+3 |
|\ \ \ | | | | | | | | | Deprecate OCSRespone | ||||
| * | | | Deprecate OCSRespone | Roeland Jago Douma | 2016-09-05 | 1 | -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_1260 | Morris Jobke | 2016-09-05 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Use proper ALTER ROLE syntax | ||||
| * | | Use proper ALTER ROLE syntax | Roeland Jago Douma | 2016-09-05 | 1 | -1/+1 |
|/ / | | | | | | | | | | | Fixes #1260 See https://www.postgresql.org/docs/9.0/static/sql-alterrole.html | ||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2016-09-05 | 46 | -22/+202 |
| | | |||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2016-09-04 | 44 | -156/+430 |
|/ | |||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2016-09-03 | 30 | -104/+304 |
| | |||||
* | 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 |
| | | |||||
* | | Merge pull request #1246 from nextcloud/federation_dead_code | Lukas Reschke | 2016-09-02 | 1 | -34/+0 |
|\ \ | | | | | | | Remove dead OCS register code | ||||
| * | | Remove dead OCS register code | Roeland Jago Douma | 2016-09-02 | 1 | -34/+0 |
|/ / | |||||
* | | Merge pull request #1239 from nextcloud/cache_info_parsing | Morris Jobke | 2016-09-02 | 1 | -2/+11 |
|\ \ | | | | | | | Cache parsing of info.xml | ||||
| * | | Cache parsing of info.xml | Roeland Jago Douma | 2016-09-02 | 1 | -2/+11 |
|/ / | |||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2016-09-02 | 42 | -0/+108 |
| | | |||||
* | | Merge pull request #1221 from nextcloud/proper_204_304_response | Morris Jobke | 2016-09-01 | 2 | -6/+42 |
|\ \ | | | | | | | 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 | 2 | -6/+42 |
| | | | | | | | | | | | | See: https://tools.ietf.org/html/rfc7230#section-3.3 | ||||
* | | | Merge pull request #1194 from nextcloud/card-caldav-check-exists | Joas Schilling | 2016-09-01 | 6 | -16/+49 |
|\ \ \ | | | | | | | | | more efficient check if addressbook and calendar exists for user | ||||
| * | | | more efficient check if addressbook and calendar exists for user | Robin Appelman | 2016-08-31 | 6 | -16/+49 |
| | | | | |||||
* | | | | Merge pull request #1219 from coderkun/issue-1110-tabindex | Roeland Jago Douma | 2016-09-01 | 1 | -5/+5 |
|\ \ \ \ | | | | | | | | | | | Add attribute “tabindex” to login form (fixes #1110) | ||||
| * | | | | Add attribute “tabindex” to login form (fixes #1110) | coderkun | 2016-08-31 | 1 | -5/+5 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #1215 from ↵ | Roeland Jago Douma | 2016-09-01 | 5 | -4/+15 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | nextcloud/issue-1083-update-live-relative-timestamps Update relative timestamps for a better "live" feeling | ||||
| * | | | | Use live timestamp on comments tab | Joas Schilling | 2016-09-01 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Use live timestamps in the versions tab of the sidebar | Joas Schilling | 2016-09-01 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Use live timestamp in the sidebar details | Joas Schilling | 2016-09-01 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Update live timestamps to give a more live feeling | Joas Schilling | 2016-09-01 | 2 | -1/+9 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #1224 from nextcloud/do-not-allow-linebreak-in-paths | Roeland Jago Douma | 2016-09-01 | 3 | -2/+11 |
|\ \ \ \ | | | | | | | | | | | Do not allow linebreaks and null bytes in paths | ||||
| * | | | | Also prevent null byte character | Joas Schilling | 2016-09-01 | 2 | -1/+3 |
| | | | | | |||||
| * | | | | Add PhantomJS to gitignore | Joas Schilling | 2016-09-01 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Filter out %0A from paths | Joas Schilling | 2016-09-01 | 2 | -2/+8 |
| |/ / / | |||||
* | | | | Merge pull request #1227 from nextcloud/improve-tests | Joas Schilling | 2016-09-01 | 3 | -33/+1 |
|\ \ \ \ | | | | | | | | | | | Improve tests | ||||
| * | | | | properly load APCu extension on CLI to execute APCu tests | Morris Jobke | 2016-09-01 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Remove unneeded Windows logic | Morris Jobke | 2016-09-01 | 2 | -32/+0 |
| |/ / / | |||||
* | | | | Merge pull request #1230 from nextcloud/php7-apcu | Roeland Jago Douma | 2016-09-01 | 2 | -3/+31 |
|\ \ \ \ | | | | | | | | | | | Activate APCu on PHP 7 | ||||
| * | | | | Activate APCu on PHP 7 | Morris Jobke | 2016-09-01 | 2 | -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-profit | Joas Schilling | 2016-09-01 | 12 | -24/+12 |
|\ \ \ \ | | | | | | | | | | | fix a few minor code smells | ||||
| * | | | | Fix phpdoc | Roeland Jago Douma | 2016-08-29 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | fix a few minor code smells | Jörn Friedrich Dreyer | 2016-08-29 | 12 | -23/+11 |
| | | | | | |||||
* | | | | | Merge pull request #1217 from nextcloud/federation_phpunit_fixes | Joas Schilling | 2016-09-01 | 6 | -29/+33 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix deprecated getMock call in Federation app | ||||
| * | | | | | Fix deprecated getMock call in Federation app | Roeland Jago Douma | 2016-08-31 | 6 | -29/+33 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #1223 from nextcloud/core_command_phpunt_getmock | Joas Schilling | 2016-09-01 | 22 | -90/+167 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Fix depreccated getMock in Core/Command tests | ||||
| * | | | | Fix depreccated getMock in Core/Command tests | Roeland Jago Douma | 2016-09-01 | 22 | -90/+167 |
|/ / / / | |||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-09-01 | 280 | -1454/+2330 |
| | | | | |||||
* | | | | Merge pull request #1216 from nextcloud/theming_phpunit_fixes | Julius Härtl | 2016-08-31 | 1 | -5/+5 |
|\ \ \ \ | |/ / / |/| | | | Fix ThemingDefaults getMock deprecation |