summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8338 from owncloud/phpunit-4.0-compatAndreas Fischer2014-04-242-17/+22
|\
| * Normalise testcleanuplistener.php indentation and end of file.Andreas Fischer2014-04-241-17/+16
| * Make PHPUnit_Framework_TestListener implementations compatible to 4.0.Andreas Fischer2014-04-242-0/+6
* | Merge pull request #8337 from owncloud/flv-to-mimesLukas Reschke2014-04-241-0/+1
|\ \
| * | Add flv to known mimetypesVictor Dubiniuk2014-04-241-0/+1
* | | Merge pull request #8026 from owncloud/remove_shared_folderBjörn Schießle2014-04-2441-880/+913
|\ \ \ | |/ / |/| |
| * | remove hard-coded shared folderBjoern Schiessle2014-04-231-1/+1
| * | always allow to rename the share mount pointBjoern Schiessle2014-04-234-2/+26
| * | split-up the update script and add unit tests for itBjoern Schiessle2014-04-232-21/+92
| * | make it possible to move files out of a shared mount pointBjoern Schiessle2014-04-233-17/+49
| * | typos, use, unused and return fixedThomas Müller2014-04-233-7/+9
| * | Dont throw an error when a storage isn't found for shared cacheRobin Appelman2014-04-231-3/+3
| * | some fixes to make the gallery work, this made it necessary to adjust some te...Bjoern Schiessle2014-04-235-219/+33
| * | add unit tests which got lost during rebaseBjoern Schiessle2014-04-231-0/+23
| * | we don't allow to share a folder if it contains a share mount pointBjoern Schiessle2014-04-236-7/+90
| * | fix etag propagationBjoern Schiessle2014-04-233-46/+68
| * | update script, create Shared folder and adjust target path for the sharesBjoern Schiessle2014-04-232-61/+44
| * | allow to rename group share mount pointsBjoern Schiessle2014-04-232-7/+37
| * | cleanup the shared storage, always keep the whole share resourceBjoern Schiessle2014-04-232-39/+43
| * | external storages: allow to mount a folder called "Shared", it is no longer a...Bjoern Schiessle2014-04-232-6/+3
| * | also fetch the etag from file cacheBjoern Schiessle2014-04-231-1/+2
| * | allow user to delete shared files/foldersBjoern Schiessle2014-04-231-1/+2
| * | make sure that path is not 'false'Bjoern Schiessle2014-04-232-6/+4
| * | fix deleting of shared filesBjoern Schiessle2014-04-231-0/+3
| * | fix updating of shared filesBjoern Schiessle2014-04-231-7/+3
| * | fix encryption tests after the removal of the shared folderBjoern Schiessle2014-04-237-67/+59
| * | fix target generation for group sharesBjoern Schiessle2014-04-231-10/+18
| * | fix share api testsBjoern Schiessle2014-04-2311-181/+91
| * | we no longer need to handle the Shared folder different from any other folderBjoern Schiessle2014-04-2310-166/+8
| * | don't overwrite shared folder iconBjoern Schiessle2014-04-231-2/+1
| * | show "shared by ..." for share mount pointBjoern Schiessle2014-04-232-1/+14
| * | generate unique target nameBjoern Schiessle2014-04-231-15/+29
| * | add api to get shares from a specific userBjoern Schiessle2014-04-232-0/+32
| * | fix getMimeType call, we always need to check the source pathBjoern Schiessle2014-04-231-3/+0
| * | user should be able to rename/delete shared files if the owner allowed itBjoern Schiessle2014-04-233-11/+129
| * | allow to remove and change mount pointsBjoern Schiessle2014-04-232-0/+14
| * | no exception for the root of the mount point (formerly Shared/), just get the...Bjoern Schiessle2014-04-232-26/+1
| * | make sure that we have the right permissions for the mount pointsBjoern Schiessle2014-04-231-1/+3
| * | first steps to remove the shared folder:Bjoern Schiessle2014-04-233-73/+106
| * | add some action itemsBjoern Schiessle2014-04-231-4/+4
* | | Merge pull request #8339 from owncloud/fix_unit_testsThomas Müller2014-04-241-3/+3
|\ \ \ | |_|/ |/| |
| * | add additional rows to the select statement, 'stime' is needed for the expire...Bjoern Schiessle2014-04-241-3/+3
|/ /
* | Merge pull request #8304 from owncloud/add-xss-testsAndreas Fischer2014-04-242-8/+35
|\ \
| * | Remove uneeded newlineLukas Reschke2014-04-221-1/+0
| * | Fix indentationLukas Reschke2014-04-221-1/+1
| * | Add unit tests for arrays and "Lukas Reschke2014-04-222-9/+37
* | | Merge pull request #8335 from owncloud/sharing_set_default_expire_dateAndreas Fischer2014-04-246-3/+139
|\ \ \
| * | | add setting to set default expire dateBjoern Schiessle2014-04-246-3/+139
|/ / /
* | | Merge pull request #8332 from owncloud/l10n-access-untrustedThomas Müller2014-04-242-5/+7
|\ \ \
| * | | This adds one more missing untranslated text from lib/shareVolkan Gezer2014-04-242-5/+7