summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Remove all occurences of @brief and @returns from PHPDocMorris Jobke2014-05-1972-482/+482
| | | | * test case added to avoid adding them later
* Merge pull request #8435 from owncloud/fix-8322-masterThomas Müller2014-05-194-4/+84
|\ | | | | Expose permission via WebDAV
| * - update permissionsThomas Müller2014-05-092-4/+7
| | | | | | | | - change xml tag to perm
| * - Introduce isShared() and isMounted() on FileInfo classThomas Müller2014-05-024-4/+81
| | | | | | | | | | | | - Reuse these methods on determineIcon() - Generate permission string for the desktop client - expose {http://owncloud.org/ns}permissions as additional WebDAV property containing the permission string
* | Merge pull request #8557 from owncloud/custom_session_handlingThomas Müller2014-05-191-2/+11
|\ \ | | | | | | Allow apps to create custom session handlers.
| * | Allow apps to create custom session handlers.ringmaster2014-05-121-2/+11
| | |
* | | Merge pull request #7286 from owncloud/issue/4823Morris Jobke2014-05-192-40/+98
|\ \ \ | | | | | | | | Set expiration date by default when adding additional shares
| * | | Automatically copy the share expiration date when new shares are createdJoas Schilling2014-05-192-40/+98
| | | | | | | | | | | | | | | | Fix #4823
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-193-0/+4
| | | |
* | | | Merge pull request #7363 from owncloud/optimize-startup-queriesMorris Jobke2014-05-192-13/+39
|\ \ \ \ | |/ / / |/| | | Optimize some queries that are always executed when loading base.php
| * | | Merge branch 'master' into optimize-startup-queriesBart Visscher2014-05-07206-4651/+6532
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_sharing/lib/sharedstorage.php tests/lib/group/manager.php removed hasFilesSharedWith from lib/public/share.php and sharedstorage.php to fix merge
| * | | | Use limit=1 so the db can stop searching on the first hitBart Visscher2014-02-281-2/+9
| | | | |
| * | | | Also clear cached UserGroup when a user is added/removedBart Visscher2014-02-271-0/+12
| | | | |
| * | | | Clear the cached user groups when a group is deletedBart Visscher2014-02-271-3/+5
| | | | |
| * | | | Only check for existence of shared files when doing shared storage setupBart Visscher2014-02-211-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | The getItemsSharedWith function also retrieves related information, resulting in work that isn't used here.
| * | | | Delay fetching the display name until it is requestedBart Visscher2014-02-211-5/+7
| | | | |
| * | | | Add more caching in the group managerBart Visscher2014-02-211-5/+15
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-186-0/+7
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-171-0/+8
| | | | |
* | | | | Merge pull request #8555 from owncloud/sharing_default_expire_only_public_linksBjörn Schießle2014-05-162-8/+12
|\ \ \ \ \ | | | | | | | | | | | | use default expire date only for link shares
| * | | | | use default expire date only for link sharesBjoern Schiessle2014-05-162-8/+12
| | | | | |
* | | | | | Merge pull request #8604 from owncloud/sharing_encforce_passwordBjörn Schießle2014-05-163-1/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | allow admin to enforce passwords for public link shares
| * | | | | | allow admin to enforce passwords for public link sharesBjoern Schiessle2014-05-163-1/+28
| | | | | | |
* | | | | | | Merge pull request #6260 from owncloud/jan-navigation-filesidebarVincent Petry2014-05-162-2/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Files app navigation sidebar
| * | | | | | | Now settings CSS class with appid in content DIVVincent Petry2014-05-152-2/+6
| | |/ / / / / | |/| | | | |
* / | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-164-5/+35
|/ / / / / /
* | | | | | Merge pull request #8587 from Raydiation/masterThomas Müller2014-05-154-4/+35
|\ \ \ \ \ \ | | | | | | | | | | | | | | Small cleanup and language detection for apps
| * | | | | | use registerService method instead of array accessBernhard Posselt2014-05-141-1/+1
| | | | | | |
| * | | | | | use fetch method instead of fetchRow because fetchRow is only an owncloud ↵Bernhard Posselt2014-05-141-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | internal alias that exists purely for compability
| * | | | | | provide a way to detect the language that is being used (e.g. for clientside ↵Bernhard Posselt2014-05-142-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | javascript language selection
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-151-1/+3
| |/ / / / / |/| | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-142-0/+13
|/ / / / /
* | | | | fixing variable namingThomas Müller2014-05-131-24/+24
| | | | |
* | | | | fix PHPDocThomas Müller2014-05-131-3/+5
| | | | |
* | | | | object -> \OC\PreviewThomas Müller2014-05-131-1/+1
| | | | |
* | | | | adding PHPDocThomas Müller2014-05-131-2/+21
| | | | |
* | | | | fixing typo and missing @throwsThomas Müller2014-05-131-1/+2
| | | | |
* | | | | More PHPDoc for file functionsRobin McCorkell2014-05-132-0/+12
| | | | |
* | | | | Fix various code errors detected by ScrutinizerRobin McCorkell2014-05-132-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed: - An error with a misplaced bracket in lib/private/util.php - An error with an incorrect function being called in lib/public/contacts.php
* | | | | Fix Scrutinizer errorsRobin McCorkell2014-05-134-7/+12
| | | | |
* | | | | Change parameter order of implodeRobin McCorkell2014-05-131-1/+1
| | | | |
* | | | | Use OC_User_Interface instead of OC_User_BackendRobin McCorkell2014-05-132-6/+6
| | | | |
* | | | | Fix PHPDoc and typosLukas Reschke2014-05-134-15/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some things my IDE complained about while creating a custom backend. Fix PHPDoc and typos Some things my IDE complained about while creating a custom backend. Conflicts: lib/private/group/database.php lib/private/group/dummy.php lib/private/group/example.php
* | | | | Change parameter type for useBackendRobin McCorkell2014-05-131-1/+1
| | | | |
* | | | | Fix all PHPDoc types and variable names, in /libRobin McCorkell2014-05-1375-263/+255
| | | | |
* | | | | Squash 'a | b' into 'a|b', in /libRobin McCorkell2014-05-1323-26/+26
| | | | |
* | | | | Fix @return array PHPDocs, in /libRobin McCorkell2014-05-1338-75/+75
| | | | |
* | | | | Replace @returns with @return, in /libRobin McCorkell2014-05-1318-72/+72
| | | | |
* | | | | Merge pull request #8572 from owncloud/core-getabsolutepathwithzeroThomas Müller2014-05-131-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fixed getAbsolutePath case when path is "0"
| * | | | | Fixed getAbsolutePath case when path is "0"Vincent Petry2014-05-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure to correctly check for string emptiness when the passed path is "0".