| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into appframework-master | Thomas Müller | 2013-09-27 | 49 | -251/+388 |
| |\ | |||||
| | * | Merge pull request #4207 from owncloud/search_shared_files | Thomas Müller | 2013-09-27 | 2 | -12/+72 |
| | |\ | | | | | | | add initial search in shared files | ||||
| | | * | adding PHPDoc comments to getBackend | Thomas Müller | 2013-09-24 | 2 | -7/+12 |
| | | | | | | | | | | | | | ensure getChildren() is called on an instance of Share_Backend_Collection | ||||
| | | * | same for search by mime | Jörn Friedrich Dreyer | 2013-09-19 | 1 | -4/+4 |
| | | | | |||||
| | | * | add all results, sharing cache also returns entries for shared files in ↵ | Jörn Friedrich Dreyer | 2013-09-19 | 1 | -4/+4 |
| | | | | | | | | | | | | | external storages | ||||
| | | * | fix getAll(), refactor search by mime & search | Jörn Friedrich Dreyer | 2013-09-19 | 1 | -18/+37 |
| | | | | |||||
| | | * | return fixed path, skip shared files outside of 'files' | Jörn Friedrich Dreyer | 2013-09-19 | 1 | -3/+6 |
| | | | | |||||
| | | * | divide ids into chunks of 1k | Jörn Friedrich Dreyer | 2013-09-19 | 1 | -9/+18 |
| | | | | |||||
| | | * | add initial search in shared files | Jörn Friedrich Dreyer | 2013-09-19 | 2 | -2/+26 |
| | | | | |||||
| | * | | Merge pull request #5001 from owncloud/fixing-user-external-backends-master | Morris Jobke | 2013-09-27 | 1 | -0/+1 |
| | |\ \ | | | | | | | | | prelogin apps have to be loaded within setupBackend() otherwise required... | ||||
| | | * | | prelogin apps have to be loaded within setupBackend() otherwise required ↵ | Thomas Müller | 2013-09-26 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | classes cannot be loaded | ||||
| | * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-27 | 31 | -121/+153 |
| | | | | | |||||
| | * | | | Merge pull request #4999 from owncloud/run-unit-tests-for-apps-master | Morris Jobke | 2013-09-26 | 1 | -2/+0 |
| | |\ \ \ | | | | | | | | | | | run unit tests for apps as well | ||||
| | | * | | | Remove $RUNTIME_NOAPPS - setting to false was not enough | Thomas Müller | 2013-09-26 | 1 | -2/+0 |
| | | | | | | |||||
| | | * | | | run unit tests for apps as well | Thomas Müller | 2013-09-26 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Merge pull request #4990 from owncloud/user_fix_manager | blizzz | 2013-09-26 | 2 | -1/+44 |
| | |\ \ \ \ | | |_|/ / | |/| | | | manager checkPassword now returns User object, adjust internal user clas... | ||||
| | | * | | | Missing Test for the previous commit | Arthur Schiwon | 2013-09-25 | 1 | -0/+43 |
| | | | | | | |||||
| | | * | | | manager checkPassword now returns User object, adjust internal user class ↵ | Arthur Schiwon | 2013-09-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | accordingly. | ||||
| | * | | | | Merge pull request #4887 from owncloud/sharing_disable_public_upload | Björn Schießle | 2013-09-26 | 1 | -2/+2 |
| | |\ \ \ \ | | | | | | | | | | | | | check only permission from link-share to decide if public upload is enabled or disabled | ||||
| | | * | | | | we can leave the loop if the permission of the link share was checked | Bjoern Schiessle | 2013-09-17 | 1 | -3/+1 |
| | | | | | | | |||||
| | | * | | | | check only permission from link-share to decide if public upload is enabled ↵ | Bjoern Schiessle | 2013-09-17 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | or disabled | ||||
| | * | | | | | Merge pull request #4991 from owncloud/enc_fix_warning | Thomas Müller | 2013-09-26 | 2 | -5/+7 |
| | |\ \ \ \ \ | | |_|_|/ / | |/| | | | | check if key exists before reading it | ||||
| | | * | | | | fix check if app is enabled | Bjoern Schiessle | 2013-09-25 | 1 | -4/+3 |
| | | | | | | | |||||
| | | * | | | | check if key exists before reading it | Bjoern Schiessle | 2013-09-25 | 1 | -1/+4 |
| | | | | | | | |||||
| | * | | | | | Merge pull request #4987 from owncloud/different_color_placeholder | Morris Jobke | 2013-09-25 | 1 | -2/+13 |
| | |\ \ \ \ \ | | |/ / / / | |/| | | | | Make it possible to have a different color than the username for placeholder | ||||
| | | * | | | | Shorten optional text-argument processing | kondou | 2013-09-25 | 1 | -3/+2 |
| | | | | | | | |||||
| | | * | | | | Make it possible to have a different color than the username for placeholder | kondou | 2013-09-25 | 1 | -2/+14 |
| | | | | | | | |||||
| | * | | | | | Merge pull request #4989 from owncloud/coverage-for-all-master | Thomas Müller | 2013-09-25 | 1 | -6/+1 |
| | |\ \ \ \ \ | | |_|_|/ / | |/| | | | | collect coverage for all databases again - ci.owncloud.org has more RAM ... | ||||
| | | * | | | | collect coverage for all databases again - ci.owncloud.org has more RAM ↵ | Thomas Müller | 2013-09-25 | 1 | -6/+1 |
| | |/ / / / | | | | | | | | | | | | | | | | available | ||||
| | * | | | | Merge pull request #4968 from owncloud/user_checkpwd | Thomas Müller | 2013-09-25 | 9 | -101/+96 |
| | |\ \ \ \ | | | | | | | | | | | | | User: move checkPassword from User to Manager to not break API | ||||
| | | * | | | | Adjust Tests and satisfy them | Arthur Schiwon | 2013-09-24 | 3 | -44/+51 |
| | | | | | | | |||||
| | | * | | | | Fix doc | Arthur Schiwon | 2013-09-24 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | Fix return value from User object to User ID | Arthur Schiwon | 2013-09-24 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | === not == | Arthur Schiwon | 2013-09-24 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | User: move checkPassword from User to Manager to not break API | Arthur Schiwon | 2013-09-24 | 7 | -60/+48 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #4892 from owncloud/vcategories_public | Thomas Müller | 2013-09-25 | 9 | -950/+1111 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | OC_VCategories => OC\Tags. Public interface and getter in server container | ||||
| | * | | | | | | Add factory class for the server container. | Thomas Tanghus | 2013-09-24 | 7 | -69/+182 |
| | | | | | | | | |||||
| | * | | | | | | Fix conflict | Thomas Tanghus | 2013-09-23 | 1 | -3/+4 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Moar tests. | Thomas Tanghus | 2013-09-23 | 1 | -3/+7 |
| | | | | | | | | | |||||
| | | * | | | | | | Use fetchOne() instead of numRows() when doing a COUNT(*). | Thomas Tanghus | 2013-09-23 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | | * | | | | | | Forgot to return false if add() didn't add anything. | Thomas Tanghus | 2013-09-23 | 1 | -0/+1 |
| | | | | | | | | | |||||
| | | * | | | | | | Added more error checking in add() | Thomas Tanghus | 2013-09-23 | 1 | -5/+13 |
| | | | | | | | | | |||||
| | | * | | | | | | Add another test. | Thomas Tanghus | 2013-09-19 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | | * | | | | | | Updated method names and added a few more tests. | Thomas Tanghus | 2013-09-19 | 3 | -20/+57 |
| | | | | | | | | | |||||
| | | * | | | | | | fixing namespaces and rename hasCategory to hasTag | Thomas Müller | 2013-09-18 | 1 | -9/+9 |
| | | | | | | | | | |||||
| | | * | | | | | | Merge branch 'appframework-master' into vcategories_public | Thomas Müller | 2013-09-18 | 21 | -114/+396 |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/server.php | ||||
| | | * | | | | | | | OC_VCategories=>OC\Tags. Public interface + getter in server container | Thomas Tanghus | 2013-09-18 | 7 | -961/+946 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Merge branch 'appframework-master' into vcategories_public | Thomas Tanghus | 2013-09-17 | 848 | -10804/+39337 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | More trimming | Thomas Tanghus | 2013-09-04 | 1 | -3/+15 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Moar tests. | Thomas Tanghus | 2013-09-23 | 1 | -3/+7 |
| | | | | | | | | | | | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |