summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8662 from owncloud/f-lockThomas Müller2014-06-044-13/+21
|\
| * workaround to get the unit test goingThomas Müller2014-06-041-4/+6
| * get the storage from the viewBjoern Schiessle2014-06-041-4/+5
| * don't ask for fileInfo if we already have oneBjoern Schiessle2014-06-041-5/+4
| * make sure to close the stream at the end of each testBjoern Schiessle2014-06-041-0/+6
| * Continued flock work.ringmaster2014-06-041-0/+1
| * flock changes. Work in progress.ringmaster2014-06-041-1/+0
* | 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-042-9/+2
|\ \ \ \
| * | | | infield label removal: remove last occurences of infield labelsJan-Christoph Borchardt2014-06-032-9/+2
| |/ / /
* | | / [tx-robot] updated from transifexJenkins for ownCloud2014-06-04137-319/+72
| |_|/ |/| |
* | | Merge pull request #8698 from owncloud/sharing_improve_permissionsThomas Müller2014-06-032-36/+16
|\ \ \
| * | | 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-022-34/+12
* | | | 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 #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-031-1/+1
|\ \ \ \ \
| * | | | | set "allow users to send mail notification for shared files default" setting ...Bjoern Schiessle2014-06-031-1/+1
| | |_|_|/ | |/| | |
* | | | | remove specific sidebar size from Files appJan-Christoph Borchardt2014-06-031-8/+0
| |_|/ / |/| | |
* | | | Merge pull request #8729 from owncloud/add-phpseclib-masterThomas Müller2014-06-0335-31207/+9
|\ \ \ \ | |/ / / |/| | |
| * | | use phpseclib from 3rdpartyThomas Müller2014-06-0335-31207/+9
* | | | fix empty file handling optionMorris Jobke2014-06-031-9/+11
| |/ / |/| |
* | | Merge pull request #8821 from owncloud/kill-zip-download-restrictionJan-Christoph Borchardt2014-06-0312-56/+16
|\ \ \
| * | | fix unit testsMorris Jobke2014-06-021-1/+1
| * | | add OCP\Config:deleteSystemValueMorris Jobke2014-06-021-3/+3
| * | | bump versionMorris Jobke2014-06-021-1/+1
| * | | drop allowZIPdownload and maxZIPSize as optionsMorris Jobke2014-06-0210-54/+14
* | | | Merge pull request #8820 from owncloud/design-detailsFrank Karlitschek2014-06-022-4/+16
|\ \ \ \ | |_|_|/ |/| | |