summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #19935 from ↵Thomas Müller2015-10-221-18/+1
|\ | | | | | | | | owncloud/issue-19916-settings-menu-hide-on-file-action Use the normal OC.menu JS for handling the Settings menu
| * Use the normal OC.menu JS for handling the Settings menuJoas Schilling2015-10-211-18/+1
| |
* | Merge pull request #19952 from owncloud/share-dialogue-testsThomas Müller2015-10-221-0/+78
|\ \ | | | | | | Add JS tests for share dialog
| * | Fix line lengths in share dialog unit testsTom Needham2015-10-211-2/+8
| | |
| * | Add JS tests for share autocompletion handlingTom Needham2015-10-211-0/+56
| | |
| * | Add test for remote share info tooltopTom Needham2015-10-211-0/+16
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-2278-78/+14
| | |
* | | Merge pull request #19918 from owncloud/send-begin-messageThomas Müller2015-10-212-0/+24
|\ \ \ | | | | | | | | Update: state which step we are going to start and warn if it might b…
| * | | Update: state which step we are going to start and warn if it might be slowJoas Schilling2015-10-212-0/+24
| |/ /
* | | Merge pull request #19936 from owncloud/DeepDiver1975-patch-1Thomas Müller2015-10-211-1/+0
|\ \ \ | | | | | | | | Remove the core version from shipped.json
| * | | Remove the core version from shipped.jsonThomas Müller2015-10-211-1/+0
| | |/ | |/|
* | | Merge pull request #19923 from ↵Thomas Müller2015-10-211-0/+9
|\ \ \ | |/ / |/| | | | | | | | owncloud/apps-donotdisplaybrokenappiconininternetexplorer Disable app icon preview in apps page for IE
| * | Disable app icon preview in apps page for IEVincent Petry2015-10-211-0/+9
| |/ | | | | | | | | | | | | | | | | | | All IE versions are not able to properly upscale SVG icons unless the said SVG files contain a "viewBox" attribute, which is not always the case. Also we cannot guarantee that all third party apps will have this attribute in their icons. So for now, app icons will not be displayed in IE instead of broken ones.
* / Update - Only add one section for disabled appsJoas Schilling2015-10-211-6/+9
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-10-216-34/+44
|
* Allow leaving update page when errors occurredVincent Petry2015-10-201-0/+2
|
* Prevent leaving the DB update page while in progressVincent Petry2015-10-201-0/+7
|
* Merge pull request #19878 from owncloud/fix-filepicker-loading-spinnerThomas Müller2015-10-202-4/+4
|\ | | | | fix filepicker loading spinner
| * fix filepicker loading spinnerChristoph Wurst2015-10-192-4/+4
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-10-204-0/+6
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-10-194-310/+430
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-10-188-10/+34
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-10-174-0/+10
|
* Merge pull request #19836 from owncloud/share-fix-spinner-positionThomas Müller2015-10-161-0/+1
|\ | | | | Fix spinner positions in share tab
| * Fix spinner positions in share tabVincent Petry2015-10-161-0/+1
| | | | | | | | Also fix missing spinner when removing link share
* | Consolidate webdav code - move all to one appThomas Müller2015-10-161-0/+1
|/
* Fix DOM element ids in share dialogVincent Petry2015-10-165-119/+138
| | | | | | | | - Rely on class names instead of global ids - When global ids are needed for label+checkbox, append the view id (cid) to the element's id This fixes the checkboxes when multiple sidebars exist in the DOM.
* [tx-robot] updated from transifexJenkins for ownCloud2015-10-1610-0/+48
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-10-156-0/+6
|
* Merge pull request #19625 from owncloud/passwordchange-hidestrengthifyThomas Müller2015-10-141-1/+1
|\ | | | | Properly hide strengthify after password change
| * Properly hide strengthify after password changeVincent Petry2015-10-071-1/+1
| |
* | Merge pull request #19630 from owncloud/fix-ie-painThomas Müller2015-10-142-1/+13
|\ \ | | | | | | Fix more IE issues
| * | [IE8] Fix button background colorVincent Petry2015-10-071-0/+6
| | | | | | | | | | | | IE8 doesn't support rgba...
| * | [IE9] Set explicit height to file actions menu iconVincent Petry2015-10-071-0/+1
| | | | | | | | | | | | IE9 flattened the icons, so give it an explicit height.
| * | [IE] Add border to dropdown menusVincent Petry2015-10-071-1/+6
| |/ | | | | | | | | As a fallback because box-shadow doesn't give the same effect and drop shadow doesn't work with IE.
* | Merge pull request #19631 from owncloud/share-emailsenterrorThomas Müller2015-10-144-13/+185
|\ \ | | | | | | Fix share email sending feedback
| * | Add unit tests for sending e-mail for link sharesRoeland Jago Douma2015-10-082-10/+170
| | |
| * | Fix share email sending feedbackVincent Petry2015-10-082-3/+15
| | | | | | | | | | | | Redisplay email address after failure
* | | Merge pull request #19714 from owncloud/trash-deletesectionposition-2Thomas Müller2015-10-141-1/+0
|\ \ \ | | | | | | | | Revert "Revert "Move trashbin specific CSS that modifies sidebar""
| * | | Revert "Revert "Move trashbin specific CSS that modifies sidebar""Thomas Müller2015-10-121-1/+0
| | | | | | | | | | | | | | | | This reverts commit 0738ddfb768c541e8a6b112fb2cd12d15676a0ab.
* | | | Merge pull request #19645 from owncloud/file-conflict-disablecontinueThomas Müller2015-10-141-0/+11
|\ \ \ \ | | | | | | | | | | Disable "Continue" button in conflict dialog when no selection
| * | | | Check .conflicts for checkboxesMorris Jobke2015-10-081-1/+1
| | | | |
| * | | | Disable "Continue" button in conflict dialog when no selectionVincent Petry2015-10-081-0/+11
| | |_|/ | |/| |
* | | | Merge pull request #19699 from owncloud/hutchic-issue-18241-reload-page-linkThomas Müller2015-10-141-1/+1
|\ \ \ \ | | | | | | | | | | refs #18241 Make the 'please reload this page' a clickable link
| * | | | refs #18241 Make the 'please reload this page' a clickable linkColin Hutchinson2015-10-101-1/+1
| | | | |
* | | | | [update] show default error message if empty messageMorris Jobke2015-10-141-0/+1
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-142-0/+18
| | | | |
* | | | | Do not print exception messageLukas Reschke2015-10-132-13/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case of an error the error message often contains sensitive data such as the full path which potentially leads to a full path disclosure. Thus the error message should not directly get displayed to the user and instead be logged.
* | | | | Merge pull request #19677 from ↵Thomas Müller2015-10-132-6/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | owncloud/silently-fail-app-upgrade-exceptions-master Silently fail app upgrade exceptions
| * | | | | Always pass in ILoggerThomas Müller2015-10-092-6/+10
| | | | | |