summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #8264 from owncloud/app-enable-by-groupicewind19912014-06-031-3/+4
|\ | | | | Add the option to enable apps only for specific groups
| * remove +3 in multiselect.jsThomas Müller2014-06-031-3/+3
| |
| * Trigger change event on multiselect changeRobin Appelman2014-06-031-0/+1
| |
* | Merge pull request #8577 from owncloud/apps-sidebar-narrowerMorris Jobke2014-06-031-2/+2
|\ \ | | | | | | reduce width of app sidebar a bit
| * | reduce width of app sidebar a bitJan-Christoph Borchardt2014-06-031-2/+2
| | |
* | | Merge pull request #8843 from owncloud/design-detail-sharedropdownMorris Jobke2014-06-031-1/+1
|\ \ \ | | | | | | | | fix positioning issue of share dropdown in intermediate widths
| * | | fix positioning issue of share dropdown in intermediate widthsJan-Christoph Borchardt2014-06-031-1/+1
| |/ /
* | | Merge pull request #8827 from owncloud/add-sqlite-infoThomas Müller2014-06-033-3/+10
|\ \ \ | | | | | | | | add info about sqlite on setup page
| * | | add info about sqlite on setup apgeMorris Jobke2014-06-023-3/+10
| | | |
* | | | Merge pull request #7151 from owncloud/user-jqueryThomas Müller2014-06-032-1/+2
|\ \ \ \ | |_|/ / |/| | | Continuing the New User management
| * | | cleanupArthur Schiwon2014-06-021-1/+0
| | | |
| * | | refactor delete handling and apply it to users and groupsArthur Schiwon2014-06-021-0/+1
| | | |
| * | | add Last Login columnArthur Schiwon2014-06-021-0/+1
| | | |
| * | | Splits Controls overlap in files and users.raghunayyar2014-06-021-1/+4
| | | |
| * | | resolve conflicts while picking c0fb623raghunayyar2014-06-021-4/+1
| | | |
* | | | 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
| | |/ / | |/| |
* | | | move Help section from controls bar to sidebarJan-Christoph Borchardt2014-06-021-9/+0
| | | |
* | | | Merge pull request #8820 from owncloud/design-detailsFrank Karlitschek2014-06-025-9/+21
|\ \ \ \ | |/ / / |/| | | 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-021-0/+1
| | | |
| * | | 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 #8613 from owncloud/filesize-alignmentMorris Jobke2014-06-022-1/+22
|\ \ \ | |_|/ |/| | Improve aligment of file size
| * | display "<1 kB" for really small filesMorris Jobke2014-06-022-1/+22
| |/ | | | | | | | | * added parameters for humanFileSize to trigger that behaviour * add unit tests for that
* | 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-021-0/+3
|\ \ \ | | | | | | | | Add CSRF check on login and logout
| * \ \ Merge branch 'master' into csrf-on-login-and-logoutThomas Müller2014-05-19104-280/+1271
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: core/templates/login.php
| * | | | Add CSRF check on login and logoutLukas Reschke2014-05-041-0/+3
| | | | | | | | | | | | | | | | | | | | 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 #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
| | | | |
| * | | | Also encode > and 'Lukas Reschke2014-04-131-1/+1
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-021-0/+1
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-011-0/+8
| | | | |
* | | | | Merge pull request #8798 from owncloud/fix-corejsVincent Petry2014-05-311-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Fix undefined JS on login/setup page
| * | | | | Fix undefined JS on login/setup pageVincent Petry2014-05-301-3/+3
| | |_|_|/ | |/| | |
* / | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-3114-4/+120
|/ / / /
* | | | Fix fileList fallback in OC.Share for outside files appVincent Petry2014-05-301-3/+10
| | | | | | | | | | | | | | | | | | | | OC.Share can be used in non-files apps, so the fileList callback needs to support that as well.
* | | | Sharing overview fixes and unit testsVincent Petry2014-05-301-21/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed renaming and fileActionsReady event - Added unit tests for shares list - Fixed public page with defer - Fixed file actions in sharing overview - Fixed sharing counterpart list (10 entries max) - Fixed file path attribute to be used in download action - Fix sharing list headers - OC.Share icons now operate on fileList instance - Fix OC.Share.updateIcon when more than one list in DOM
* | | | Fix IE8 issue when icon is not definedVincent Petry2014-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes no icon file is passed to replaceSVGIcon(), it showed an error in IE8 and broke the code flow. This fix adds a check whether the file name is set.
* | | | Fixed file actions for sharing viewsVincent Petry2014-05-301-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FileActions can now be clone to be use for separate file list views without having the side-effect of affecting the main file list view. Added "Open" action in sharing overview file lists to redirect to the regular file list when clicking on a folder.
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-02 13:07:58 +0000