summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #9485 from nextcloud/feature/9441/multiple_token_providersblizzz2018-06-1911-51/+984
|\
| * CommentsRoeland Jago Douma2018-06-195-6/+20
| * Add getProvider helper functionRoeland Jago Douma2018-06-181-35/+17
| * Use constant for token versionRoeland Jago Douma2018-06-186-20/+22
| * Add more testsRoeland Jago Douma2018-06-183-3/+14
| * Generate the new publicKey tokens by default!Roeland Jago Douma2018-06-181-2/+1
| * Actually convert the tokenRoeland Jago Douma2018-06-183-40/+94
| * Add publickey provider to managerRoeland Jago Douma2018-06-181-47/+52
| * SetPassword on PublicKeyTokensRoeland Jago Douma2018-06-181-2/+12
| * Just pass uid to the Token stuffRoeland Jago Douma2018-06-186-52/+26
| * Add first testsRoeland Jago Douma2018-06-181-1/+10
| * Initial PKT implementationRoeland Jago Douma2018-06-188-11/+678
| * Add new authtoken v2 columns to the authtoken tableRoeland Jago Douma2018-06-182-0/+2
| * Abstract the Provider via a managerRoeland Jago Douma2018-06-184-9/+213
* | [tx-robot] updated from transifexNextcloud bot2018-06-192-2/+74
|/
* Merge pull request #9884 from nextcloud/groups-search-use-proper-keysJulius Härtl2018-06-181-2/+2
|\
| * Keep userids as keys on group searchJohn Molakvoæ (skjnldsv)2018-06-151-2/+2
* | Merge pull request #9823 from nextcloud/bufgix/noid/update_token_on_session_i...blizzz2018-06-185-6/+41
|\ \
| * | Allow updating the token on session regenerationRoeland Jago Douma2018-06-145-6/+41
* | | [tx-robot] updated from transifexNextcloud bot2018-06-172-0/+6
* | | [tx-robot] updated from transifexNextcloud bot2018-06-162-4/+4
| |/ |/|
* | Merge pull request #9258 from nextcloud/theming-logo-pngMorris Jobke2018-06-151-1/+1
|\ \
| * | Add info message if an exception occurs during the svg to png conversionJulius Härtl2018-06-141-1/+1
| * | Generate PNG version of the theming app logo for mailsJulius Härtl2018-06-051-1/+1
* | | Merge pull request #9197 from nextcloud/fix-avatar-centerMorris Jobke2018-06-152-34/+141
|\ \ \
| * | | Fix indentJohn Molakvoæ (skjnldsv)2018-06-131-44/+44
| * | | Removed old route, fix tests and fix var typeJohn Molakvoæ (skjnldsv)2018-06-131-1/+1
| * | | Avatar imagick bumpJohn Molakvoæ (skjnldsv)2018-06-132-23/+38
| * | | Embedded fontJohn Molakvoæ (skjnldsv)2018-06-131-2/+11
| * | | Fixed since requirementJohn Molakvoæ (skjnldsv)2018-06-131-0/+1
| * | | Unify colour algorithm outputJohn Molakvoæ (skjnldsv)2018-06-131-5/+11
| * | | Controller tests fixesJohn Molakvoæ (skjnldsv)2018-06-132-43/+60
| * | | Use base image sizeJohn Molakvoæ (skjnldsv)2018-06-131-15/+13
| * | | Return Svg avatarsJohn Molakvoæ (skjnldsv)2018-06-131-25/+60
| * | | Fix avatar generator centeringJohn Molakvoæ (skjnldsv)2018-06-131-5/+31
* | | | Merge pull request #9875 from wiyh12nf89x/Issue#9864_WebDAV_timeout_fix_maxDelayMorris Jobke2018-06-151-1/+1
|\ \ \ \
| * | | | Fix #9864: Decrease $maxDelay in Throttler.phpMark Berezovsky2018-06-151-1/+1
* | | | | Merge pull request #9873 from nextcloud/fix-http-client-given-options-being-o...Morris Jobke2018-06-151-6/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix HTTP client given options being overriden by default optionsDaniel Calviño Sánchez2018-06-141-6/+6
| | |_|/ | |/| |
* / | | [tx-robot] updated from transifexNextcloud bot2018-06-152-2/+2
|/ / /
* | | [tx-robot] updated from transifexNextcloud bot2018-06-14112-324/+324
* | | Merge pull request #9846 from nextcloud/feature/noid/add_stricter_cspsJohn Molakvoæ2018-06-136-2/+198
|\ \ \
| * | | Add stricter CSPsRoeland Jago Douma2018-06-136-2/+198
| |/ /
* | | Merge pull request #9855 from nextcloud/feature/noid/cleanup-old-updater-back...Roeland Jago Douma2018-06-134-0/+54
|\ \ \
| * | | Background job to clean up old backups of the updaterMorris Jobke2018-06-134-0/+54
| |/ /
* / / Merge all setup checks into one controllerMorris Jobke2018-06-132-90/+2
|/ /
* | Merge pull request #9836 from nextcloud/feature/noid/merge-tips-and-tricks-in...Morris Jobke2018-06-134-80/+0
|\ \
| * | Merge tips & tricks section into setup checksMorris Jobke2018-06-134-80/+0
* | | Fix wrong hint about missing indexesMorris Jobke2018-06-131-3/+3
|/ /
* | Merge pull request #9828 from nextcloud/gc-s3-listMorris Jobke2018-06-121-0/+5
|\ \