summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Move federated share notifications to ROSJoas Schilling2016-10-203-6/+148
* Allow rich object subjects for NotificationsJoas Schilling2016-10-204-31/+109
* Add Rich Object Definitions and a validatorJoas Schilling2016-10-206-0/+446
* Merge pull request #1810 from nextcloud/drop-placeholders.jsMarius Blüm2016-10-202-460/+0
|\
| * Remove unneeded placeholder polyfillMorris Jobke2016-10-202-460/+0
* | Merge pull request #1797 from nextcloud/issue-1791-show-path-on-filename-conf...Morris Jobke2016-10-202-2/+26
|\ \
| * | Show the path, when the filename conflictsJoas Schilling2016-10-192-2/+26
* | | Merge pull request #1803 from nextcloud/fullscreen-iconMorris Jobke2016-10-203-0/+15
|\ \ \ | |_|/ |/| |
| * | add fullscreen iconJan-Christoph Borchardt2016-10-193-0/+15
* | | Merge pull request #1773 from nextcloud/testing-characters-in-dbLukas Reschke2016-10-1920-33/+263
|\ \ \
| * | | Do not skip when mysql uses utf8mb4Joas Schilling2016-10-191-1/+2
| * | | Fix test of repair stepJoas Schilling2016-10-191-6/+10
| * | | test alternative drone syntax for command optionsMorris Jobke2016-10-192-3/+5
| * | | Fix like queries in the QueryBuilderJoas Schilling2016-10-192-5/+29
| * | | Fix the testJoas Schilling2016-10-191-5/+5
| * | | Ignore failures of collation change in the pre update stepJoas Schilling2016-10-192-11/+30
| * | | add 4 byte mysql test runMorris Jobke2016-10-192-9/+45
| * | | Correctly save and pass on the charsetJoas Schilling2016-10-191-2/+4
| * | | fix dockerThomas Müller2016-10-191-1/+1
| * | | Adding docker based unit test execution for mysql utf8mb4Thomas Müller2016-10-193-1/+36
| * | | Fixing ctor callThomas Müller2016-10-194-6/+6
| * | | only disable unicode test on mysqlMorris Jobke2016-10-191-7/+11
| * | | Add config option to update charset of mysql to utf8mb4Morris Jobke2016-10-199-9/+66
| * | | Adding tests for 4 byte unicode charactersMorris Jobke2016-10-192-0/+46
* | | | Merge pull request #1807 from nextcloud/button-colorMarius Blüm2016-10-191-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | change primary button text color to whiteJan-Christoph Borchardt2016-10-191-1/+1
|/ / /
* | | Merge pull request #1795 from nextcloud/systemtags-activity-wordingRoeland Jago Douma2016-10-191-8/+8
|\ \ \
| * | | change wording of system tags from un/assigned to more human added/removedJan-Christoph Borchardt2016-10-191-8/+8
| | |/ | |/|
* | | Merge pull request #1740 from nextcloud/issue-1707-big-files-on-32-bitsMorris Jobke2016-10-192-2/+9
|\ \ \ | |/ / |/| |
| * | Make sure we only use numbers as lengthJoas Schilling2016-10-192-2/+9
* | | Merge pull request #1784 from nextcloud/fix-activity-filter-namesJoas Schilling2016-10-192-2/+2
|\ \ \ | |/ / |/| |
| * | Adjust wording to make the separation between sharing and files clearerJoas Schilling2016-10-182-2/+2
* | | Merge pull request #1790 from nextcloud/3rdparty-masterRoeland Jago Douma2016-10-191-0/+0
|\ \ \ | |_|/ |/| |
| * | [3rdparty] Point to master againRoeland Jago Douma2016-10-181-0/+0
* | | Merge pull request #1789 from nextcloud/select2-fixesMorris Jobke2016-10-183-78/+113
|\ \ \ | |/ / |/| |
| * | fix select2 sizing issueJan-Christoph Borchardt2016-10-181-1/+4
| * | move select2 styles to core so it's universal, not only for tagsJan-Christoph Borchardt2016-10-183-78/+110
* | | Merge pull request #1164 from nextcloud/avatar-files-accesscontrol-fixesMorris Jobke2016-10-183-7/+66
|\ \ \
| * | | The red box already makes clear it's an errorJoas Schilling2016-10-181-4/+4
| * | | Check the mimetype before reading the content and catch exceptionJoas Schilling2016-10-182-3/+62
| | |/ | |/|
* | | Merge pull request #1788 from nextcloud/share-link-whitespaceMorris Jobke2016-10-181-0/+4
|\ \ \ | |_|/ |/| |
| * | add whitespace above share link so it's visually distinguished moreJan-Christoph Borchardt2016-10-181-0/+4
* | | Merge pull request #1729 from nextcloud/downstream-ldap-3Lukas Reschke2016-10-1812-91/+109
|\ \ \
| * \ \ Merge branch 'master' into downstream-ldap-3Arthur Schiwon2016-10-1661-262/+837
| |\ \ \
| * | | | fix and tidy up tests after merge conflictsArthur Schiwon2016-10-131-16/+8
| * | | | Update tests for phunit 5.5Victor Dubiniuk2016-10-135-30/+47
| * | | | Harden emptyVictor Dubiniuk2016-10-137-50/+59
* | | | | Merge pull request #1771 from nextcloud/fix-issue-loading-checks-from-cacheLukas Reschke2016-10-182-1/+94
|\ \ \ \ \
| * | | | | Do not reset the list after adding cached entriesJoas Schilling2016-10-172-1/+94
| | |_|_|/ | |/| | |
* | | | | Merge pull request #1734 from nextcloud/setvalue_optLukas Reschke2016-10-182-0/+23
|\ \ \ \ \