summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ | |_|_|/ |/| | |
| * | | move Deleted Files to bottom of sidebarJan-Christoph Borchardt2014-06-021-0/+6
| * | | fix success status symbol to a circleMorris Jobke2014-06-021-0/+5
| * | | more subtle hover effect on sortable column, text instead of backgroundJan-Christoph Borchardt2014-06-021-1/+1
| * | | fix misalignment of modified dates, shift to rightJan-Christoph Borchardt2014-06-021-1/+1
| * | | remove unused table sizing CSSJan-Christoph Borchardt2014-06-021-2/+3
| |/ /
* | | Merge pull request #8676 from owncloud/encryption_improvementsMorris Jobke2014-06-024-155/+102
|\ \ \
| * | | ceanup encryption code, improved return codesBjoern Schiessle2014-06-024-155/+102
* | | | Merge pull request #8613 from owncloud/filesize-alignmentMorris Jobke2014-06-022-2/+2
|\ \ \ \
| * | | | display "<1 kB" for really small filesMorris Jobke2014-06-022-2/+2
* | | | | Merge pull request #8712 from owncloud/l10n-fully-translatable-webdavFrank Karlitschek2014-06-024-5/+5
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | document always links to the current version of OCVolkan Gezer2014-05-292-2/+2
| * | | | fully translatable user_webdavVolkan Gezer2014-05-294-5/+5
* | | | | Port LDAP: fix filter can be reset and broken after upgrade from OC 5 #8579Arthur Schiwon2014-06-022-13/+31
| |/ / / |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-023-4/+8
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-01131-65/+262
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-3118-13/+132
* | | | Merge pull request #8444 from owncloud/cleanup-list-codeThomas Müller2014-05-302-17/+13
|\ \ \ \