Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #2849 from nextcloud/downstream-add-two-factor-exception | Roeland Jago Douma | 2017-01-11 | 6 | -46/+179 | |
|\ \ \ | ||||||
| * | | | Update autoloader | Roeland Jago Douma | 2017-01-11 | 2 | -0/+2 | |
| * | | | fix coding style and increase code coverage | Christoph Wurst | 2017-01-11 | 3 | -61/+131 | |
| * | | | Fix tests | Cornelius Kölbel | 2017-01-11 | 1 | -2/+5 | |
| * | | | Update TwoFactorException.php | Cornelius Kölbel | 2017-01-11 | 1 | -2/+2 | |
| * | | | Add a TwoFactorException | Cornelius Kölbel | 2017-01-11 | 3 | -5/+63 | |
| |/ / | ||||||
* | | | 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 #3020 from nextcloud/2944 | Roeland Jago Douma | 2017-01-11 | 1 | -1/+1 | |
|\ \ \ | ||||||
| * | | | Update mobile.css | Rodrigo Almeida | 2017-01-11 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | 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 | 2 | -5/+37 | |
|\ \ \ \ | ||||||
| * | | | | Only check for local shared storages | Roeland Jago Douma | 2017-01-10 | 2 | -4/+6 | |
| * | | | | Skip local shares in bkg scan and occ files:scan (#26590) | Vincent Petry | 2017-01-10 | 2 | -5/+35 | |
* | | | | | Merge pull request #2951 from nextcloud/handle-nextcloud-log-type-gracefully | Roeland Jago Douma | 2017-01-11 | 3 | -8/+43 | |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | ||||||
| * | | | | Better fallback for unknown log types | Joas Schilling | 2017-01-10 | 2 | -11/+14 | |
| * | | | | Add tests | Joas Schilling | 2017-01-09 | 2 | -1/+17 | |
| * | | | | Handle log_type "nextcloud" more gracefully | Joas Schilling | 2017-01-05 | 2 | -8/+24 | |
| | |/ / | |/| | | ||||||
* | | | | Merge pull request #3012 from nextcloud/fix-karma-image-warnings | Roeland Jago Douma | 2017-01-10 | 1 | -2/+3 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | show fewer warnings in karma test runs | Christoph Wurst | 2017-01-10 | 1 | -2/+3 | |
* | | | | Merge pull request #3009 from nextcloud/fix-calendar-todo-event-type | Morris Jobke | 2017-01-10 | 3 | -5/+5 | |
|\ \ \ \ | ||||||
| * | | | | Make sure the used event type and the setting/filter are the same | Joas Schilling | 2017-01-10 | 3 | -5/+5 | |
* | | | | | Merge pull request #2914 from nextcloud/logrotate-logfile | Morris Jobke | 2017-01-10 | 2 | -2/+4 | |
|\ \ \ \ \ | ||||||
| * | | | | | Get the logfile location while running the logrotate cron job instead of when... | Robin Appelman | 2017-01-06 | 2 | -2/+4 | |
* | | | | | | Merge pull request #3000 from nextcloud/cache-no-store | Roeland Jago Douma | 2017-01-10 | 4 | -5/+5 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | fix controller test | Christoph Wurst | 2017-01-10 | 1 | -1/+1 | |
| * | | | | | | fix data response test expected cache headers | Christoph Wurst | 2017-01-10 | 1 | -1/+1 | |
| * | | | | | | set 'no-store' cache header if we do not want FF to cache | Christoph Wurst | 2017-01-09 | 2 | -3/+3 | |
* | | | | | | | Merge pull request #2943 from nextcloud/kill_old_preview_code | Morris Jobke | 2017-01-10 | 8 | -2336/+24 | |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | ||||||
| * | | | | | | Update autoloader | Roeland Jago Douma | 2017-01-04 | 2 | -2/+0 | |
| * | | | | | | Remove old preview code | Roeland Jago Douma | 2017-01-04 | 3 | -2329/+0 | |
| * | | | | | | Rewrite old preview endpoint for PreviewManager | Roeland Jago Douma | 2017-01-04 | 3 | -5/+24 | |
* | | | | | | | Merge pull request #2955 from nextcloud/make-share-by-mail-work-without-links... | Roeland Jago Douma | 2017-01-10 | 5 | -8/+171 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | allow to access mail shares even if public links are disabled | Bjoern Schiessle | 2017-01-04 | 3 | -7/+61 | |
| * | | | | | | | also create mail share if public links are disabled | Bjoern Schiessle | 2017-01-04 | 2 | -1/+110 | |
* | | | | | | | | Merge pull request #3005 from nextcloud/dev-manual-12 | Roeland Jago Douma | 2017-01-10 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | ||||||
| * | | | | | | | fix dev manual link | Christoph Wurst | 2017-01-10 | 2 | -2/+2 | |
* | | | | | | | | Merge pull request #2982 from nextcloud/better-notification-links | Morris Jobke | 2017-01-10 | 7 | -74/+77 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Fix update notification tests | Joas Schilling | 2017-01-09 | 3 | -45/+27 | |
| * | | | | | | | Cleanup comment tests | Joas Schilling | 2017-01-09 | 2 | -13/+4 | |
| * | | | | | | | Only add the link when the user can follow it. | Joas Schilling | 2017-01-09 | 1 | -3/+34 |