Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3116 from nextcloud/spreed-turnserver-secret-is-sensitive | Lukas Reschke | 2017-01-17 | 1 | -0/+4 |
|\ | |||||
| * | Make sure the spreed TURN server secret stays a secret | Joas Schilling | 2017-01-17 | 1 | -0/+4 |
* | | Merge pull request #3075 from nils/debug-no-versionhash | Joas Schilling | 2017-01-17 | 1 | -3/+12 |
|\ \ | |/ |/| | |||||
| * | [Enhancement] Do not add version hash in debug mode | Nils | 2017-01-15 | 1 | -3/+12 |
* | | Merge pull request #1594 from nextcloud/markdown-support-for-app-descriptions | Joas Schilling | 2017-01-17 | 1 | -31/+9 |
|\ \ | |||||
| * | | Fix tests | Joas Schilling | 2017-01-13 | 1 | -8/+8 |
| * | | Remove the magic parsing of the description | Joas Schilling | 2017-01-13 | 1 | -24/+2 |
| |/ | |||||
* | | Merge pull request #3023 from nextcloud/issue-2915-filter-out-sensitive-appco... | Christoph Wurst | 2017-01-17 | 3 | -10/+48 |
|\ \ | |/ |/| | |||||
| * | Fix tests | Joas Schilling | 2017-01-12 | 1 | -1/+0 |
| * | Filter out sensitive appconfig values | Joas Schilling | 2017-01-11 | 2 | -9/+48 |
* | | Merge pull request #3051 from nextcloud/issue-2831-change-row-format-before-c... | Joas Schilling | 2017-01-13 | 1 | -0/+12 |
|\ \ | |||||
| * | | Change the row-format before changing the collation | Joas Schilling | 2017-01-12 | 1 | -0/+12 |
* | | | Merge pull request #2918 from nextcloud/encryption-recovery-improvements | Morris Jobke | 2017-01-13 | 1 | -0/+35 |
|\ \ \ | |/ / |/| | | |||||
| * | | create new encryption keys on password reset and backup the old one | Bjoern Schiessle | 2017-01-10 | 1 | -0/+35 |
* | | | Merge pull request #3007 from Loki3000/master | Roeland Jago Douma | 2017-01-11 | 3 | -4/+19 |
|\ \ \ | |_|/ |/| | | |||||
| * | | remove non required sql requests | Loki3000 | 2017-01-10 | 1 | -3/+8 |
| * | | spaces added | Loki3000 | 2017-01-10 | 1 | -1/+1 |
| * | | spaces added | Loki3000 | 2017-01-10 | 1 | -1/+1 |
| * | | allowed '0' uid | Loki3000 | 2017-01-10 | 1 | -1/+1 |
| * | | allowed '0' uid | Loki3000 | 2017-01-10 | 1 | -2/+2 |
| * | | fix spaces | Loki3000 | 2017-01-10 | 1 | -1/+1 |
| * | | fix brackets | Loki3000 | 2017-01-10 | 1 | -2/+4 |
| * | | remove non required db requests | Loki3000 | 2017-01-10 | 1 | -1/+6 |
| * | | remove non required db requests | Loki3000 | 2017-01-10 | 1 | -1/+4 |
* | | | Merge pull request #2744 from nextcloud/oc_26324 | Roeland Jago Douma | 2017-01-11 | 1 | -52/+53 |
|\ \ \ | |||||
| * | | | Fix DAV stat cache to properly cache 404 | Vincent Petry | 2017-01-05 | 1 | -52/+53 |
* | | | | Merge pull request #2745 from nextcloud/oc_26590 | Roeland Jago Douma | 2017-01-11 | 1 | -5/+16 |
|\ \ \ \ | |||||
| * | | | | Only check for local shared storages | Roeland Jago Douma | 2017-01-10 | 1 | -2/+3 |
| * | | | | Skip local shares in bkg scan and occ files:scan (#26590) | Vincent Petry | 2017-01-10 | 1 | -5/+15 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #2951 from nextcloud/handle-nextcloud-log-type-gracefully | Roeland Jago Douma | 2017-01-11 | 2 | -8/+25 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Better fallback for unknown log types | Joas Schilling | 2017-01-10 | 1 | -9/+10 |
| * | | | Add tests | Joas Schilling | 2017-01-09 | 1 | -1/+1 |
| * | | | Handle log_type "nextcloud" more gracefully | Joas Schilling | 2017-01-05 | 2 | -8/+24 |
| |/ / | |||||
* | | | Merge pull request #2914 from nextcloud/logrotate-logfile | Morris Jobke | 2017-01-10 | 1 | -1/+3 |
|\ \ \ | |||||
| * | | | Get the logfile location while running the logrotate cron job instead of when... | Robin Appelman | 2017-01-06 | 1 | -1/+3 |
* | | | | Merge pull request #2943 from nextcloud/kill_old_preview_code | Morris Jobke | 2017-01-10 | 3 | -1353/+23 |
|\ \ \ \ | |||||
| * | | | | Remove old preview code | Roeland Jago Douma | 2017-01-04 | 1 | -1349/+0 |
| * | | | | Rewrite old preview endpoint for PreviewManager | Roeland Jago Douma | 2017-01-04 | 2 | -4/+23 |
* | | | | | Merge pull request #2955 from nextcloud/make-share-by-mail-work-without-links... | Roeland Jago Douma | 2017-01-10 | 1 | -1/+0 |
|\ \ \ \ \ | |||||
| * | | | | | also create mail share if public links are disabled | Bjoern Schiessle | 2017-01-04 | 1 | -1/+0 |
| |/ / / / | |||||
* | | | | | Merge pull request #2925 from nextcloud/remove-close-wrapper | Roeland Jago Douma | 2017-01-10 | 5 | -163/+32 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | replace close:// streamwrapper with CallBackWrapper | Robin Appelman | 2017-01-06 | 5 | -163/+32 |
* | | | | | Default value for null user | Loki3000 | 2017-01-09 | 1 | -0/+1 |
* | | | | | Merge pull request #2987 from nextcloud/no-empty-bundle | Lukas Reschke | 2017-01-09 | 2 | -5/+19 |
|\ \ \ \ \ | |||||
| * | | | | | dont write a certificate bundle if the shipped ca bundle is empty | Robin Appelman | 2017-01-09 | 2 | -5/+19 |
* | | | | | | Merge pull request #2992 from nextcloud/fix_subdir_install_style | Morris Jobke | 2017-01-09 | 1 | -3/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix subdir install style | Roeland Jago Douma | 2017-01-09 | 1 | -3/+3 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #2814 from nextcloud/appstore_etag_validation | Joas Schilling | 2017-01-09 | 2 | -6/+40 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Add ETag validation to appstore requests | Roeland Jago Douma | 2017-01-05 | 2 | -6/+40 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #2930 from nextcloud/kill-group-restriction-when-not-appli... | Roeland Jago Douma | 2017-01-06 | 2 | -0/+23 |
|\ \ \ \ \ | |_|_|/ / |/| | | | |