Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-25 | 419 | -9772/+12829 |
| | |||||
* | Merge pull request #8338 from owncloud/phpunit-4.0-compat | Andreas Fischer | 2014-04-24 | 2 | -17/+22 |
|\ | | | | | | | | | | | | | | | Make PHPUnit_Framework_TestListener implementations compatible to 4.0. * owncloud/phpunit-4.0-compat: Normalise testcleanuplistener.php indentation and end of file. Make PHPUnit_Framework_TestListener implementations compatible to 4.0. | ||||
| * | Normalise testcleanuplistener.php indentation and end of file. | Andreas Fischer | 2014-04-24 | 1 | -17/+16 |
| | | |||||
| * | Make PHPUnit_Framework_TestListener implementations compatible to 4.0. | Andreas Fischer | 2014-04-24 | 2 | -0/+6 |
| | | |||||
* | | Merge pull request #8337 from owncloud/flv-to-mimes | Lukas Reschke | 2014-04-24 | 1 | -0/+1 |
|\ \ | | | | | | | Add flv to known mimetypes | ||||
| * | | Add flv to known mimetypes | Victor Dubiniuk | 2014-04-24 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #8026 from owncloud/remove_shared_folder | Björn Schießle | 2014-04-24 | 41 | -880/+913 |
|\ \ \ | |/ / |/| | | remove the "Shared" folder | ||||
| * | | remove hard-coded shared folder | Bjoern Schiessle | 2014-04-23 | 1 | -1/+1 |
| | | | |||||
| * | | always allow to rename the share mount point | Bjoern Schiessle | 2014-04-23 | 4 | -2/+26 |
| | | | |||||
| * | | split-up the update script and add unit tests for it | Bjoern Schiessle | 2014-04-23 | 2 | -21/+92 |
| | | | |||||
| * | | make it possible to move files out of a shared mount point | Bjoern Schiessle | 2014-04-23 | 3 | -17/+49 |
| | | | |||||
| * | | typos, use, unused and return fixed | Thomas Müller | 2014-04-23 | 3 | -7/+9 |
| | | | |||||
| * | | Dont throw an error when a storage isn't found for shared cache | Robin Appelman | 2014-04-23 | 1 | -3/+3 |
| | | | |||||
| * | | some fixes to make the gallery work, this made it necessary to adjust some ↵ | Bjoern Schiessle | 2014-04-23 | 5 | -219/+33 |
| | | | | | | | | | | | | tests and the encryption code | ||||
| * | | add unit tests which got lost during rebase | Bjoern Schiessle | 2014-04-23 | 1 | -0/+23 |
| | | | |||||
| * | | we don't allow to share a folder if it contains a share mount point | Bjoern Schiessle | 2014-04-23 | 6 | -7/+90 |
| | | | |||||
| * | | fix etag propagation | Bjoern Schiessle | 2014-04-23 | 3 | -46/+68 |
| | | | |||||
| * | | update script, create Shared folder and adjust target path for the shares | Bjoern Schiessle | 2014-04-23 | 2 | -61/+44 |
| | | | |||||
| * | | allow to rename group share mount points | Bjoern Schiessle | 2014-04-23 | 2 | -7/+37 |
| | | | |||||
| * | | cleanup the shared storage, always keep the whole share resource | Bjoern Schiessle | 2014-04-23 | 2 | -39/+43 |
| | | | |||||
| * | | external storages: allow to mount a folder called "Shared", it is no longer ↵ | Bjoern Schiessle | 2014-04-23 | 2 | -6/+3 |
| | | | | | | | | | | | | a reserved name | ||||
| * | | also fetch the etag from file cache | Bjoern Schiessle | 2014-04-23 | 1 | -1/+2 |
| | | | |||||
| * | | allow user to delete shared files/folders | Bjoern Schiessle | 2014-04-23 | 1 | -1/+2 |
| | | | |||||
| * | | make sure that path is not 'false' | Bjoern Schiessle | 2014-04-23 | 2 | -6/+4 |
| | | | |||||
| * | | fix deleting of shared files | Bjoern Schiessle | 2014-04-23 | 1 | -0/+3 |
| | | | |||||
| * | | fix updating of shared files | Bjoern Schiessle | 2014-04-23 | 1 | -7/+3 |
| | | | |||||
| * | | fix encryption tests after the removal of the shared folder | Bjoern Schiessle | 2014-04-23 | 7 | -67/+59 |
| | | | |||||
| * | | fix target generation for group shares | Bjoern Schiessle | 2014-04-23 | 1 | -10/+18 |
| | | | |||||
| * | | fix share api tests | Bjoern Schiessle | 2014-04-23 | 11 | -181/+91 |
| | | | |||||
| * | | we no longer need to handle the Shared folder different from any other folder | Bjoern Schiessle | 2014-04-23 | 10 | -166/+8 |
| | | | |||||
| * | | don't overwrite shared folder icon | Bjoern Schiessle | 2014-04-23 | 1 | -2/+1 |
| | | | |||||
| * | | show "shared by ..." for share mount point | Bjoern Schiessle | 2014-04-23 | 2 | -1/+14 |
| | | | |||||
| * | | generate unique target name | Bjoern Schiessle | 2014-04-23 | 1 | -15/+29 |
| | | | |||||
| * | | add api to get shares from a specific user | Bjoern Schiessle | 2014-04-23 | 2 | -0/+32 |
| | | | |||||
| * | | fix getMimeType call, we always need to check the source path | Bjoern Schiessle | 2014-04-23 | 1 | -3/+0 |
| | | | |||||
| * | | user should be able to rename/delete shared files if the owner allowed it | Bjoern Schiessle | 2014-04-23 | 3 | -11/+129 |
| | | | |||||
| * | | allow to remove and change mount points | Bjoern Schiessle | 2014-04-23 | 2 | -0/+14 |
| | | | |||||
| * | | no exception for the root of the mount point (formerly Shared/), just get ↵ | Bjoern Schiessle | 2014-04-23 | 2 | -26/+1 |
| | | | | | | | | | | | | the file cache information from the cache | ||||
| * | | make sure that we have the right permissions for the mount points | Bjoern Schiessle | 2014-04-23 | 1 | -1/+3 |
| | | | |||||
| * | | first steps to remove the shared folder: | Bjoern Schiessle | 2014-04-23 | 3 | -73/+106 |
| | | | | | | | | | | | | | | | | | | | | | | | | - mount shares to the root folder instead of "Shared/" - navigate in shared folder and sub-folders - show previews - show correct file permissions - download/edit files | ||||
| * | | add some action items | Bjoern Schiessle | 2014-04-23 | 1 | -4/+4 |
| | | | |||||
* | | | Merge pull request #8339 from owncloud/fix_unit_tests | Thomas Müller | 2014-04-24 | 1 | -3/+3 |
|\ \ \ | |_|/ |/| | | fixing unit tests | ||||
| * | | add additional rows to the select statement, 'stime' is needed for the ↵ | Bjoern Schiessle | 2014-04-24 | 1 | -3/+3 |
|/ / | | | | | | | expire check | ||||
* | | Merge pull request #8304 from owncloud/add-xss-tests | Andreas Fischer | 2014-04-24 | 2 | -8/+35 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add unit tests for arrays and quotationmark * owncloud/add-xss-tests: Remove uneeded newline Fix indentation Add unit tests for arrays and " | ||||
| * | | Remove uneeded newline | Lukas Reschke | 2014-04-22 | 1 | -1/+0 |
| | | | |||||
| * | | Fix indentation | Lukas Reschke | 2014-04-22 | 1 | -1/+1 |
| | | | |||||
| * | | Add unit tests for arrays and " | Lukas Reschke | 2014-04-22 | 2 | -9/+37 |
| | | | | | | | | | | | | OC_Util::sanitizeHTML() also supports array but we actually had no unit test for it. Additionally this commit introduces a test for escaping " into " | ||||
* | | | Merge pull request #8335 from owncloud/sharing_set_default_expire_date | Andreas Fischer | 2014-04-24 | 6 | -3/+139 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | [sharing] allow admin to set default expire date * owncloud/sharing_set_default_expire_date: add setting to set default expire date | ||||
| * | | | add setting to set default expire date | Bjoern Schiessle | 2014-04-24 | 6 | -3/+139 |
|/ / / | |||||
* | | | Merge pull request #8332 from owncloud/l10n-access-untrusted | Thomas Müller | 2014-04-24 | 2 | -5/+7 |
|\ \ \ | | | | | | | | | This adds one more missing untranslated text from lib/share |