| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Move federated share notifications to ROS | Joas Schilling | 2016-10-20 | 3 | -6/+148 |
| | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | Allow rich object subjects for Notifications | Joas Schilling | 2016-10-20 | 4 | -31/+109 |
| | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | Add Rich Object Definitions and a validator | Joas Schilling | 2016-10-20 | 6 | -0/+446 |
| | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | Merge pull request #1810 from nextcloud/drop-placeholders.js | Marius Blüm | 2016-10-20 | 2 | -460/+0 |
| |\ | | | | | Remove unneeded placeholder polyfill | ||||
| | * | Remove unneeded placeholder polyfill | Morris Jobke | 2016-10-20 | 2 | -460/+0 |
| | | | | | | | | | | | | | | | * placeholders are supported in IE11+ * http://caniuse.com/#feat=input-placeholder Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | | Merge pull request #1797 from ↵ | Morris Jobke | 2016-10-20 | 2 | -2/+26 |
| |\ \ | | | | | | | | | | | | | nextcloud/issue-1791-show-path-on-filename-conflict Show the path, when the filename conflicts | ||||
| | * | | Show the path, when the filename conflicts | Joas Schilling | 2016-10-19 | 2 | -2/+26 |
| | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | Merge pull request #1803 from nextcloud/fullscreen-icon | Morris Jobke | 2016-10-20 | 3 | -0/+15 |
| |\ \ \ | |_|/ |/| | | add fullscreen icon | ||||
| | * | | add fullscreen icon | Jan-Christoph Borchardt | 2016-10-19 | 3 | -0/+15 |
| | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
| * | | | Merge pull request #1773 from nextcloud/testing-characters-in-db | Lukas Reschke | 2016-10-19 | 20 | -33/+263 |
| |\ \ \ | | | | | | | | | MySQL 4byte support | ||||
| | * | | | Do not skip when mysql uses utf8mb4 | Joas Schilling | 2016-10-19 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | | | Fix test of repair step | Joas Schilling | 2016-10-19 | 1 | -6/+10 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | | | test alternative drone syntax for command options | Morris Jobke | 2016-10-19 | 2 | -3/+5 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| | * | | | Fix like queries in the QueryBuilder | Joas Schilling | 2016-10-19 | 2 | -5/+29 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | | | Fix the test | Joas Schilling | 2016-10-19 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | | | Ignore failures of collation change in the pre update step | Joas Schilling | 2016-10-19 | 2 | -11/+30 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | | | add 4 byte mysql test run | Morris Jobke | 2016-10-19 | 2 | -9/+45 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| | * | | | Correctly save and pass on the charset | Joas Schilling | 2016-10-19 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | | | fix docker | Thomas Müller | 2016-10-19 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Adding docker based unit test execution for mysql utf8mb4 | Thomas Müller | 2016-10-19 | 3 | -1/+36 |
| | | | | | |||||
| | * | | | Fixing ctor call | Thomas Müller | 2016-10-19 | 4 | -6/+6 |
| | | | | | |||||
| | * | | | only disable unicode test on mysql | Morris Jobke | 2016-10-19 | 1 | -7/+11 |
| | | | | | |||||
| | * | | | Add config option to update charset of mysql to utf8mb4 | Morris Jobke | 2016-10-19 | 9 | -9/+66 |
| | | | | | | | | | | | | | | | | | | | | | * fully optional * requires additional options set in the database | ||||
| | * | | | Adding tests for 4 byte unicode characters | Morris Jobke | 2016-10-19 | 2 | -0/+46 |
| | | | | | | | | | | | | | | | | | | | | | * success on SQLite and Postgres * failure on MySQL due to the limited charset that only supports up to 3 bytes | ||||
| * | | | | Merge pull request #1807 from nextcloud/button-color | Marius Blüm | 2016-10-19 | 1 | -1/+1 |
| |\ \ \ \ | |_|/ / |/| | | | change primary button text color to white | ||||
| | * | | | change primary button text color to white | Jan-Christoph Borchardt | 2016-10-19 | 1 | -1/+1 |
| |/ / / | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
| * | | | Merge pull request #1795 from nextcloud/systemtags-activity-wording | Roeland Jago Douma | 2016-10-19 | 1 | -8/+8 |
| |\ \ \ | | | | | | | | | change wording of system tags from un/assigned to more human added/removed | ||||
| | * | | | change wording of system tags from un/assigned to more human added/removed | Jan-Christoph Borchardt | 2016-10-19 | 1 | -8/+8 |
| | | |/ | |/| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
| * | | | Merge pull request #1740 from nextcloud/issue-1707-big-files-on-32-bits | Morris Jobke | 2016-10-19 | 2 | -2/+9 |
| |\ \ \ | |/ / |/| | | Make sure we only use numbers as length | ||||
| | * | | Make sure we only use numbers as length | Joas Schilling | 2016-10-19 | 2 | -2/+9 |
| | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | Merge pull request #1784 from nextcloud/fix-activity-filter-names | Joas Schilling | 2016-10-19 | 2 | -2/+2 |
| |\ \ \ | |/ / |/| | | Adjust wording to make the separation between sharing and files more clear | ||||
| | * | | Adjust wording to make the separation between sharing and files clearer | Joas Schilling | 2016-10-18 | 2 | -2/+2 |
| | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | Merge pull request #1790 from nextcloud/3rdparty-master | Roeland Jago Douma | 2016-10-19 | 1 | -0/+0 |
| |\ \ \ | |_|/ |/| | | [3rdparty] Point to master again | ||||
| | * | | [3rdparty] Point to master again | Roeland Jago Douma | 2016-10-18 | 1 | -0/+0 |
| | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | Merge pull request #1789 from nextcloud/select2-fixes | Morris Jobke | 2016-10-18 | 3 | -78/+113 |
| |\ \ \ | |/ / |/| | | move select2 styles to core so it's universal, not only for tags | ||||
| | * | | fix select2 sizing issue | Jan-Christoph Borchardt | 2016-10-18 | 1 | -1/+4 |
| | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
| | * | | move select2 styles to core so it's universal, not only for tags | Jan-Christoph Borchardt | 2016-10-18 | 3 | -78/+110 |
| | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
| * | | | Merge pull request #1164 from nextcloud/avatar-files-accesscontrol-fixes | Morris Jobke | 2016-10-18 | 3 | -7/+66 |
| |\ \ \ | | | | | | | | | Avatar/file-picker fixes for access-control app | ||||
| | * | | | The red box already makes clear it's an error | Joas Schilling | 2016-10-18 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | | | Check the mimetype before reading the content and catch exception | Joas Schilling | 2016-10-18 | 2 | -3/+62 |
| | | |/ | |/| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | Merge pull request #1788 from nextcloud/share-link-whitespace | Morris Jobke | 2016-10-18 | 1 | -0/+4 |
| |\ \ \ | |_|/ |/| | | add whitespace above share link so it's visually distinguished more | ||||
| | * | | add whitespace above share link so it's visually distinguished more | Jan-Christoph Borchardt | 2016-10-18 | 1 | -0/+4 |
| | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
| * | | | Merge pull request #1729 from nextcloud/downstream-ldap-3 | Lukas Reschke | 2016-10-18 | 12 | -91/+109 |
| |\ \ \ | | | | | | | | | [downstream] LDAP empty hardening | ||||
| | * \ \ | Merge branch 'master' into downstream-ldap-3 | Arthur Schiwon | 2016-10-16 | 61 | -262/+837 |
| | |\ \ \ | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| | * | | | | fix and tidy up tests after merge conflicts | Arthur Schiwon | 2016-10-13 | 1 | -16/+8 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| | * | | | | Update tests for phunit 5.5 | Victor Dubiniuk | 2016-10-13 | 5 | -30/+47 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| | * | | | | Harden empty | Victor Dubiniuk | 2016-10-13 | 7 | -50/+59 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| * | | | | | Merge pull request #1771 from nextcloud/fix-issue-loading-checks-from-cache | Lukas Reschke | 2016-10-18 | 2 | -1/+94 |
| |\ \ \ \ \ | | | | | | | | | | | | | Do not reset the list after adding cached entries | ||||
| | * | | | | | Do not reset the list after adding cached entries | Joas Schilling | 2016-10-17 | 2 | -1/+94 |
| | | |_|_|/ | |/| | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | | | Merge pull request #1734 from nextcloud/setvalue_opt | Lukas Reschke | 2016-10-18 | 2 | -0/+23 |
| |\ \ \ \ \ | | | | | | | | | | | | | AllConfig setUserValue opt | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |