summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8686 from owncloud/session-earlyMorris Jobke2014-06-031-0/+3
|\
| * Add some commentsRobin Appelman2014-06-031-0/+1
| * Make the session available as early as possibleRobin Appelman2014-05-231-0/+2
* | Merge pull request #8698 from owncloud/sharing_improve_permissionsThomas Müller2014-06-033-36/+30
|\ \
| * | check if it is a share storageBjoern Schiessle2014-06-021-1/+5
| * | no need to empty array in a special wayThomas Müller2014-06-021-3/+1
| * | get permissions directly from share storage to avoid additional db callsBjoern Schiessle2014-06-023-34/+26
* | | Merge pull request #7930 from owncloud/fix_7785_masterblizzz2014-06-0313-160/+1407
|\ \ \
| * | | get rid of @read in PHP doc after rebaseArthur Schiwon2014-06-031-3/+3
| * | | adjust group testsArthur Schiwon2014-06-031-2/+9
| * | | clean upArthur Schiwon2014-06-031-3/+1
| * | | class descriptionsArthur Schiwon2014-06-033-0/+16
| * | | newlinesArthur Schiwon2014-06-034-4/+4
| * | | adjust test to changed convention in storing quotaArthur Schiwon2014-06-031-3/+3
| * | | port of PR #8038Arthur Schiwon2014-06-031-2/+1
| * | | precaution: lowercase string for comparisonArthur Schiwon2014-06-031-1/+1
| * | | adjust user backend testArthur Schiwon2014-06-031-13/+33
| * | | fix parameter orderArthur Schiwon2014-06-031-2/+2
| * | | adjust Access testArthur Schiwon2014-06-031-7/+16
| * | | LDAP: put out fetching of user meta data into a fully tested class of its own...Arthur Schiwon2014-06-0310-140/+1338
* | | | Merge pull request #8264 from owncloud/app-enable-by-groupicewind19912014-06-036-259/+379
|\ \ \ \
| * | | | bring back the line breaksThomas Müller2014-06-031-1/+2
| * | | | remove +3 in multiselect.jsThomas Müller2014-06-031-3/+3
| * | | | Apps: fix wording and layout for 'enable only for specific groups'Jan-Christoph Borchardt2014-06-031-3/+3
| * | | | Fix syntax errorBart Visscher2014-06-031-1/+1
| * | | | Preserve changed groups when switching between appsRobin Appelman2014-06-031-0/+5
| * | | | Dont show group settings for login, filesystem, etc apps after enabling themRobin Appelman2014-06-031-5/+15
| * | | | Remove debug statementsRobin Appelman2014-06-031-3/+0
| * | | | Disable enabling apps by groups for filesystem, authentication and loggin appsRobin Appelman2014-06-031-17/+28
| * | | | adding some line breaksThomas Müller2014-06-031-0/+2
| * | | | Fix sorting of appsRobin Appelman2014-06-031-1/+5
| * | | | Prevent js errorRobin Appelman2014-06-031-1/+3
| * | | | Fix phpdocRobin Appelman2014-06-031-1/+1
| * | | | Add option to enable app for specific groupsRobin Appelman2014-06-035-9/+86
| * | | | Trigger change event on multiselect changeRobin Appelman2014-06-031-0/+1
| * | | | Allow enabling apps by group by setting the config value to a json encoded ar...Robin Appelman2014-06-031-248/+258
* | | | | Merge pull request #8809 from owncloud/appconfig-cachingThomas Müller2014-06-031-19/+29
|\ \ \ \ \
| * | | | | Use a map to prevent having to use searchRobin Appelman2014-06-031-4/+2
| * | | | | Remove duplicate cache cleanupRobin Appelman2014-06-031-1/+0
| * | | | | Simplify AppConfig->getValues()Robin Appelman2014-06-011-19/+9
| * | | | | Add caching to AppConfig->getAppsRobin Appelman2014-06-011-0/+23
* | | | | | Merge pull request #8837 from owncloud/issue/8720Morris Jobke2014-06-033-11/+11
|\ \ \ \ \ \
| * | | | | | Fix testsJoas Schilling2014-06-031-8/+8
| * | | | | | Use active instead of hover for active sidebar optionJoas Schilling2014-06-031-2/+2
| * | | | | | Do not overwrite cursor in sidebarJoas Schilling2014-06-031-1/+1
* | | | | | | Merge pull request #8840 from owncloud/share_settingsThomas Müller2014-06-033-4/+3
|\ \ \ \ \ \ \
| * | | | | | | improve settings nameBjoern Schiessle2014-06-031-2/+1
| * | | | | | | set "allow users to send mail notification for shared files default" setting ...Bjoern Schiessle2014-06-032-2/+2
* | | | | | | | Merge pull request #8577 from owncloud/apps-sidebar-narrowerMorris Jobke2014-06-032-10/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | remove specific sidebar size from Files appJan-Christoph Borchardt2014-06-031-8/+0