summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* replace $ by \$Morris Jobke2014-06-031-0/+4
|
* Merge pull request #7485 from owncloud/scrutinizer_fix_1_kondouMorris Jobke2014-06-0316-79/+166
|\ | | | | Scrutinizer cleanup
| * 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
|\ \ | | | | | | move Help section from controls bar to sidebar
| * | 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
|\ \ \ | |/ / |/| | drop allowZIPdownload and maxZIPSize as options
| * | 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
|\ \ \ | |_|/ |/| | Design details
| * | 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 data
| * | | Automatically Rotate Avatar based on exif datajosh4trunks2014-06-011-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit.. * doesn't check if a local or uploaded file is square to give a user the option to crop square images * caches uploaded images to an initial temporary file (needed to fix orientation) * fixes orientation based on exif data * works for encrypted local images as well
* | | | Merge pull request #8806 from owncloud/add_share_indexMorris Jobke2014-06-021-0/+12
|\ \ \ \ | | | | | | | | | | add share index
| * | | | add share indexFrank Karlitschek2014-05-311-0/+12
| | | | |
* | | | | Merge pull request #8676 from owncloud/encryption_improvementsMorris Jobke2014-06-024-155/+102
|\ \ \ \ \ | | | | | | | | | | | | cleanup encryption code, improved return codes
| * | | | | ceanup encryption code, improved return codesBjoern Schiessle2014-06-024-155/+102
| | | | | |
* | | | | | Merge pull request #8613 from owncloud/filesize-alignmentMorris Jobke2014-06-024-3/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | Improve aligment of file size
| * | | | | | display "<1 kB" for really small filesMorris Jobke2014-06-024-3/+24
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | * added parameters for humanFileSize to trigger that behaviour * add unit tests for that
* | | | | | Merge pull request #8712 from owncloud/l10n-fully-translatable-webdavFrank Karlitschek2014-06-024-5/+5
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | fully translatable user_webdav
| * | | | | 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 foldable
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LDAP: set filter mode to raw, so filters will not be changed and broken after upgrade from oc5, when visiting the LDAP settings and opening filter tabs get the correct version number for compare -.- bump version and don't overwrite values on next update if not necessary simpler and better readable assignment
* | | | | | Merge pull request #8718 from owncloud/share_icons_for_shared_byVincent Petry2014-06-021-13/+31
|\ \ \ \ \ \ | | | | | | | | | | | | | | add share icons for folders shared by the current user
| * | | | | | add share icons for folders shared by the current userBjoern Schiessle2014-05-301-13/+31
| | | | | | |
* | | | | | | Merge pull request #8443 from owncloud/csrf-on-login-and-logoutVincent Petry2014-06-023-1/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add CSRF check on login and logout
| * \ \ \ \ \ \ Merge branch 'master' into csrf-on-login-and-logoutThomas Müller2014-05-191565-36600/+68630
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/templates/login.php
| * | | | | | | | Redirect to index if the logout link is accessed without valid sessionLukas Reschke2014-05-111-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed to prevent "Token expired" messages while login if a session is expired @see https://github.com/owncloud/core/pull/8443#issuecomment-42425583
| * | | | | | | | Add CSRF check on login and logoutLukas Reschke2014-05-043-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a minor issue and not worth a backport in my opinion as it could break more things than it's worth having it.
* | | | | | | | | Merge pull request #8807 from owncloud/add_filecache_indexVincent Petry2014-06-021-0/+15
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | add another index to the filecache to reduce the number of queries witho...
| * | | | | | | | | add another index to the filecache to reduce the number of queries without a ↵Frank Karlitschek2014-05-311-0/+15
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | matching index
* | | | | | | | | Merge pull request #8187 from owncloud/escape-more-characterMorris Jobke2014-06-022-1/+12
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | Also encode > and '
| * | | | | | | | Fix typoLukas Reschke2014-05-311-1/+1
| | | | | | | | |
| * | | | | | | | Add unit tests for escapeHTMLLukas Reschke2014-05-281-0/+11
| | | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-30 21:31:55 +0000