Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3917 from michaelletzgus/html5-fix_dup-IDs | Morris Jobke | 2017-03-20 | 3 | -5/+5 |
|\ | |||||
| * | Fix duplicate id "apps-management" | Michael Letzgus | 2017-03-19 | 1 | -1/+1 |
| * | Fix duplicate id "apps-management" | Michael Letzgus | 2017-03-19 | 2 | -4/+4 |
* | | Merge pull request #3931 from nextcloud/downstream-27295 | Roeland Jago Douma | 2017-03-20 | 2 | -0/+12 |
|\ \ | |||||
| * | | test setTagGroups with empty groupids | Jörn Friedrich Dreyer | 2017-03-19 | 1 | -0/+9 |
| * | | don't store empty groupids | Jörn Friedrich Dreyer | 2017-03-19 | 1 | -0/+3 |
* | | | Merge pull request #3930 from nextcloud/downstream-27227 | Morris Jobke | 2017-03-20 | 1 | -0/+24 |
|\ \ \ | |||||
| * | | | Added functions to add files in local_storage | Sergio Bertolin | 2017-03-19 | 1 | -0/+24 |
| |/ / | |||||
* | | | Merge pull request #3934 from nextcloud/downstream-27246 | Morris Jobke | 2017-03-20 | 1 | -4/+4 |
|\ \ \ | |||||
| * | | | ownC -> Nextc | Morris Jobke | 2017-03-19 | 1 | -1/+1 |
| * | | | Update the occ:encrypt-all prompt | Matthew Setter | 2017-03-19 | 1 | -4/+4 |
| |/ / | |||||
* | | | Merge pull request #3935 from nextcloud/downstream-27293 | Morris Jobke | 2017-03-20 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | log where a resource was not found | Jörn Friedrich Dreyer | 2017-03-19 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #3936 from nextcloud/downstream-27253 | Christoph Wurst | 2017-03-20 | 1 | -0/+2 |
|\ \ \ | |||||
| * | | | Add extensionpoint to sharedialogview | Felix Heidecke | 2017-03-19 | 1 | -0/+2 |
| |/ / | |||||
* | | | Merge pull request #3942 from nextcloud/downstream-27264 | Morris Jobke | 2017-03-20 | 1 | -0/+4 |
|\ \ \ | |||||
| * | | | Clear onpopstate handlers after unit tests | Vincent Petry | 2017-03-19 | 1 | -0/+4 |
| |/ / | |||||
* | | | Merge pull request #3933 from nextcloud/downstream-27258 | Morris Jobke | 2017-03-20 | 2 | -2/+8 |
|\ \ \ | |||||
| * | | | Add percentage to user's quota info | David Toledo | 2017-03-19 | 2 | -2/+8 |
| |/ / | |||||
* | | | Merge pull request #3932 from nextcloud/downstream-27273 | Morris Jobke | 2017-03-20 | 1 | -9/+2 |
|\ \ \ | |||||
| * | | | trigger event on input autofill | Felix Heidecke | 2017-03-19 | 1 | -9/+2 |
| |/ / | |||||
* | | | Merge pull request #3938 from nextcloud/downstream-27201 | Morris Jobke | 2017-03-20 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | Defining App "cron" for "Invalidating tokens older than" message #27167 (#27201) | Martin | 2017-03-19 | 1 | -2/+2 |
| |/ / | |||||
* | | | Merge pull request #3919 from michaelletzgus/layout-fix_avatar | Christoph Wurst | 2017-03-20 | 1 | -4/+0 |
|\ \ \ | |/ / |/| | | |||||
| * | | Fix avatar and caret position | Michael Letzgus | 2017-03-19 | 1 | -4/+0 |
| |/ | |||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-20 | 28 | -438/+1386 |
* | | Merge pull request #3907 from nextcloud/port-more-db-stuff | Morris Jobke | 2017-03-19 | 17 | -77/+84 |
|\ \ | |||||
| * | | Use SystemConfig instead of AllConfig for DB stuff | Morris Jobke | 2017-03-19 | 17 | -77/+84 |
|/ / | |||||
* | | Merge pull request #3927 from nextcloud/minor-fixes | Morris Jobke | 2017-03-19 | 8 | -39/+57 |
|\ \ | |||||
| * | | Namespace and array syntax fixes | Morris Jobke | 2017-03-19 | 8 | -39/+57 |
* | | | Merge pull request #3906 from nextcloud/shares-circles-2 | Roeland Jago Douma | 2017-03-19 | 14 | -17/+198 |
|\ \ \ | |||||
| * | | | shares-circles | Maxence Lange | 2017-03-17 | 14 | -17/+198 |
| |/ / | |||||
* | | | Merge pull request #3913 from cwickert/master | Roeland Jago Douma | 2017-03-19 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | |||||
| * | | DummyGetResponsePlugin: ownCloud -> Nexcloud | Christoph Wickert | 2017-03-18 | 1 | -1/+1 |
| |/ | |||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-19 | 8 | -0/+348 |
* | | Merge pull request #3899 from nextcloud/issue-3662-not-sending-is-an-error | Lukas Reschke | 2017-03-18 | 1 | -1/+4 |
|\ \ | |||||
| * | | Fail when the test mail could not be sent | Joas Schilling | 2017-03-17 | 1 | -1/+4 |
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-18 | 32 | -178/+490 |
* | | | Merge pull request #3898 from nextcloud/issue-3627-always-suggest-cli-url | Lukas Reschke | 2017-03-18 | 5 | -10/+36 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Always suggest the overwrite.cli.url | Joas Schilling | 2017-03-17 | 5 | -10/+36 |
| |/ | |||||
* | | Merge pull request #3904 from nextcloud/revert-3893-downstream-27069 | Morris Jobke | 2017-03-17 | 6 | -187/+10 |
|\ \ | |||||
| * | | Revert "Add integration test for trashbin" | Morris Jobke | 2017-03-17 | 6 | -187/+10 |
|/ / | |||||
* | | Merge pull request #3887 from nextcloud/downstream-26379 | Morris Jobke | 2017-03-17 | 3 | -0/+377 |
|\ \ | |||||
| * | | Safer queries | Joas Schilling | 2017-03-17 | 1 | -2/+2 |
| * | | Better output | Joas Schilling | 2017-03-17 | 1 | -10/+13 |
| * | | Add CleanupRemoteStorages command | Jörn Friedrich Dreyer | 2017-03-17 | 3 | -0/+374 |
* | | | Merge pull request #3892 from nextcloud/downstream-27101 | Joas Schilling | 2017-03-17 | 2 | -254/+293 |
|\ \ \ | |||||
| * | | | Cleanup test | Joas Schilling | 2017-03-17 | 1 | -254/+266 |
| * | | | Fix unit test | Joas Schilling | 2017-03-17 | 1 | -2/+1 |
| * | | | Redirect unlink to rmdir (#27101) | Vincent Petry | 2017-03-16 | 2 | -1/+29 |
| |/ / |