summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 #8729 from owncloud/add-phpseclib-masterThomas Müller2014-06-0336-31207/+9
|\
| * use phpseclib from 3rdpartyThomas Müller2014-06-0336-31207/+9
* | Merge pull request #8833 from owncloud/fix-file-handling-optionThomas Müller2014-06-031-9/+11
|\ \
| * | fix empty file handling optionMorris Jobke2014-06-031-9/+11
* | | Merge pull request #8831 from owncloud/dollar-sign-escape-l10nThomas Müller2014-06-031-0/+4
|\ \ \ | |/ / |/| |
| * | replace $ by \$Morris Jobke2014-06-031-0/+4
|/ /
* | Merge pull request #7485 from owncloud/scrutinizer_fix_1_kondouMorris Jobke2014-06-0316-79/+166
|\ \
| * | Fix a typokondou2014-06-021-1/+1
| * | Add some more spaces for operatorskondou2014-06-021-4/+4
| * | Some readability improvementskondou2014-06-022-3/+3
| * | Scrutinizer cleanupkondou2014-06-0216-79/+166
* | | Merge pull request #8828 from owncloud/design-help-sidebarMorris Jobke2014-06-033-26/+61
|\ \ \
| * | | add arrow icon for external linksJan-Christoph Borchardt2014-06-021-4/+4
| * | | move Help section from controls bar to sidebarJan-Christoph Borchardt2014-06-023-26/+61
* | | | Merge pull request #8821 from owncloud/kill-zip-download-restrictionJan-Christoph Borchardt2014-06-0314-104/+26
|\ \ \ \ | |/ / / |/| | |
| * | | fix unit testsMorris Jobke2014-06-021-1/+1
| * | | add OCP\Config:deleteSystemValueMorris Jobke2014-06-022-3/+13
| * | | bump versionMorris Jobke2014-06-021-1/+1
| * | | drop allowZIPdownload and maxZIPSize as optionsMorris Jobke2014-06-0211-102/+14
* | | | Merge pull request #8820 from owncloud/design-detailsFrank Karlitschek2014-06-028-13/+41
|\ \ \ \ | |_|/ / |/| | |
| * | | fix unit tests after introduction of animations - adds delays for click triggerMorris Jobke2014-06-021-0/+7
| * | | move Deleted Files to bottom of sidebarJan-Christoph Borchardt2014-06-022-0/+7
| * | | fix success status symbol to a circleMorris Jobke2014-06-022-0/+9
| * | | 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
| * | | add OC.menuSpeed to control the animation speed of menu toggleMorris Jobke2014-06-021-7/+8
| * | | Adds Animation to Toggling Navigation on < 768px widthsraghunayyar2014-06-021-4/+4
| * | | shift files app breadcrumbs to account for missing app listJan-Christoph Borchardt2014-06-021-1/+4
| * | | fix height of select boxes for OS XJan-Christoph Borchardt2014-06-021-1/+1
* | | | Merge pull request #8812 from josh4trunks/avatar_rotateVincent Petry2014-06-021-7/+12
|\ \ \ \
| * | | | Automatically Rotate Avatar based on exif datajosh4trunks2014-06-011-7/+12
* | | | | Merge pull request #8806 from owncloud/add_share_indexMorris Jobke2014-06-021-0/+12
|\ \ \ \ \
| * | | | | add share indexFrank Karlitschek2014-05-311-0/+12
* | | | | | 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-024-3/+24
|\ \ \ \ \ \ \
| * | | | | | | display "<1 kB" for really small filesMorris Jobke2014-06-024-3/+24
| | |_|/ / / / | |/| | | | |
* | | | | | | 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
* | | | | | | Merge pull request #8784 from owncloud/fold-reshare-settingsMorris Jobke2014-06-022-10/+11
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | make reshare settings foldableVolkan Gezer2014-05-292-10/+11
* | | | | | | Port LDAP: fix filter can be reset and broken after upgrade from OC 5 #8579Arthur Schiwon2014-06-022-13/+31
* | | | | | | Merge pull request #8718 from owncloud/share_icons_for_shared_byVincent Petry2014-06-021-13/+31
|\ \ \ \ \ \ \