summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* use tooltip in user listChristoph Wurst2017-01-131-2/+2
* Merge pull request #2918 from nextcloud/encryption-recovery-improvementsMorris Jobke2017-01-1310-81/+176
|\
| * create new encryption keys on password reset and backup the old oneBjoern Schiessle2017-01-1010-81/+176
* | Merge pull request #3035 from nextcloud/fix-federationScopeMenu-menuMorris Jobke2017-01-121-1/+1
|\ \
| * | Update federationscopemenu.jsJohn Molakvoæ2017-01-111-1/+1
* | | [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 optimisationJohn Molakvoæ (skjnldsv)2017-01-111-28/+20
* | | Merge pull request #3027 from nextcloud/multiselect-scss-optimisationJohn Molakvoæ2017-01-111-31/+24
|\ \ \
| * | | Multiselect scss optimisationJohn Molakvoæ (skjnldsv)2017-01-111-31/+24
* | | | Merge pull request #3026 from nextcloud/icons-scss-optimisationMorris Jobke2017-01-111-60/+52
|\ \ \ \
| * | | | Comments and delete iconJohn Molakvoæ (skjnldsv)2017-01-111-7/+19
| * | | | Loader and animationJohn Molakvoæ (skjnldsv)2017-01-111-53/+33
| |/ / /
* | | | Merge pull request #3028 from nextcloud/tooltip-scss-optimisationRoeland Jago Douma2017-01-111-54/+53
|\ \ \ \
| * | | | Tooltip scss optimisationJohn Molakvoæ (skjnldsv)2017-01-111-54/+53
| |/ / /
* | / / [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
|\ \ \
| * | | Update autoloaderRoeland Jago Douma2017-01-112-0/+2
| * | | fix coding style and increase code coverageChristoph Wurst2017-01-113-61/+131
| * | | Fix testsCornelius Kölbel2017-01-111-2/+5
| * | | Update TwoFactorException.phpCornelius Kölbel2017-01-111-2/+2
| * | | Add a TwoFactorExceptionCornelius Kölbel2017-01-113-5/+63
| |/ /
* | | Merge pull request #3007 from Loki3000/masterRoeland Jago Douma2017-01-113-4/+19
|\ \ \ | |/ / |/| |
| * | remove non required sql requestsLoki30002017-01-101-3/+8
| * | 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
|\ \ \
| * | | Update mobile.cssRodrigo Almeida2017-01-111-1/+1
|/ / /
* | | Merge pull request #2744 from nextcloud/oc_26324Roeland Jago Douma2017-01-111-52/+53
|\ \ \
| * | | Fix DAV stat cache to properly cache 404Vincent Petry2017-01-051-52/+53
* | | | Merge pull request #2745 from nextcloud/oc_26590Roeland Jago Douma2017-01-112-5/+37
|\ \ \ \
| * | | | Only check for local shared storagesRoeland Jago Douma2017-01-102-4/+6
| * | | | Skip local shares in bkg scan and occ files:scan (#26590)Vincent Petry2017-01-102-5/+35
* | | | | Merge pull request #2951 from nextcloud/handle-nextcloud-log-type-gracefullyRoeland Jago Douma2017-01-113-8/+43
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Better fallback for unknown log typesJoas Schilling2017-01-102-11/+14
| * | | | Add testsJoas Schilling2017-01-092-1/+17
| * | | | Handle log_type "nextcloud" more gracefullyJoas Schilling2017-01-052-8/+24
| | |/ / | |/| |
* | | | Merge pull request #3012 from nextcloud/fix-karma-image-warningsRoeland Jago Douma2017-01-101-2/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | show fewer warnings in karma test runsChristoph Wurst2017-01-101-2/+3
* | | | 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 sameJoas Schilling2017-01-103-5/+5
* | | | | Merge pull request #2914 from nextcloud/logrotate-logfileMorris Jobke2017-01-102-2/+4
|\ \ \ \ \
| * | | | | Get the logfile location while running the logrotate cron job instead of when...Robin Appelman2017-01-062-2/+4
* | | | | | Merge pull request #3000 from nextcloud/cache-no-storeRoeland Jago Douma2017-01-104-5/+5
|\ \ \ \ \ \