Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [files_external] Remove unneeded update steps | Morris Jobke | 2017-04-12 | 3 | -88/+0 |
* | 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 |
| * | | | | fix quote helper test | Robin Appelman | 2017-03-30 | 2 | -2/+2 |
| * | | | | update FakeManager | Robin Appelman | 2017-03-30 | 1 | -0/+3 |
| * | | | | use castColumn | Robin Appelman | 2017-03-30 | 1 | -4/+1 |
| * | | | | Add test for getting unread comment count by folder | Robin Appelman | 2017-03-30 | 2 | -81/+145 |
| * | | | | Allow getting the unread comment count for an entire folder at once | Robin Appelman | 2017-03-30 | 4 | -90/+169 |
* | | | | | Merge pull request #4274 from nextcloud/fix-share-by-mail-capabilities | Roeland Jago Douma | 2017-04-10 | 5 | -21/+98 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | move capabilities to share by mail app | Bjoern Schiessle | 2017-04-10 | 5 | -21/+98 |
* | | | | | Merge pull request #4277 from nextcloud/permissions-mask-scanner | Björn Schießle | 2017-04-10 | 2 | -0/+16 |
|\ \ \ \ \ | |||||
| * | | | | | Dont use the permissions mask while scanning | Robin Appelman | 2017-04-10 | 2 | -0/+16 |
* | | | | | | Merge pull request #4222 from nextcloud/dav-search-fileid | Roeland Jago Douma | 2017-04-10 | 2 | -4/+8 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Allow searching file by fileid | Robin Appelman | 2017-04-05 | 2 | -4/+8 |
* | | | | | | Merge pull request #4210 from nextcloud/downstream-26643 | Roeland Jago Douma | 2017-04-10 | 1 | -15/+15 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Lowercase "data" correctly | Joas Schilling | 2017-04-10 | 1 | -6/+6 |
| * | | | | | | removed path to datadir | Kawohl | 2017-04-04 | 1 | -13/+13 |
* | | | | | | | Merge pull request #4271 from nextcloud/also-send-the-new-data-with-the-event | Joas Schilling | 2017-04-10 | 2 | -6/+9 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Also send the new account data with the event | Joas Schilling | 2017-04-10 | 2 | -6/+9 |
* | | | | | | | Merge pull request #4250 from nextcloud/disable-lookupserver-upload | Björn Schießle | 2017-04-10 | 8 | -6/+74 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | simplify return statement | Bjoern Schiessle | 2017-04-10 | 1 | -4/+4 |
| * | | | | | | | make sure that the selector for the visibility always fits next to 'Profile p... | Bjoern Schiessle | 2017-04-07 | 1 | -1/+1 |