summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8435 from owncloud/fix-8322-masterThomas Müller2014-05-196-17/+99
|\
| * - update permissionsThomas Müller2014-05-092-4/+7
| * fix broken unit testThomas Müller2014-05-021-1/+11
| * - Introduce isShared() and isMounted() on FileInfo classThomas Müller2014-05-025-17/+85
* | Merge pull request #8557 from owncloud/custom_session_handlingThomas Müller2014-05-191-2/+11
|\ \
| * | Allow apps to create custom session handlers.ringmaster2014-05-121-2/+11
* | | Merge pull request #8585 from owncloud/phpdoc-improvements-appsAndreas Fischer2014-05-1943-342/+338
|\ \ \
| * | | Fix whitespace issuesRobin McCorkell2014-05-1616-69/+69
| * | | Reduce double-space with single-space.Andreas Fischer2014-05-161-1/+1
| * | | Remove spaces around | operator in doc block.Andreas Fischer2014-05-161-1/+1
| * | | Fix more missing or broken PHPDocRobin McCorkell2014-05-1610-22/+20
| * | | PHPDoc fixes for user_ldapRobin McCorkell2014-05-167-29/+29
| * | | Fix PHPDoc in /appsRobin McCorkell2014-05-1631-241/+239
* | | | Merge branch 'libasys-patch-1'Morris Jobke2014-05-191-1/+13
|\ \ \ \
| * | | | Add generic 'share by link' URL generator in share.jslibasys2014-05-191-1/+13
|/ / / /
* | | | Merge pull request #7286 from owncloud/issue/4823Morris Jobke2014-05-194-46/+132
|\ \ \ \
| * | | | fix wrong conflict resolutionMorris Jobke2014-05-191-1/+1
| * | | | Correctly set expiration dates when adding additional sharesJoas Schilling2014-05-191-4/+31
| * | | | Automatically copy the share expiration date when new shares are createdJoas Schilling2014-05-193-41/+100
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-1940-90/+121
* | | | | Merge pull request #7363 from owncloud/optimize-startup-queriesMorris Jobke2014-05-193-13/+133
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into optimize-startup-queriesBart Visscher2014-05-072215-83919/+193118
| |\ \ \ \ \
| * | | | | | Use limit=1 so the db can stop searching on the first hitBart Visscher2014-02-281-2/+9
| * | | | | | Add unit tests for getUserGroups with addUser and removeUserBart Visscher2014-02-271-0/+94
| * | | | | | 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-212-1/+24
| * | | | | | 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
* | | | | | | Merge pull request #8592 from owncloud/login-timezoneMorris Jobke2014-05-192-1/+7
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Disable login button until the timezone is setVincent Petry2014-05-142-1/+7
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-18169-394/+578
* | | | | | | Merge pull request #8609 from owncloud/ie8-svgfallbackforiconsVincent Petry2014-05-171-0/+15
|\ \ \ \ \ \ \
| * | | | | | | SVG fallback for settings iconVincent Petry2014-05-161-0/+5
| * | | | | | | Fallback for triangle iconsVincent Petry2014-05-161-0/+10
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-17967-19151/+24007
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge pull request #8555 from owncloud/sharing_default_expire_only_public_linksBjörn Schießle2014-05-163-8/+66
|\ \ \ \ \ \ \
| * | | | | | | use default expire date only for link sharesBjoern Schiessle2014-05-163-8/+66
* | | | | | | | Merge pull request #8604 from owncloud/sharing_encforce_passwordBjörn Schießle2014-05-169-29/+132
|\ \ \ \ \ \ \ \
| * | | | | | | | allow admin to enforce passwords for public link sharesBjoern Schiessle2014-05-169-29/+132
* | | | | | | | | Merge pull request #8610 from owncloud/ie8-filesdndbugVincent Petry2014-05-161-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix drag and drop in IE8Vincent Petry2014-05-161-1/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #6260 from owncloud/jan-navigation-filesidebarVincent Petry2014-05-1646-3032/+4323
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fixed many issues, clean upVincent Petry2014-05-1529-276/+540
| * | | | | | | | Namespacing for FileList, FileActions and trashbin appVincent Petry2014-05-1537-2941/+3796
| * | | | | | | | Files app navigation can now switchVincent Petry2014-05-159-7/+124
| * | | | | | | | Added navigation manager in files app for the sidebarVincent Petry2014-05-157-60/+70
| * | | | | | | | Added app navigation for files appVincent Petry2014-05-1510-14/+55
| * | | | | | | | Now settings CSS class with appid in content DIVVincent Petry2014-05-153-3/+7
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-16365-2177/+2831
|/ / / / / / / /