summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #20884 from owncloud/fix_20713Thomas Müller2015-12-021-1/+3
|\ | | | | Respect disabled incoming federated shares
| * [Sharing] Respect disabled incoming federated sharesRoeland Jago Douma2015-12-021-1/+3
| | | | | | | | | | | | | | Only fetch the incoming federated shares if incoming shares are actually enabled. Fixes #20713
* | [tx-robot] updated from transifexJenkins for ownCloud2015-12-028-4/+28
|/
* Merge pull request #20710 from owncloud/files_external_config_commandThomas Müller2015-12-014-0/+220
|\ | | | | Add command to get and set config for external mounts
| * return non 0 status code in case of missing mountRobin Appelman2015-12-011-1/+1
| |
| * Add command to set mount options for external storagesRobin Appelman2015-12-014-10/+114
| |
| * Add command to get and set config for external mountsRobin Appelman2015-12-012-0/+116
| |
* | Revert "Fix column width of mtime column"Morris Jobke2015-12-011-2/+2
|/
* Merge pull request #20825 from owncloud/scrutinizer-patch-1Thomas Müller2015-12-016-9/+9
|\ | | | | Scrutinizer Auto-Fixes
| * Adjust patchesThomas Müller2015-11-303-6/+6
| |
| * Scrutinizer Auto-FixesScrutinizer Auto-Fixer2015-11-305-6/+6
| | | | | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
* | [tx-robot] updated from transifexJenkins for ownCloud2015-12-012-0/+6
|/
* Merge pull request #20842 from owncloud/fix-date-time-columnThomas Müller2015-11-301-2/+2
|\ | | | | Fix column width of mtime column
| * Fix column width of mtime columnMorris Jobke2015-11-301-2/+2
| | | | | | | | | | | | * in some translations (e.g. german) the header of this column otherwise got truncated "Zeitpunkt der Freigabe" vs "Zeitpunkt der Freig"
* | Merge pull request #20487 from owncloud/activity-oracle-sql-error-for-favoritesThomas Müller2015-11-303-18/+50
|\ \ | | | | | | Activity oracle sql error for favorites
| * | Inject the database connectionJoas Schilling2015-11-303-2/+16
| | |
| * | Only require the interfaceJoas Schilling2015-11-302-10/+10
| | |
| * | Add a unit test that executes the queryJoas Schilling2015-11-301-0/+15
| | |
| * | Correctly escape the paths so we only display favorites instead of wildcardsJoas Schilling2015-11-301-1/+1
| | |
| * | Oracle can not return statements but only valuesJoas Schilling2015-11-302-7/+10
| | | | | | | | | | | | So evaluate the condition directly and return 1 or 0
* | | Merge pull request #20843 from owncloud/fix-share-with-inputThomas Müller2015-11-301-1/+1
|\ \ \ | |/ / |/| | Fix the width of the share with input
| * | Fix the width of the share with inputMorris Jobke2015-11-301-1/+1
| |/ | | | | | | | | | | * the ID of this has changed to #shareWith-viewNUMBER and shouldn't be used in CSS * now uses the proper classes
* | Merge pull request #20837 from owncloud/fix-mountoptions-dropdownThomas Müller2015-11-301-1/+0
|\ \ | |/ |/| Fix ext storage mount options dropdown
| * Fix ext storage mount options dropdownVincent Petry2015-11-301-1/+0
| |
* | Merge pull request #20688 from owncloud/publiclink-getdownloadurl-webdavThomas Müller2015-11-302-7/+10
|\ \ | | | | | | Fix public link getDownloadUrl to return Webdav public link
| * | Fix public link getDownloadUrl to return Webdav public linkVincent Petry2015-11-252-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | This is for apps that use getDownloadUrl() to access the Webdav endpoint for example for streaming. Also happens when clicking on the download action of a file. Note that the regular visible download URL is still the same.
* | | More group DBThomas Müller2015-11-301-0/+7
| | |
* | | Add DB group to some files_external testsThomas Müller2015-11-3016-1/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding group Db to federation tests and ldap tests Add group DB to Test_UrlGenerator Adding group DB to trashbin and versions tests Adding group DB to Test_Util_CheckServer for pg
* | | Adding more DB groups to test suitsThomas Müller2015-11-3011-4/+70
| | | | | | | | | | | | Adding more DB groups to test suits
* | | External storage tests require DB as wellThomas Müller2015-11-3010-0/+70
| | |
* | | Adding more test suites to group DBThomas Müller2015-11-301-0/+7
| | |
* | | Prevent redefinition warning of PHPUNIT_RUNThomas Müller2015-11-301-1/+3
| | |
* | | Apply DB group annotation ...Thomas Müller2015-11-3027-38/+130
| |/ |/|
* | [tx-robot] updated from transifexJenkins for ownCloud2015-11-304-0/+24
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-11-292-0/+2
| |
* | Fix some PHPDocsLukas Reschke2015-11-281-4/+5
| | | | | | | | Some classes included via `use` did not even exist anymore.
* | [tx-robot] updated from transifexJenkins for ownCloud2015-11-288-0/+50
| |
* | Merge pull request #20799 from owncloud/scrutinizer-patch-1Thomas Müller2015-11-288-30/+60
|\ \ | | | | | | Scrutinizer Auto-Fixes
| * | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2015-11-278-30/+60
| | | | | | | | | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
* | | Merge pull request #20789 from owncloud/scanner-skip-not-availableRobin Appelman2015-11-272-2/+6
|\ \ \ | |/ / |/| | Skip unavailable storages in scanner
| * | Skip unavailable storages in scannerRobin Appelman2015-11-272-2/+6
| | |
* | | Merge pull request #20790 from owncloud/deduplicate-trashbin-jobsThomas Müller2015-11-273-26/+12
|\ \ \ | | | | | | | | Deduplicate queued trashbin expire jobs
| * | | Deduplicate queued trashbin expire jobsMorris Jobke2015-11-273-26/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fixes #20425 * this removes the argument trashbin size from the expire job - it is now calculated in the expire job * the queue now detects properly that the job is already queue and doesn't add it again
* | | | Merge pull request #20760 from owncloud/webdav-authredirectfixThomas Müller2015-11-272-1/+31
|\ \ \ \ | |/ / / |/| | | Only reject ajax auth if user is really logged out
| * | | Only reject ajax auth if user is really logged outVincent Petry2015-11-262-1/+31
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-2718-10/+68
| |/ / |/| |
* | | Merge pull request #20702 from owncloud/move-user-principal-into-subfolderThomas Müller2015-11-269-100/+99
|\ \ \ | | | | | | | | Users are available under it's own principal resource named 'principa…
| * | | Fix principal collection for CavDAVTesterThomas Müller2015-11-262-3/+3
| | | |
| * | | Introduce \OCP\IUser::getEMailAddress()Thomas Müller2015-11-252-39/+21
| | | |
| * | | Users are available under it's own principal resource named ↵Thomas Müller2015-11-258-65/+82
| | | | | | | | | | | | | | | | 'principals/users' this will allow us to introduce e.g. groups as principals (one day) and system specific principals (needed for federation)