| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #8966 from owncloud/fix_failing_tests_on_master | Vincent Petry | 2014-06-11 | 1 | -1/+1 |
|\ |
|
| * | call self::getNumericStorageId() to get the numeric ID | Bjoern Schiessle | 2014-06-10 | 1 | -1/+1 |
* | | make text preview backend use imagettftext, fixes #8087 | Georg Ehrke | 2014-06-10 | 1 | -2/+6 |
* | | Merge pull request #8916 from owncloud/rmdirr-test-cleanup-fix | Morris Jobke | 2014-06-08 | 1 | -0/+2 |
|\ \
| |/
|/| |
|
| * | Added hacky fix for long path cleanup routine | Vincent Petry | 2014-06-06 | 1 | -0/+2 |
* | | Merge pull request #8927 from owncloud/expire_only_link_shares | Björn Schießle | 2014-06-06 | 2 | -36/+79 |
|\ \ |
|
| * | | only expire link shares | Bjoern Schiessle | 2014-06-06 | 2 | -36/+79 |
* | | | Merge pull request #8253 from owncloud/pk-on-all-tables-master | Thomas Müller | 2014-06-06 | 2 | -1/+2 |
|\ \ \ |
|
| * | | | adding PK to table encryption | Thomas Müller | 2014-06-06 | 2 | -1/+2 |
* | | | | Merge pull request #8921 from owncloud/fix-remove-storage-master | Thomas Müller | 2014-06-06 | 1 | -10/+22 |
|\ \ \ \
| |_|/ /
|/| | | |
|
| * | | | No need to create a storage within remove | Thomas Müller | 2014-06-06 | 1 | -10/+22 |
| | |/
| |/| |
|
* | | | Merge pull request #4553 from owncloud/update_search_classes | Vincent Petry | 2014-06-06 | 13 | -122/+480 |
|\ \ \ |
|
| * | | | fix namespace for legacy search classes | Jörn Friedrich Dreyer | 2014-06-06 | 2 | -2/+2 |
| * | | | make search non-static, add ISearch to server container, make legacy a static... | Jörn Friedrich Dreyer | 2014-06-06 | 7 | -140/+78 |
| * | | | minor phpdoc cleanup and imports | Jörn Friedrich Dreyer | 2014-06-05 | 6 | -13/+14 |
| * | | | Move new search results to 'lib/private/search' | Andrew Brown | 2014-06-05 | 5 | -1/+220 |
| * | | | Move legacy search to 'lib/private/legacy' | Andrew Brown | 2014-06-05 | 4 | -0/+108 |
| * | | | Add audio and image result types | Andrew Brown | 2014-06-05 | 1 | -2/+2 |
| * | | | Add audio and image result types | Andrew Brown | 2014-06-05 | 1 | -1/+9 |
| * | | | fix formatting | Jörn Friedrich Dreyer | 2014-06-05 | 4 | -93/+95 |
| * | | | Move to new namespace convention and add new result sub-classing | Andrew Brown | 2014-06-05 | 4 | -100/+182 |
* | | | | add more and fix office mimetypes, migrate wrong mimetypes | Jörn Friedrich Dreyer | 2014-06-06 | 1 | -2/+20 |
| |_|/
|/| | |
|
* | | | Merge pull request #8666 from owncloud/mount-remove | icewind1991 | 2014-06-06 | 10 | -82/+145 |
|\ \ \ |
|
| * | | | Dont connect hooks twice | Robin Appelman | 2014-06-06 | 1 | -0/+6 |
| * | | | make sure that we only delete shares for the current user | Bjoern Schiessle | 2014-06-06 | 1 | -3/+8 |
| * | | | only unshare user share if it was shared with the current user | Bjoern Schiessle | 2014-06-06 | 1 | -1/+2 |
| * | | | make sure that we remove all shares refering to the same parent | Bjoern Schiessle | 2014-06-06 | 1 | -21/+0 |
| * | | | fix unshareFromSelf() | Bjoern Schiessle | 2014-06-06 | 1 | -23/+38 |
| * | | | Movable storage root can always be moved and deleted | Robin Appelman | 2014-06-06 | 1 | -1/+1 |
| * | | | use triple equals | Robin Appelman | 2014-06-06 | 1 | -1/+1 |
| * | | | Fix phpdoc and comments | Robin Appelman | 2014-06-06 | 1 | -0/+1 |
| * | | | allow moving files to the root | Bjoern Schiessle | 2014-06-06 | 1 | -4/+0 |
| * | | | remove encryption keys if user unshares a file | Bjoern Schiessle | 2014-06-06 | 1 | -1/+12 |
| * | | | Fix folder name for storage root | Robin Appelman | 2014-06-06 | 1 | -1/+1 |
| * | | | don't allow to share single files with delete permissions, user should only b... | Bjoern Schiessle | 2014-06-06 | 1 | -0/+5 |
| * | | | Add the removing logic for mounts | Robin Appelman | 2014-06-06 | 1 | -5/+9 |
| * | | | Don't do rename hooks for cache when moving the mountpoint | Robin Appelman | 2014-06-06 | 1 | -0/+4 |
| * | | | Add a system for (re)movable mount points | Robin Appelman | 2014-06-06 | 4 | -28/+64 |
* | | | | Merge pull request #8900 from guruz/webdav_permission_moveable_renameable | Vincent Petry | 2014-06-06 | 1 | -1/+1 |
|\ \ \ \ |
|
| * | | | | WebDAV Permissions: Distinguish between renameing and moving | Markus Goetz | 2014-06-05 | 1 | -1/+1 |
* | | | | | Added CLI arguments for upgrade simulation steps | Vincent Petry | 2014-06-06 | 1 | -17/+51 |
| |_|_|/
|/| | | |
|
* | | | | Merge pull request #8909 from owncloud/fix-temporary-storage-rmdirr-master | Thomas Müller | 2014-06-06 | 1 | -0/+4 |
|\ \ \ \
| |_|/ /
|/| | | |
|
| * | | | use system function to recursive remove the directory used by temporary storage | Thomas Müller | 2014-06-06 | 1 | -0/+4 |
| | |/
| |/| |
|
* | | | Merge pull request #8877 from owncloud/getpath-storage-check | Thomas Müller | 2014-06-06 | 1 | -8/+12 |
|\ \ \
| |/ /
|/| | |
|
| * | | Update PHPDoc | Thomas Müller | 2014-06-06 | 1 | -1/+1 |
| * | | Verify that we have a valid storage in View->getPath | Robin Appelman | 2014-06-05 | 1 | -7/+11 |
* | | | Merge pull request #8483 from owncloud/encryption_use_oc_preferences | Thomas Müller | 2014-06-05 | 2 | -18/+30 |
|\ \ \ |
|
| * | | | allow to set pre-condition for setValue | Bjoern Schiessle | 2014-06-05 | 2 | -18/+30 |
* | | | | Merge pull request #8865 from owncloud/improve_share_settings | Vincent Petry | 2014-06-05 | 2 | -5/+22 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | unify share settings | Bjoern Schiessle | 2014-06-05 | 2 | -5/+22 |
| |/ / |
|