aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8842 from owncloud/ldap_cli_methodsThomas Müller2014-06-045-1/+232
|\
| * Fix casing and PHPDocThomas Müller2014-06-034-8/+7
| * fix description textsArthur Schiwon2014-06-032-2/+2
| * command line tools to see, modify and test existing LDAP configurationsArthur Schiwon2014-06-035-1/+233
* | Merge pull request #8849 from owncloud/trash_expire_fixThomas Müller2014-06-041-8/+9
|\ \
| * | fixing typoThomas Müller2014-06-041-1/+1
| * | get files in trash from file cacheBjoern Schiessle2014-06-031-7/+8
* | | Merge pull request #8468 from owncloud/remove-infieldlabelsJan-Christoph Borchardt2014-06-0418-270/+542
|\ \ \
| * | | move to updated version of placeholderMorris Jobke2014-06-036-22/+481
| * | | fix text alignment in input fieldsJan-Christoph Borchardt2014-06-031-1/+1
| * | | fix icon alignment in input fieldsJan-Christoph Borchardt2014-06-031-2/+2
| * | | add missing placeholder shim for change password fields in IE8/9Jan-Christoph Borchardt2014-06-031-0/+2
| * | | remove tilde selector for IE8 compatibilityJan-Christoph Borchardt2014-06-031-2/+2
| * | | remove scruntinizer config for infieldMorris Jobke2014-06-031-1/+0
| * | | fix show password icon in personal settingsJan-Christoph Borchardt2014-06-031-2/+3
| * | | infield label removal: remove last occurences of infield labelsJan-Christoph Borchardt2014-06-035-17/+10
| * | | infield label removal: remove JS file and references to itJan-Christoph Borchardt2014-06-033-183/+0
| * | | infield label removal: fix installation screenJan-Christoph Borchardt2014-06-032-15/+22
| * | | first step of infield label removal, fix login screenJan-Christoph Borchardt2014-06-033-31/+25
| |/ /
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-041011-35744/+38708
* | | 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