summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3917 from michaelletzgus/html5-fix_dup-IDsMorris Jobke2017-03-203-5/+5
|\
| * Fix duplicate id "apps-management"Michael Letzgus2017-03-191-1/+1
| * Fix duplicate id "apps-management"Michael Letzgus2017-03-192-4/+4
* | Merge pull request #3931 from nextcloud/downstream-27295Roeland Jago Douma2017-03-202-0/+12
|\ \
| * | test setTagGroups with empty groupidsJörn Friedrich Dreyer2017-03-191-0/+9
| * | don't store empty groupidsJörn Friedrich Dreyer2017-03-191-0/+3
* | | Merge pull request #3930 from nextcloud/downstream-27227Morris Jobke2017-03-201-0/+24
|\ \ \
| * | | Added functions to add files in local_storageSergio Bertolin2017-03-191-0/+24
| |/ /
* | | Merge pull request #3934 from nextcloud/downstream-27246Morris Jobke2017-03-201-4/+4
|\ \ \
| * | | ownC -> NextcMorris Jobke2017-03-191-1/+1
| * | | Update the occ:encrypt-all promptMatthew Setter2017-03-191-4/+4
| |/ /
* | | Merge pull request #3935 from nextcloud/downstream-27293Morris Jobke2017-03-201-1/+1
|\ \ \
| * | | log where a resource was not foundJörn Friedrich Dreyer2017-03-191-1/+1
| |/ /
* | | Merge pull request #3936 from nextcloud/downstream-27253Christoph Wurst2017-03-201-0/+2
|\ \ \
| * | | Add extensionpoint to sharedialogviewFelix Heidecke2017-03-191-0/+2
| |/ /
* | | Merge pull request #3942 from nextcloud/downstream-27264Morris Jobke2017-03-201-0/+4
|\ \ \
| * | | Clear onpopstate handlers after unit testsVincent Petry2017-03-191-0/+4
| |/ /
* | | Merge pull request #3933 from nextcloud/downstream-27258Morris Jobke2017-03-202-2/+8
|\ \ \
| * | | Add percentage to user's quota infoDavid Toledo2017-03-192-2/+8
| |/ /
* | | Merge pull request #3932 from nextcloud/downstream-27273Morris Jobke2017-03-201-9/+2
|\ \ \
| * | | trigger event on input autofillFelix Heidecke2017-03-191-9/+2
| |/ /
* | | Merge pull request #3938 from nextcloud/downstream-27201Morris Jobke2017-03-201-2/+2
|\ \ \
| * | | Defining App "cron" for "Invalidating tokens older than" message #27167 (#27201)Martin2017-03-191-2/+2
| |/ /
* | | Merge pull request #3919 from michaelletzgus/layout-fix_avatarChristoph Wurst2017-03-201-4/+0
|\ \ \ | |/ / |/| |
| * | Fix avatar and caret positionMichael Letzgus2017-03-191-4/+0
| |/
* | [tx-robot] updated from transifexNextcloud bot2017-03-2028-438/+1386
* | Merge pull request #3907 from nextcloud/port-more-db-stuffMorris Jobke2017-03-1917-77/+84
|\ \
| * | Use SystemConfig instead of AllConfig for DB stuffMorris Jobke2017-03-1917-77/+84
|/ /
* | Merge pull request #3927 from nextcloud/minor-fixesMorris Jobke2017-03-198-39/+57
|\ \
| * | Namespace and array syntax fixesMorris Jobke2017-03-198-39/+57
* | | Merge pull request #3906 from nextcloud/shares-circles-2Roeland Jago Douma2017-03-1914-17/+198
|\ \ \
| * | | shares-circlesMaxence Lange2017-03-1714-17/+198
| |/ /
* | | Merge pull request #3913 from cwickert/masterRoeland Jago Douma2017-03-191-1/+1
|\ \ \ | |_|/ |/| |
| * | DummyGetResponsePlugin: ownCloud -> NexcloudChristoph Wickert2017-03-181-1/+1
| |/
* | [tx-robot] updated from transifexNextcloud bot2017-03-198-0/+348
* | Merge pull request #3899 from nextcloud/issue-3662-not-sending-is-an-errorLukas Reschke2017-03-181-1/+4
|\ \
| * | Fail when the test mail could not be sentJoas Schilling2017-03-171-1/+4
* | | [tx-robot] updated from transifexNextcloud bot2017-03-1832-178/+490
* | | Merge pull request #3898 from nextcloud/issue-3627-always-suggest-cli-urlLukas Reschke2017-03-185-10/+36
|\ \ \ | |_|/ |/| |
| * | Always suggest the overwrite.cli.urlJoas Schilling2017-03-175-10/+36
| |/
* | Merge pull request #3904 from nextcloud/revert-3893-downstream-27069Morris Jobke2017-03-176-187/+10
|\ \
| * | Revert "Add integration test for trashbin"Morris Jobke2017-03-176-187/+10
|/ /
* | Merge pull request #3887 from nextcloud/downstream-26379Morris Jobke2017-03-173-0/+377
|\ \
| * | Safer queriesJoas Schilling2017-03-171-2/+2
| * | Better outputJoas Schilling2017-03-171-10/+13
| * | Add CleanupRemoteStorages commandJörn Friedrich Dreyer2017-03-173-0/+374
* | | Merge pull request #3892 from nextcloud/downstream-27101Joas Schilling2017-03-172-254/+293
|\ \ \
| * | | Cleanup testJoas Schilling2017-03-171-254/+266
| * | | Fix unit testJoas Schilling2017-03-171-2/+1
| * | | Redirect unlink to rmdir (#27101)Vincent Petry2017-03-162-1/+29
| |/ /