summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3141 from nextcloud/subadmin-check-on-removing-user-from-...Joas Schilling2017-01-231-1/+1
|\
| * Fix CamelCasingJoas Schilling2017-01-181-1/+1
* | Merge pull request #3004 from nextcloud/fix-installation-cssLukas Reschke2017-01-222-21/+28
|\ \
| * | Create unified css file and merge all needed data into this fileJohn Molakvoæ (skjnldsv)2017-01-101-4/+5
| * | 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 #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-173-10/+48
|\ \ \ | |/ / |/| |
| * | Fix testsJoas Schilling2017-01-121-1/+0
| * | Filter out sensitive appconfig valuesJoas Schilling2017-01-112-9/+48
* | | 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-131-0/+35
|\ \ \ \ | |/ / / |/| | |
| * | | create new encryption keys on password reset and backup the old oneBjoern Schiessle2017-01-101-0/+35
* | | | 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
| * | | | Add testsJoas Schilling2017-01-091-1/+1
| * | | | Handle log_type "nextcloud" more gracefullyJoas Schilling2017-01-052-8/+24
| |/ / /
* | | | Merge pull request #2914 from nextcloud/logrotate-logfileMorris Jobke2017-01-101-1/+3
|\ \ \ \
| * | | | Get the logfile location while running the logrotate cron job instead of when...Robin Appelman2017-01-061-1/+3
* | | | | Merge pull request #2943 from nextcloud/kill_old_preview_codeMorris Jobke2017-01-103-1353/+23
|\ \ \ \ \
| * | | | | Remove old preview codeRoeland Jago Douma2017-01-041-1349/+0
| * | | | | Rewrite old preview endpoint for PreviewManagerRoeland Jago Douma2017-01-042-4/+23
* | | | | | Merge pull request #2955 from nextcloud/make-share-by-mail-work-without-links...Roeland Jago Douma2017-01-101-1/+0
|\ \ \ \ \ \
| * | | | | | also create mail share if public links are disabledBjoern Schiessle2017-01-041-1/+0
| |/ / / / /