summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6262 from nickvergessen/issue/4375Frank Karlitschek2013-12-201-1/+1
|\ | | | | correctly mark app management active
| * correctly mark app management activeJoas Schilling2013-12-091-1/+1
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-12-191-0/+1
| |
* | Merge pull request #6431 from owncloud/core-pluraltranslationsfixThomas Müller2013-12-181-4/+8
|\ \ | | | | | | Added plural translation fallback
| * | Fixed JS plural function to be per appVincent Petry2013-12-161-4/+8
| | | | | | | | | | | | | | | | | | | | | Some apps might not define the same "nplural" value. To avoid conflicts, the plural function is now generated per app. Fixes #6427
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-171-1/+4
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-173-0/+15
| | |
* | | Merge pull request #6386 from ↵Frank Karlitschek2013-12-171-4/+4
|\ \ \ | |/ / |/| | | | | | | | owncloud/trash_always_show_deleted_files_breadcrumb always show 'Deleted Files' breadcrumb
| * | always show home breadcrumb in files viewBjoern Schiessle2013-12-161-4/+4
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-137-2/+34
| | |
* | | Merge pull request #6390 from owncloud/migration-fixwebrootVincent Petry2013-12-131-1/+8
|\ \ \ | |/ / |/| | Fix webroot for update page
| * | Fix webroot for update pageVincent Petry2013-12-131-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | On the update page, config.js was missing which caused oc_webroot to not be available. That would trigger the faulty oc_webroot fallback that didn't take URLs like "/owncloud/index.php/files/apps" into account. This fix adds config.js in the update page and also a fix for the oc_webroot fallback, in case it is used elsewhere.
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-116-2/+7
| | |
* | | Merge pull request #5968 from owncloud/legacy-popup-fixesVincent Petry2013-12-101-3/+11
|\ \ \ | |/ / |/| | fix the legacy popup to make calendar settings look nicer
| * | fix shadow size and arrow positionJan-Christoph Borchardt2013-12-091-2/+2
| | |
| * | fix the legacy popup to make calendar settings look nicerJan-Christoph Borchardt2013-11-201-2/+10
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-098-0/+16
| | |
* | | Merge pull request #6231 from owncloud/fix-plural-l10nblizzz2013-12-091-1/+1
|\ \ \ | | | | | | | | fix plural translation - fixes #6226
| * | | fix plural translation - fixes #6226Morris Jobke2013-12-071-1/+1
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-073-14/+64
| | | |
* | | | Merge pull request #6202 from owncloud/fix_6032_altMorris Jobke2013-12-073-0/+34
|\ \ \ \ | |/ / / |/| | | Add overlay noscript message to fix #6032
| * | | fix IE8 transparent backgroundMorris Jobke2013-12-071-0/+5
| | | |
| * | | Remove reference to ownCloud.ringmaster2013-12-051-1/+1
| | | |
| * | | Link to enable-javascript.comringmaster2013-12-052-1/+8
| | | |
| * | | Make noscript message translatableringmaster2013-12-051-1/+1
| | | |
| * | | Move message up 10%ringmaster2013-12-051-1/+1
| | | |
| * | | Add overlay noscript message to fix #6032ringmaster2013-12-052-0/+22
| | | |
* | | | Slide duration set to 200ms for multiselect (same duration as user menu)unknown2013-12-051-6/+7
| | | |
* | | | Revert "Merge pull request #6210 from owncloud/fix-5865"Morris Jobke2013-12-051-14/+13
| | | | | | | | | | | | | | | | | | | | This reverts commit f12363d90b31e03a9f2e95911dda54af728a2df6, reversing changes made to eba35d28cd974507f9e81e15430d3d33dbbd9973.
* | | | Changed duration of slideDown, slideUp and fadeOut to 200msunknown2013-12-051-13/+14
| |_|/ |/| |
* | | fix appearance of error message - .errors is outdatedMorris Jobke2013-12-051-5/+6
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2013-12-043-8/+91
| |
* | Merge pull request #5946 from owncloud/public-page-detailsVincent Petry2013-12-031-1/+8
|\ \ | | | | | | Public page details
| * | fix public page - gallery view issuesMorris Jobke2013-12-031-2/+2
| | |
| * | account for shift of controls bar due to app navigation, do not shift on ↵Jan-Christoph Borchardt2013-12-031-0/+7
| | | | | | | | | | | | public page
* | | Merge pull request #5931 from owncloud/fix-time-field-properlyThomas Müller2013-12-031-2/+2
|\ \ \ | | | | | | | | fix time input field properly, details
| * | | fix time input field properly, detailsJan-Christoph Borchardt2013-11-181-2/+2
| | | |
* | | | Revert "[fix] Center Share Dropdown & Versions Dropdown"zombiehugs2013-12-031-1/+1
| | | | | | | | | | | | | | | | This reverts commit 1dbbfcf3dcd4de7f31344244b9f22217e4bfba72.
* | | | [fix] Center Share Dropdown & Versions Dropdownzombiehugs2013-12-031-1/+1
| |/ / |/| | | | | | | | Center Share Dropdown & Versions Dropdown
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-028-12/+44
| | |
* | | Merge pull request #6128 from owncloud/fix-6126-masterThomas Müller2013-11-291-0/+1
|\ \ \ | | | | | | | | Also merge autoconfig variables into $_REQUEST.
| * | | Also merge autoconfig variables into $_REQUEST.Andreas Fischer2013-11-291-0/+1
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-294-8/+18
|/ / /
* | | Merge pull request #5984 from owncloud/nav-scrollbarFrank Karlitschek2013-11-292-5/+12
|\ \ \ | | | | | | | | always show app navigation scrollbar when too many apps in there
| * | | Fix for IE - an ugly horizontal scrollbar appearsMorris Jobke2013-11-272-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * for IE9 the nav bar was too narrow * for other IEs the width of each app element was to wide and cause the horizontal scoll bar - now this content is hidden like before this PR
| * | | fix navbarMorris Jobke2013-11-271-1/+0
| | | |
| * | | prevent shift of app names caused by scrollbar, part 2Jan-Christoph Borchardt2013-11-271-1/+3
| | | |
| * | | prevent shift of app titles caused by scrollbarJan-Christoph Borchardt2013-11-271-0/+1
| | | |
| * | | always show app navigation scrollbar when too many apps in thereJan-Christoph Borchardt2013-11-271-5/+4
| | | |
* | | | Fix resize issue for trash button in chrome and overflowing spinner in ↵Morris Jobke2013-11-282-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | .update class fixes #6108