summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-01-1212-26/+98
|
* Merge pull request #3029 from nextcloud/systemtags-scss-optimisationJohn Molakvoæ2017-01-111-28/+20
|\ | | | | Systemtags scss optimisation
| * Systemtags scss optimisationJohn Molakvoæ (skjnldsv)2017-01-111-28/+20
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #3027 from nextcloud/multiselect-scss-optimisationJohn Molakvoæ2017-01-111-31/+24
|\ \ | | | | | | Multiselect scss optimisation
| * | Multiselect scss optimisationJohn Molakvoæ (skjnldsv)2017-01-111-31/+24
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Merge pull request #3026 from nextcloud/icons-scss-optimisationMorris Jobke2017-01-111-60/+52
|\ \ \ | | | | | | | | Icons scss optimisation
| * | | Comments and delete iconJohn Molakvoæ (skjnldsv)2017-01-111-7/+19
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Loader and animationJohn Molakvoæ (skjnldsv)2017-01-111-53/+33
| |/ / | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Merge pull request #3028 from nextcloud/tooltip-scss-optimisationRoeland Jago Douma2017-01-111-54/+53
|\ \ \ | | | | | | | | Tooltip scss optimisation
| * | | Tooltip scss optimisationJohn Molakvoæ (skjnldsv)2017-01-111-54/+53
| |/ / | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | / [tx-robot] updated from transifexNextcloud bot2017-01-1132-290/+604
| |/ |/|
* | Merge pull request #2849 from nextcloud/downstream-add-two-factor-exceptionRoeland Jago Douma2017-01-116-46/+179
|\ \ | | | | | | Downstream add two factor exception
| * | Update autoloaderRoeland Jago Douma2017-01-112-0/+2
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | fix coding style and increase code coverageChristoph Wurst2017-01-113-61/+131
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | Fix testsCornelius Kölbel2017-01-111-2/+5
| | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | Update TwoFactorException.phpCornelius Kölbel2017-01-111-2/+2
| | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | Add a TwoFactorExceptionCornelius Kölbel2017-01-113-5/+63
| |/ | | | | | | | | | | | | | | | | | | | | A Two Factor third party App may throw a TwoFactorException() with a more detailed error message in case the authentication fails. The 2FA Controller will then display the message of this Exception to the user. Working on #26593 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Merge pull request #3007 from Loki3000/masterRoeland Jago Douma2017-01-113-4/+19
|\ \ | |/ |/| Remove non required db requests
| * remove non required sql requestsLoki30002017-01-101-3/+8
| | | | | | | | | | ``` SELECT `appid`, `configkey`, `configvalue` FROM `preferences` WHERE `userid` = ''; ```
| * spaces addedLoki30002017-01-101-1/+1
| |
| * spaces addedLoki30002017-01-101-1/+1
| |
| * allowed '0' uidLoki30002017-01-101-1/+1
| |
| * allowed '0' uidLoki30002017-01-101-2/+2
| |
| * fix spacesLoki30002017-01-101-1/+1
| |
| * fix bracketsLoki30002017-01-101-2/+4
| |
| * remove non required db requestsLoki30002017-01-101-1/+6
| |
| * remove non required db requestsLoki30002017-01-101-1/+4
| |
* | Merge pull request #3020 from nextcloud/2944Roeland Jago Douma2017-01-111-1/+1
|\ \ | | | | | | [#2944] Update mobile.css
| * | Update mobile.cssRodrigo Almeida2017-01-111-1/+1
|/ /
* | Merge pull request #2744 from nextcloud/oc_26324Roeland Jago Douma2017-01-111-52/+53
|\ \ | | | | | | [downstream] Fix DAV stat cache to properly cache 404
| * | Fix DAV stat cache to properly cache 404Vincent Petry2017-01-051-52/+53
| | | | | | | | | | | | | | | | | | 404 errors were not properly cached due to catching the wrong exception. Now catching ClientHttpException and checking the error code. In case of 404, adjust the stat cache accordingly.
* | | Merge pull request #2745 from nextcloud/oc_26590Roeland Jago Douma2017-01-112-5/+37
|\ \ \ | | | | | | | | [downstream] Skip local shares in bkg scan and occ files:scan (#26590)
| * | | Only check for local shared storagesRoeland Jago Douma2017-01-102-4/+6
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Skip local shares in bkg scan and occ files:scan (#26590)Vincent Petry2017-01-102-5/+35
| | | | | | | | | | | | | | | | | | | | Local shares should only be scanned when doing it for the owner to avoid repeatedly rescanning the same shared storage over and over again for every recipient.
* | | | Merge pull request #2951 from nextcloud/handle-nextcloud-log-type-gracefullyRoeland Jago Douma2017-01-113-8/+43
|\ \ \ \ | | | | | | | | | | Handle log_type "nextcloud" more gracefully
| * | | | Better fallback for unknown log typesJoas Schilling2017-01-102-11/+14
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Add testsJoas Schilling2017-01-092-1/+17
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Handle log_type "nextcloud" more gracefullyJoas Schilling2017-01-052-8/+24
| | |/ / | |/| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #3012 from nextcloud/fix-karma-image-warningsRoeland Jago Douma2017-01-101-2/+3
|\ \ \ \ | |_|/ / |/| | | show fewer warnings in karma test runs
| * | | show fewer warnings in karma test runsChristoph Wurst2017-01-101-2/+3
| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Merge pull request #3009 from nextcloud/fix-calendar-todo-event-typeMorris Jobke2017-01-103-5/+5
|\ \ \ \ | | | | | | | | | | Make sure the used event type and the setting/filter are the same
| * | | | Make sure the used event type and the setting/filter are the sameJoas Schilling2017-01-103-5/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #2914 from nextcloud/logrotate-logfileMorris Jobke2017-01-102-2/+4
|\ \ \ \ \ | | | | | | | | | | | | Get the logfile location while running the logrotate cron job instead…
| * | | | | Get the logfile location while running the logrotate cron job instead of ↵Robin Appelman2017-01-062-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when registering the job Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Merge pull request #3000 from nextcloud/cache-no-storeRoeland Jago Douma2017-01-104-5/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | set 'no-store' cache header if we do not want FF to cache
| * | | | | | fix controller testChristoph Wurst2017-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | | | | fix data response test expected cache headersChristoph Wurst2017-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | | | | set 'no-store' cache header if we do not want FF to cacheChristoph Wurst2017-01-092-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | | Merge pull request #2943 from nextcloud/kill_old_preview_codeMorris Jobke2017-01-108-2336/+24
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Cleanup old preview code
| * | | | | | Update autoloaderRoeland Jago Douma2017-01-042-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-06 15:45:44 +0000