Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #20884 from owncloud/fix_20713 | Thomas Müller | 2015-12-02 | 1 | -1/+3 |
|\ | | | | | Respect disabled incoming federated shares | ||||
| * | [Sharing] Respect disabled incoming federated shares | Roeland Jago Douma | 2015-12-02 | 1 | -1/+3 |
| | | | | | | | | | | | | | | Only fetch the incoming federated shares if incoming shares are actually enabled. Fixes #20713 | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-02 | 8 | -4/+28 |
|/ | |||||
* | Merge pull request #20710 from owncloud/files_external_config_command | Thomas Müller | 2015-12-01 | 4 | -0/+220 |
|\ | | | | | Add command to get and set config for external mounts | ||||
| * | return non 0 status code in case of missing mount | Robin Appelman | 2015-12-01 | 1 | -1/+1 |
| | | |||||
| * | Add command to set mount options for external storages | Robin Appelman | 2015-12-01 | 4 | -10/+114 |
| | | |||||
| * | Add command to get and set config for external mounts | Robin Appelman | 2015-12-01 | 2 | -0/+116 |
| | | |||||
* | | Revert "Fix column width of mtime column" | Morris Jobke | 2015-12-01 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #20825 from owncloud/scrutinizer-patch-1 | Thomas Müller | 2015-12-01 | 6 | -9/+9 |
|\ | | | | | Scrutinizer Auto-Fixes | ||||
| * | Adjust patches | Thomas Müller | 2015-11-30 | 3 | -6/+6 |
| | | |||||
| * | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2015-11-30 | 5 | -6/+6 |
| | | | | | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-01 | 2 | -0/+6 |
|/ | |||||
* | Merge pull request #20842 from owncloud/fix-date-time-column | Thomas Müller | 2015-11-30 | 1 | -2/+2 |
|\ | | | | | Fix column width of mtime column | ||||
| * | Fix column width of mtime column | Morris Jobke | 2015-11-30 | 1 | -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-favorites | Thomas Müller | 2015-11-30 | 3 | -18/+50 |
|\ \ | | | | | | | Activity oracle sql error for favorites | ||||
| * | | Inject the database connection | Joas Schilling | 2015-11-30 | 3 | -2/+16 |
| | | | |||||
| * | | Only require the interface | Joas Schilling | 2015-11-30 | 2 | -10/+10 |
| | | | |||||
| * | | Add a unit test that executes the query | Joas Schilling | 2015-11-30 | 1 | -0/+15 |
| | | | |||||
| * | | Correctly escape the paths so we only display favorites instead of wildcards | Joas Schilling | 2015-11-30 | 1 | -1/+1 |
| | | | |||||
| * | | Oracle can not return statements but only values | Joas Schilling | 2015-11-30 | 2 | -7/+10 |
| | | | | | | | | | | | | So evaluate the condition directly and return 1 or 0 | ||||
* | | | Merge pull request #20843 from owncloud/fix-share-with-input | Thomas Müller | 2015-11-30 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Fix the width of the share with input | ||||
| * | | Fix the width of the share with input | Morris Jobke | 2015-11-30 | 1 | -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-dropdown | Thomas Müller | 2015-11-30 | 1 | -1/+0 |
|\ \ | |/ |/| | Fix ext storage mount options dropdown | ||||
| * | Fix ext storage mount options dropdown | Vincent Petry | 2015-11-30 | 1 | -1/+0 |
| | | |||||
* | | Merge pull request #20688 from owncloud/publiclink-getdownloadurl-webdav | Thomas Müller | 2015-11-30 | 2 | -7/+10 |
|\ \ | | | | | | | Fix public link getDownloadUrl to return Webdav public link | ||||
| * | | Fix public link getDownloadUrl to return Webdav public link | Vincent Petry | 2015-11-25 | 2 | -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 DB | Thomas Müller | 2015-11-30 | 1 | -0/+7 |
| | | | |||||
* | | | Add DB group to some files_external tests | Thomas Müller | 2015-11-30 | 16 | -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 suits | Thomas Müller | 2015-11-30 | 11 | -4/+70 |
| | | | | | | | | | | | | Adding more DB groups to test suits | ||||
* | | | External storage tests require DB as well | Thomas Müller | 2015-11-30 | 10 | -0/+70 |
| | | | |||||
* | | | Adding more test suites to group DB | Thomas Müller | 2015-11-30 | 1 | -0/+7 |
| | | | |||||
* | | | Prevent redefinition warning of PHPUNIT_RUN | Thomas Müller | 2015-11-30 | 1 | -1/+3 |
| | | | |||||
* | | | Apply DB group annotation ... | Thomas Müller | 2015-11-30 | 27 | -38/+130 |
| |/ |/| | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-30 | 4 | -0/+24 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-29 | 2 | -0/+2 |
| | | |||||
* | | Fix some PHPDocs | Lukas Reschke | 2015-11-28 | 1 | -4/+5 |
| | | | | | | | | Some classes included via `use` did not even exist anymore. | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-28 | 8 | -0/+50 |
| | | |||||
* | | Merge pull request #20799 from owncloud/scrutinizer-patch-1 | Thomas Müller | 2015-11-28 | 8 | -30/+60 |
|\ \ | | | | | | | Scrutinizer Auto-Fixes | ||||
| * | | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2015-11-27 | 8 | -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-available | Robin Appelman | 2015-11-27 | 2 | -2/+6 |
|\ \ \ | |/ / |/| | | Skip unavailable storages in scanner | ||||
| * | | Skip unavailable storages in scanner | Robin Appelman | 2015-11-27 | 2 | -2/+6 |
| | | | |||||
* | | | Merge pull request #20790 from owncloud/deduplicate-trashbin-jobs | Thomas Müller | 2015-11-27 | 3 | -26/+12 |
|\ \ \ | | | | | | | | | Deduplicate queued trashbin expire jobs | ||||
| * | | | Deduplicate queued trashbin expire jobs | Morris Jobke | 2015-11-27 | 3 | -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-authredirectfix | Thomas Müller | 2015-11-27 | 2 | -1/+31 |
|\ \ \ \ | |/ / / |/| | | | Only reject ajax auth if user is really logged out | ||||
| * | | | Only reject ajax auth if user is really logged out | Vincent Petry | 2015-11-26 | 2 | -1/+31 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-27 | 18 | -10/+68 |
| |/ / |/| | | |||||
* | | | Merge pull request #20702 from owncloud/move-user-principal-into-subfolder | Thomas Müller | 2015-11-26 | 9 | -100/+99 |
|\ \ \ | | | | | | | | | Users are available under it's own principal resource named 'principa… | ||||
| * | | | Fix principal collection for CavDAVTester | Thomas Müller | 2015-11-26 | 2 | -3/+3 |
| | | | | |||||
| * | | | Introduce \OCP\IUser::getEMailAddress() | Thomas Müller | 2015-11-25 | 2 | -39/+21 |
| | | | | |||||
| * | | | Users are available under it's own principal resource named ↵ | Thomas Müller | 2015-11-25 | 8 | -65/+82 |
| | | | | | | | | | | | | | | | | 'principals/users' this will allow us to introduce e.g. groups as principals (one day) and system specific principals (needed for federation) |