Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use constants | Joas Schilling | 2017-04-13 | 2 | -2/+2 |
* | Reorder the entries of the log for easier reading | Juan Pablo Villafáñez | 2017-04-12 | 2 | -6/+7 |
* | Merge pull request #3905 from nextcloud/downstream-27069 | Joas Schilling | 2017-04-12 | 5 | -10/+174 |
|\ | |||||
| * | Add drone.yml config | Morris Jobke | 2017-04-11 | 1 | -0/+10 |
| * | Add integration test for trashbin | Vincent Petry | 2017-04-11 | 4 | -10/+164 |
* | | Merge pull request #4317 from nextcloud/cleanup-files_trashbin-update | Björn Schießle | 2017-04-12 | 1 | -42/+0 |
|\ \ | |||||
| * | | [files_trashbin] Remove unneeded update steps | Morris Jobke | 2017-04-12 | 1 | -42/+0 |
* | | | Merge pull request #4316 from nextcloud/cleanup-files_sharing-update | Björn Schießle | 2017-04-12 | 2 | -263/+0 |
|\ \ \ | |||||
| * | | | [files_sharing] Remove unneeded update steps | Morris Jobke | 2017-04-12 | 2 | -263/+0 |
| |/ / | |||||
* | | | Merge pull request #4312 from nextcloud/cleanup-name | Björn Schießle | 2017-04-12 | 54 | -113/+113 |
|\ \ \ | |||||
| * | | | Update comments to Nextcloud | Morris Jobke | 2017-04-11 | 54 | -113/+113 |
| |/ / | |||||
* | | | Merge pull request #4315 from nextcloud/cleanup-files_external-update | Lukas Reschke | 2017-04-12 | 3 | -88/+0 |
|\ \ \ | |||||
| * | | | [files_external] Remove unneeded update steps | Morris Jobke | 2017-04-12 | 3 | -88/+0 |
| |/ / | |||||
* | | | Merge pull request #4309 from nextcloud/remove-unused-code | Lukas Reschke | 2017-04-12 | 4 | -243/+0 |
|\ \ \ | |||||
| * | | | Removes unused code for link share emails | Morris Jobke | 2017-04-11 | 4 | -243/+0 |
| |/ / | |||||
* | | | Merge pull request #4310 from nextcloud/allow-plain-text-email | Lukas Reschke | 2017-04-12 | 4 | -10/+84 |
|\ \ \ | |||||
| * | | | Allow to set text versions for the plain text email | Morris Jobke | 2017-04-11 | 4 | -10/+84 |
| |/ / | |||||
* | | | Merge pull request #4314 from nextcloud/remove-not-needed-update.php | Lukas Reschke | 2017-04-12 | 1 | -98/+0 |
|\ \ \ | |||||
| * | | | Remove update.php of files app | Morris Jobke | 2017-04-12 | 1 | -98/+0 |
| |/ / | |||||
* / / | [tx-robot] updated from transifex | Nextcloud bot | 2017-04-12 | 62 | -26/+244 |
|/ / | |||||
* | | Merge pull request #4304 from nextcloud/add-email-template-to-ocp | Morris Jobke | 2017-04-11 | 11 | -31/+82 |
|\ \ | |/ |/| | |||||
| * | Remove constructor from interface | Lukas Reschke | 2017-04-11 | 1 | -11/+0 |
| * | Adjust class references | Lukas Reschke | 2017-04-11 | 3 | -3/+3 |
| * | Add IEMailTemplate to public OCP API | Lukas Reschke | 2017-04-11 | 8 | -21/+83 |
* | | Merge pull request #4302 from nextcloud/test-integration-test | Roeland Jago Douma | 2017-04-11 | 3 | -1/+36 |
|\ \ | |||||
| * | | Clear opcode cache after config change | Lukas Reschke | 2017-04-11 | 3 | -1/+36 |
| |/ | |||||
* | | Merge pull request #3876 from nextcloud/downstream-26583 | Roeland Jago Douma | 2017-04-11 | 6 | -31/+98 |
|\ \ | |||||
| * | | share api expanded by tags (#26583) | Michael Jobst | 2017-04-11 | 6 | -31/+98 |
* | | | Merge pull request #4285 from nextcloud/bump-md5 | Morris Jobke | 2017-04-11 | 7 | -598/+13 |
|\ \ \ | |/ / |/| | | |||||
| * | | [js] Bump blueimp-md5 a major version | Roeland Jago Douma | 2017-04-10 | 4 | -43/+10 |
| * | | [js] Bump blueimp-md5 | Roeland Jago Douma | 2017-04-10 | 6 | -562/+10 |
* | | | Merge pull request #4293 from nextcloud/fix_4248 | Morris Jobke | 2017-04-11 | 1 | -0/+6 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Do reload shared views | Roeland Jago Douma | 2017-04-11 | 1 | -0/+6 |
* | | | Merge pull request #4280 from nextcloud/share_via_display | Roeland Jago Douma | 2017-04-11 | 2 | -0/+40 |
|\ \ \ | |||||
| * | | | Show 'shared via' in share list for reshares | Roeland Jago Douma | 2017-04-11 | 2 | -0/+40 |
| | |/ | |/| | |||||
* | | | Merge pull request #4256 from nextcloud/theming | Lukas Reschke | 2017-04-11 | 44 | -149/+202 |
|\ \ \ | |||||
| * | | | ThemingDefaults append cacheBusterCounter to logo URL by default | Morris Jobke | 2017-04-09 | 2 | -15/+18 |
| * | | | Move OC_Defaults to OCP\Defaults | Morris Jobke | 2017-04-09 | 42 | -134/+184 |
* | | | | Merge pull request #2618 from nextcloud/2fa-challenge-text | Lukas Reschke | 2017-04-11 | 2 | -21/+25 |
|\ \ \ \ | |||||
| * | | | | Use button instead of simple links | Christoph Wurst | 2017-03-06 | 2 | -6/+4 |
| * | | | | Move log out and back codes link into 2fa box for better readability | Christoph Wurst | 2017-03-06 | 2 | -21/+27 |
* | | | | | Merge pull request #4289 from nextcloud/maintenance-mode-also-on-dav | Morris Jobke | 2017-04-11 | 5 | -0/+64 |
|\ \ \ \ \ | |||||
| * | | | | | Run maintenance mode tests on Drone | Lukas Reschke | 2017-04-11 | 1 | -0/+10 |
| * | | | | | Add integration tests | Lukas Reschke | 2017-04-11 | 3 | -0/+51 |
| * | | | | | Add missing maintenance plugin to new DAV endpoint | Lukas Reschke | 2017-04-11 | 1 | -0/+3 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #4283 from nextcloud/shares-by-folder-quote | Morris Jobke | 2017-04-10 | 3 | -3/+3 |
|\ \ \ \ \ | |||||
| * | | | | | properly quota table names in getSharesInFolder | Robin Appelman | 2017-04-10 | 3 | -3/+3 |
| | |_|_|/ | |/| | | | |||||
* | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-04-11 | 110 | -990/+382 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #4146 from nextcloud/unread-comments-folder | Morris Jobke | 2017-04-10 | 9 | -169/+312 |
|\ \ \ \ | |||||
| * | | | | fix whitespace in cleantags | Robin Appelman | 2017-03-30 | 1 | -1/+1 |