summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3004 from nextcloud/fix-installation-cssLukas Reschke2017-01-223-26/+34
|\
| * Create unified css file and merge all needed data into this fileJohn Molakvoæ (skjnldsv)2017-01-102-9/+11
| * Removed jquery scssJohn Molakvoæ (skjnldsv)2017-01-102-19/+25
* | Fix default of mail_smtpmode - fixes #3102Morris Jobke2017-01-191-1/+1
* | add action to existing brute force protectionBjoern Schiessle2017-01-181-3/+3
* | handle optional annotation parametersBjoern Schiessle2017-01-182-3/+20
* | Fix the regex for annotations with valuesJoas Schilling2017-01-181-1/+1
* | introduce brute force protection for api callsBjoern Schiessle2017-01-183-11/+37
* | Merge pull request #3116 from nextcloud/spreed-turnserver-secret-is-sensitiveLukas Reschke2017-01-171-0/+4
|\ \
| * | Make sure the spreed TURN server secret stays a secretJoas Schilling2017-01-171-0/+4
* | | Merge pull request #3075 from nils/debug-no-versionhashJoas Schilling2017-01-171-3/+12
|\ \ \
| * | | [Enhancement] Do not add version hash in debug modeNils2017-01-151-3/+12
* | | | Merge pull request #3106 from nextcloud/spreed-calls-are-objectsJoas Schilling2017-01-171-0/+25
|\ \ \ \ | |_|/ / |/| | |
| * | | Add call-type in case the information shall be used for styling or something ...Joas Schilling2017-01-171-0/+6
| * | | Define spreed callsJoas Schilling2017-01-161-0/+19
* | | | Merge pull request #1594 from nextcloud/markdown-support-for-app-descriptionsJoas Schilling2017-01-171-31/+9
|\ \ \ \
| * | | | Fix testsJoas Schilling2017-01-131-8/+8
| * | | | Remove the magic parsing of the descriptionJoas Schilling2017-01-131-24/+2
| | |/ / | |/| |
* | | | Merge pull request #3023 from nextcloud/issue-2915-filter-out-sensitive-appco...Christoph Wurst2017-01-174-10/+57
|\ \ \ \
| * | | | Fix testsJoas Schilling2017-01-121-1/+0
| * | | | Filter out sensitive appconfig valuesJoas Schilling2017-01-113-9/+57
* | | | | [tx-robot] updated from transifexNextcloud bot2017-01-172-0/+10
| |_|/ / |/| | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-01-164-12/+12
| |/ / |/| |
* | | Merge pull request #3051 from nextcloud/issue-2831-change-row-format-before-c...Joas Schilling2017-01-131-0/+12
|\ \ \
| * | | Change the row-format before changing the collationJoas Schilling2017-01-121-0/+12
* | | | Merge pull request #2918 from nextcloud/encryption-recovery-improvementsMorris Jobke2017-01-132-0/+45
|\ \ \ \ | |/ / / |/| | |
| * | | create new encryption keys on password reset and backup the old oneBjoern Schiessle2017-01-102-0/+45
* | | | [tx-robot] updated from transifexNextcloud bot2017-01-114-6/+14
* | | | Merge pull request #2849 from nextcloud/downstream-add-two-factor-exceptionRoeland Jago Douma2017-01-113-0/+40
|\ \ \ \
| * | | | Update autoloaderRoeland Jago Douma2017-01-112-0/+2
| * | | | fix coding style and increase code coverageChristoph Wurst2017-01-111-12/+13
| * | | | Update TwoFactorException.phpCornelius Kölbel2017-01-111-2/+2
| * | | | Add a TwoFactorExceptionCornelius Kölbel2017-01-111-0/+37
| | |/ / | |/| |
* | | | 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 #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-111-5/+16
|\ \ \ \ \
| * | | | | Only check for local shared storagesRoeland Jago Douma2017-01-101-2/+3
| * | | | | Skip local shares in bkg scan and occ files:scan (#26590)Vincent Petry2017-01-101-5/+15
| | |_|/ / | |/| | |
* | | | | Merge pull request #2951 from nextcloud/handle-nextcloud-log-type-gracefullyRoeland Jago Douma2017-01-112-8/+25
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Better fallback for unknown log typesJoas Schilling2017-01-101-9/+10