Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge master into webdav-injection | Robin Appelman | 2014-04-25 | 34 | -197/+671 |
|\ | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-25 | 17 | -3/+239 |
| | | |||||
| * | 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 | 9 | -58/+121 |
| |\ \ | | |/ | |/| | 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 | 1 | -1/+7 |
| | | | |||||
| | * | make it possible to move files out of a shared mount point | Bjoern Schiessle | 2014-04-23 | 1 | -4/+4 |
| | | | |||||
| | * | some fixes to make the gallery work, this made it necessary to adjust some ↵ | Bjoern Schiessle | 2014-04-23 | 1 | -0/+1 |
| | | | | | | | | | | | | tests and the encryption code | ||||
| | * | we don't allow to share a folder if it contains a share mount point | Bjoern Schiessle | 2014-04-23 | 2 | -1/+18 |
| | | | |||||
| | * | allow to rename group share mount points | Bjoern Schiessle | 2014-04-23 | 1 | -0/+1 |
| | | | |||||
| | * | allow user to delete shared files/folders | Bjoern Schiessle | 2014-04-23 | 1 | -1/+2 |
| | | | |||||
| | * | fix target generation for group shares | Bjoern Schiessle | 2014-04-23 | 1 | -10/+18 |
| | | | |||||
| | * | fix share api tests | Bjoern Schiessle | 2014-04-23 | 1 | -5/+1 |
| | | | |||||
| | * | we no longer need to handle the Shared folder different from any other folder | Bjoern Schiessle | 2014-04-23 | 3 | -26/+0 |
| | | | |||||
| | * | add api to get shares from a specific user | Bjoern Schiessle | 2014-04-23 | 2 | -0/+32 |
| | | | |||||
| | * | user should be able to rename/delete shared files if the owner allowed it | Bjoern Schiessle | 2014-04-23 | 1 | -8/+21 |
| | | | |||||
| | * | allow to remove and change mount points | Bjoern Schiessle | 2014-04-23 | 2 | -0/+14 |
| | | | |||||
| | * | add some action items | Bjoern Schiessle | 2014-04-23 | 1 | -4/+4 |
| | | | |||||
| * | | add additional rows to the select statement, 'stime' is needed for the ↵ | Bjoern Schiessle | 2014-04-24 | 1 | -3/+3 |
| | | | | | | | | | | | | expire check | ||||
| * | | add setting to set default expire date | Bjoern Schiessle | 2014-04-24 | 2 | -2/+62 |
| | | | |||||
| * | | 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 | ||||
| | * | | This adds one more missing untranslated text from lib/share | Volkan Gezer | 2014-04-24 | 2 | -5/+7 |
| | | | | | | | | | | | | | | | | Also displays the untrusted domain warning in English | ||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-24 | 2 | -7/+8 |
| |/ / | |||||
| * | | Merge pull request #8324 from owncloud/expired-link-error | icewind1991 | 2014-04-23 | 1 | -0/+3 |
| |\ \ | | |/ | |/| | Fix error when viewing expired link | ||||
| | * | Fix error when viewing expired link | Robin Appelman | 2014-04-23 | 1 | -0/+3 |
| | | | |||||
| * | | Merge pull request #8009 from owncloud/feature/add-sharing-target | Joas Schilling | 2014-04-23 | 2 | -14/+56 |
| |\ \ | | | | | | | | | Add option to getUsersSharingFile() to get the paths for the shared users | ||||
| | * | | Do not query when the list is empty | Joas Schilling | 2014-04-09 | 1 | -14/+16 |
| | | | | |||||
| | * | | Add option to getUsersSharingFile() to get the paths for the shared users | Joas Schilling | 2014-04-09 | 2 | -14/+54 |
| | | | | |||||
| * | | | Merge pull request #7617 from nishiki/cache_user | Thomas Müller | 2014-04-23 | 1 | -43/+60 |
| |\ \ \ | | |_|/ | |/| | | Cache user | ||||
| | * | | remove cache all user | adrien | 2014-03-21 | 1 | -70/+22 |
| | | | | |||||
| | * | | fix remove cache when delete | adrien | 2014-03-11 | 1 | -6/+3 |
| | | | | |||||
| | * | | remove static variable, add limit and offset | adrien | 2014-03-11 | 1 | -29/+51 |
| | | | | |||||
| | * | | fix cache when remove an user | adrien | 2014-03-10 | 1 | -1/+8 |
| | | | | |||||
| | * | | fix undifined uid | nishiki | 2014-03-09 | 1 | -1/+2 |
| | | | | |||||
| | * | | add query result (boolean) for update or delete | nishiki | 2014-03-09 | 1 | -9/+6 |
| | | | | |||||
| | * | | minor clean code | nishiki | 2014-03-09 | 1 | -1/+1 |
| | | | | |||||
| | * | | fix undefined in loadUsers | adrien | 2014-03-07 | 1 | -8/+10 |
| | | | | |||||
| | * | | update the cache when add user | adrien | 2014-03-06 | 1 | -13/+16 |
| | | | | |||||
| | * | | upgrade the cache user | adrien | 2014-03-06 | 1 | -14/+38 |
| | | | | |||||
| | * | | add cache for single users | adrien | 2014-03-06 | 1 | -33/+45 |
| | | | | |||||
| * | | | Merge pull request #8068 from wakeup/fix-share.php-string-extraction | Thomas Müller | 2014-04-23 | 1 | -63/+89 |
| |\ \ \ | | | | | | | | | | | Make lib/** share.php strings extractable for translation | ||||
| | * | | | Make lib/** share.php strings extractable for translation | Volkan Gezer | 2014-04-22 | 1 | -63/+89 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They were not ready for translation as they had no placeholders and/nor wrapper function to be translated This should fix: #8011 | ||||
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-23 | 2 | -0/+16 |
| | | | | | |||||
| * | | | | Merge pull request #8263 from LEDfan/add-key-to-contacts | Thomas Müller | 2014-04-22 | 1 | -1/+6 |
| |\ \ \ \ | | | | | | | | | | | | | Add key to every contact | ||||
| | * | | | | Change key to addressbook-key | Tobia De Koninck | 2014-04-22 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Add key to every contact | LEDfan | 2014-04-18 | 1 | -1/+6 |
| | | | | | | |||||
* | | | | | | properly quote etags | Robin Appelman | 2014-04-24 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Normalize paths when moving properties | Robin Appelman | 2014-04-24 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | fixing typos and PHPDoc | Thomas Müller | 2014-04-23 | 5 | -8/+22 |
| | | | | | |