summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-09-242-1/+12
|
* Merge pull request #11254 from owncloud/fix-filepicker-home-iconVolkan Gezer2014-09-231-0/+2
|\ | | | | fix filepicker home icon being partly hidden, fix #10169
| * fix filepicker home icon being partly hidden, fix #10169Jan-Christoph Borchardt2014-09-231-0/+2
| |
* | Merge pull request #11019 from owncloud/do-not-show-exception-to-enduserLukas Reschke2014-09-232-1/+32
|\ \ | | | | | | Do not show exception to the end-user - use a proper error page instead
| * | replace horizontal rules with whitespaceJan-Christoph Borchardt2014-09-171-3/+4
| | |
| * | Do not show exception to the end-userLukas Reschke2014-09-172-1/+31
| | | | | | | | | | | | Log the error instead of potentially leaking sensitive information
* | | Merge pull request #7051 from owncloud/postsetupajaxcheckVincent Petry2014-09-232-0/+72
|\ \ \ | |_|/ |/| | Moved WebDAV check to client side JS
| * | Moved WebDAV and internet checks to client side JSVincent Petry2014-09-232-0/+72
| | | | | | | | | | | | | | | | | | | | | - Added setup checks in JavaScript - Moved isWebDAVWorking to JS using SetupChecks - Moved internet connection checks to an ajax call that goes through the server
* | | Merge pull request #11222 from owncloud/store-users-timezone-masterThomas Müller2014-09-233-2/+363
|\ \ \ | | | | | | | | send browsers timezone back tp the server on login
| * | | send browsers timezone back tp the server on loginThomas Müller2014-09-223-2/+363
| | | |
* | | | Merge pull request #11234 from owncloud/fix-icon-classesJan-Christoph Borchardt2014-09-231-2/+2
|\ \ \ \ | |_|/ / |/| | | Fix icon classes, disappeared delete icon
| * | | correct delete-icon to icon-delete, fix #11128Jan-Christoph Borchardt2014-09-221-2/+2
| | | |
* | | | Merge pull request #11226 from owncloud/kill-postsetupcheck-masterVincent Petry2014-09-232-9/+3
|\ \ \ \ | | | | | | | | | | remove post setup check
| * | | | remove post setup checkThomas Müller2014-09-222-9/+3
| | |/ / | |/| |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-233-2/+17
| |/ / |/| |
* | | no loner use deprecated class \OC_ConfigThomas Müller2014-09-222-3/+16
| | |
* | | remove bootstrapping - occ can by definition only be executed if ownCloud is ↵Thomas Müller2014-09-221-8/+0
| | | | | | | | | | | | installed - base.php is required earlier already
* | | show upgrade errors as error in the console and report back that the upgrade ↵Thomas Müller2014-09-221-12/+14
|/ / | | | | | | process failed if it did
* | [tx-robot] updated from transifexJenkins for ownCloud2014-09-214-5/+16
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2014-09-2011-12/+57
| |
* | Merge pull request #10968 from owncloud/admin-groupsselect2Lukas Reschke2014-09-1959-0/+5419
|\ \ | | | | | | Use select2 for the groups excluded from sharing in admin page
| * | fit select2 to ownCloud input styleJan-Christoph Borchardt2014-09-101-0/+12
| | |
| * | Move select2 from files_external to coreVincent Petry2014-09-0958-0/+5407
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-1968-69/+6
| | |
* | | Merge pull request #11143 from owncloud/improve-404Morris Jobke2014-09-181-2/+5
|\ \ \ | | | | | | | | Make 404 page easier to understand
| * | | Make 404 page easier to understandLukas Reschke2014-09-171-2/+5
| | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/11133
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-1810-10/+35
|/ / /
* | / [tx-robot] updated from transifexJenkins for ownCloud2014-09-1739-110/+59
| |/ |/|
* | Merge pull request #10902 from owncloud/fix-ellepsisLukas Reschke2014-09-161-0/+5
|\ \ | | | | | | Adding link to ellipsis and fixing styling
| * | Adding link to ellipsis and fixing stylingClark Tomlinson2014-09-161-0/+5
| | |
* | | Merge pull request #10896 from owncloud/undo-nav-entryMorris Jobke2014-09-161-0/+35
|\ \ \ | | | | | | | | Add delete undo styles
| * | | add delete undo stylesBernhard Posselt2014-09-161-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use less right padding better styling, fix padding issues no special color for undo nav entry fix fallback width use class for button
* | | | Merge pull request #7254 from owncloud/core-sortalgoLukas Reschke2014-09-163-1/+212
|\ \ \ \ | | | | | | | | | | Fixed JS sort comparator to be consistent between JS and PHP
| * | | | Fixed sort algo for additional casesVincent Petry2014-08-112-2/+8
| | | | |
| * | | | Fixed file list sortingVincent Petry2014-08-113-1/+206
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now using a natural sort algorithm that is more consistent between JS and PHP (although not perfect in some corner cases) - added OC.Util.naturalSortComparator that uses the same algo that was used for the user list - changed user list and files list to use OC.Util.naturalSortComparator - removed toLowerCase() and changed the comparator to use String.localeCompare() - added unit tests - added OC_NaturalSort that is used by OCP\Util::naturalSortCompare()
* | | | | Merge pull request #11055 from owncloud/replaceprodnameThomas Müller2014-09-161-2/+2
|\ \ \ \ \ | | | | | | | | | | | | replace ownCloud with placeholder
| * | | | | replace ownCloud with placeholderVolkan Gezer2014-09-131-2/+2
| | |/ / / | |/| | |
* | | | | Merge pull request #10663 from owncloud/files_trashbin_original_pathMorris Jobke2014-09-162-0/+11
|\ \ \ \ \ | | | | | | | | | | | | Show original path information in trashbin and for shares
| * | | | | patch tipsy in style.css - don't patch 3rdparty librariesMorris Jobke2014-09-162-1/+6
| | | | | |
| * | | | | Better tooltip handling of very long stringsRobin McCorkell2014-09-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Maximum tooltip length now 400px instead of 200px * Overflowing strings create ellipsis (...)
| * | | | | Show original path information in trashbin and sharing viewsRobin McCorkell2014-09-112-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Path will only be shown if in subdirectory, not in root.
* | | | | | Revert "improve logo flexibility to fix wide custom logo alignment, fix #9339"Vincent Petry2014-09-162-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 064e6951e1ef792422ff6cf24fce79c2320d4d5e. Reverting due to regression that breaks styles in error page, setup page and others. Fixes #10967
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-165-2/+7
| | | | | |
* | | | | | Merge pull request #11040 from owncloud/fix-app-menu-overlappJan-Christoph Borchardt2014-09-152-2/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove bottom: 0 from app-navigation-entry-utils to prevent the utils form overlapping the whole element....
| * | | | | | add some minor fixes for IE8Morris Jobke2014-09-152-1/+5
| | | | | | |
| * | | | | | remove bottom: 0 to prevent the menu form overlapping the whole element. ↵Bernhard Posselt2014-09-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This happens if a folder has entries, the menu expands to the very bottom and overlaps all entries and makes them impossible to click fix input width which was changed likely with the icon PR use calc because firefox and chrome have different scrollbar widths which causes firefox to push the button into the next row while everything is well in chrome add normal width for IE8
* | | | | | | Merge pull request #11060 from owncloud/rmobslangLukas Reschke2014-09-152-23/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | remove obsolete language files
| * | | | | | | remove obsolete language filesVolkan Gezer2014-09-132-23/+0
| | | | | | | |
* | | | | | | | Merge pull request #10109 from owncloud/issue_#9793_guestlayoutMorris Jobke2014-09-151-7/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Step one, open guest layout for different styles.
| * | | | | | | | Step one, open guest layout for different styles.Lukas Reschke2014-09-111-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/templates/layout.guest.php Step one, open guest layout for different styles.