summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Fix testsRoeland Jago Douma2016-10-241-19/+19
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Move files_sharing Controllers => ControllerRoeland Jago Douma2016-10-246-10/+10
| | | | | | | lib/Controller is the default location for controllers. So lets put them all in there. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Fix middleware testsRoeland Jago Douma2016-10-241-13/+17
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Move Share20OCS to ShareAPIControllerRoeland Jago Douma2016-10-245-119/+109
| | | | | | | | | | | | It was already a controller just still residing in its old location. * Moved ShareAPIController to user plain userID instead of user object * Moved Share20OCS to ShareAPIController * Removed initisation of class from Application.php and leave it to the AppFramework * Fixed tests Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #1849 from nextcloud/oc_26368Lukas Reschke2016-10-223-0/+82
|\ | | | | Adding capability about new chunking - refs #25682 (#26368)
| * Add unit testLukas Reschke2016-10-221-0/+40
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * Adding capability about new chunking - refs #25682 (#26368)Thomas Müller2016-10-212-0/+42
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #1832 from nextcloud/select2-into-coreLukas Reschke2016-10-222-5/+0
|\ \ | | | | | | Select2 into core
| * | Template css orderJohn Molakvoæ2016-10-212-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | Select2 systemtags removal Settings again Fix Script Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Fix testsRoeland Jago Douma2016-10-211-1/+1
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Adding Open Graph Support for public shares http://ogp.me/Thomas Müller2016-10-214-6/+41
| |/ |/| | | | | | | | | In case no preview is available we display the ownCloud logo Fix unit test
* | Merge pull request #1834 from nextcloud/downstream-26186Morris Jobke2016-10-214-18/+94
|\ \ | | | | | | Add more files plugins to new DAV endpoint
| * | Add more files plugins to new DAV endpoint (#26186)Vincent Petry2016-10-204-18/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add more files plugins to new DAV endpoint Also fix report plugin to properly retrieve the path from the prolongated URL * In case the report is not for this plugin -> simply return to allow other plugins to get executed * Adjust onReport tests to match new behavior
* | | Merge pull request #1806 from nextcloud/karakayasemi_1767Roeland Jago Douma2016-10-211-4/+4
|\ \ \ | | | | | | | | Update file.php put function posthook calls
| * | | Update file.php put function posthook callsSemih Serhat Karakaya2016-10-201-4/+4
| |/ / | | | | | | | | | | | | | | | Logicaly, postHooks should emit after touch. For chunking file it is already emitting after touch. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #1835 from nextcloud/downstream-24948Morris Jobke2016-10-2014-22/+20
|\ \ \ | |/ / |/| | Move OC\Files\Storage\Shared to the right namespace
| * | Move OC\Files\Storage\Shared to the right namespaceJoas Schilling2016-10-2014-22/+20
| | |
* | | Merge pull request #1826 from nextcloud/downstream-26391Morris Jobke2016-10-201-0/+22
|\ \ \ | |/ / |/| | Fix post_unshareFromSelf hook parameter format
| * | Fix post_unshareFromSelf hook parameter formatVincent Petry2016-10-201-0/+22
| |/ | | | | | | | | | | | | | | | | | | When unsharing from self in a group share situation, the share items passed to the post_unshareFromSelf hook were using the wrong format in which the attribute names (ex: "share_type") have non camel-case format. This fix makes sure that in group sharing case we use the correct format. It looks like the code was already producing it but in array_merge it was not using it and adding the unprocessed one.
* | Merge pull request #1821 from nextcloud/downstream-26366Morris Jobke2016-10-202-22/+25
|\ \ | | | | | | Code style changes from downstream
| * | Sanitize length headers when validating quotaThomas Müller2016-10-202-22/+25
| |/
* | Merge pull request #1796 from nextcloud/oc_fav-reportLukas Reschke2016-10-2011-276/+118
|\ \ | |/ |/| Make it possible to filter by tags with REPORT method
| * Make it possible to filter by tags with REPORT methodVincent Petry2016-10-1911-276/+118
| | | | | | | | | | | | | | | | | | | | | | Enhanced the REPORT method on the Webdav endpoint and added a "oc:favorite" filter rule. When set, it will return a flat list of results filtered with only favorite files. The web UI was also adjusted to use this REPORT method instead of the private API endpoint. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #1768 from nextcloud/more-filepickerJan-Christoph Borchardt2016-10-201-0/+1
|\ \ | | | | | | More filepicker improvements
| * | fix file exist dialog stylingRobin Appelman2016-10-191-0/+1
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #1797 from ↵Morris Jobke2016-10-202-2/+26
|\ \ \ | |/ / |/| | | | | | | | nextcloud/issue-1791-show-path-on-filename-conflict Show the path, when the filename conflicts
| * | Show the path, when the filename conflictsJoas Schilling2016-10-192-2/+26
| |/ | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | 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/removed
| * | change wording of system tags from un/assigned to more human added/removedJan-Christoph Borchardt2016-10-191-8/+8
| |/ | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | 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 length
| * Make sure we only use numbers as lengthJoas Schilling2016-10-192-2/+9
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | 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 more clear
| * Adjust wording to make the separation between sharing and files clearerJoas Schilling2016-10-182-2/+2
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #1788 from nextcloud/share-link-whitespaceMorris Jobke2016-10-181-0/+4
|\ \ | | | | | | add whitespace above share link so it's visually distinguished more
| * | add whitespace above share link so it's visually distinguished moreJan-Christoph Borchardt2016-10-181-0/+4
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | Merge pull request #1729 from nextcloud/downstream-ldap-3Lukas Reschke2016-10-1812-91/+109
|\ \ \ | | | | | | | | [downstream] LDAP empty hardening
| * \ \ Merge branch 'master' into downstream-ldap-3Arthur Schiwon2016-10-1619-50/+118
| |\ \ \ | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | fix and tidy up tests after merge conflictsArthur Schiwon2016-10-131-16/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | Update tests for phunit 5.5Victor Dubiniuk2016-10-135-30/+47
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | Harden emptyVictor Dubiniuk2016-10-137-50/+59
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | 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 entries
| * | | | | Do not reset the list after adding cached entriesJoas Schilling2016-10-172-1/+94
| | |_|_|/ | |/| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #1734 from nextcloud/setvalue_optLukas Reschke2016-10-181-0/+4
|\ \ \ \ \ | | | | | | | | | | | | AllConfig setUserValue opt
| * | | | | Fix migration testsRoeland Jago Douma2016-10-131-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #1742 from nextcloud/us_sync-date-of-deathLukas Reschke2016-10-182-43/+77
|\ \ \ \ \ \ | | | | | | | | | | | | | | [oc] Sync deathdate and anniversary to birthday calendar
| * | | | | | [9.2] Sync deathdate and anniversary to birthday calendar (#25655)Thomas Müller2016-10-142-43/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Sync deathdate and anniversary to birthday calendar (which should be renamed maybe) * Sync deathdate and anniversary to birthday calendar (which should be renamed maybe) Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | Merge pull request #1774 from nextcloud/ellipsize-shareeMorris Jobke2016-10-181-1/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | ellipsize sharee name to not overlap with can edit option on mobile
| * | | | | | | ellipsize sharee name to not overlap withJan-Christoph Borchardt2016-10-181-1/+6
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | | Merge pull request #1606 from nextcloud/search-detailMorris Jobke2016-10-183-4/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | search design details
| * | | | | | Fix bold no results search textskjnldsv2016-10-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix wording