summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-11-052-2/+22
|
* Merge pull request #18821 from owncloud/global-classesThomas Müller2015-11-042-20/+50
|\ | | | | Global classes in core CSS
| * Global Classes for Core.Raghu Nayyar2015-11-022-20/+50
| | | | | | | | | | | | | | | | Move up the global styles up the hierarchy. Adds Clear Left, Right and both. New CSS file for Global Styles.
* | [tx-robot] updated from transifexJenkins for ownCloud2015-11-042-0/+16
| |
* | don't validate searchboxHendrik Leppelsack2015-11-031-1/+1
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-11-036-6/+30
| |
* | Merge pull request #20232 from owncloud/error-button-colorThomas Müller2015-11-021-0/+3
|\ \ | | | | | | fix button text color
| * | fix button text colorJan-Christoph Borchardt2015-11-021-0/+3
| | |
* | | Merge pull request #20220 from owncloud/keep-search-openThomas Müller2015-11-022-2/+3
|\ \ \ | |_|/ |/| | Keep searchbox open if it is in action
| * | keep searchbox open if it is in actionHendrik Leppelsack2015-11-022-2/+3
| |/
* | Close the user menu when clicking it againJoas Schilling2015-11-023-4/+3
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-11-022-2/+4
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-11-012-0/+6
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-10-314-4/+8
|
* Merge pull request #20175 from owncloud/login-arrowThomas Müller2015-10-305-34/+0
|\ | | | | remove unneeded icons from input fields to not distract from submit button, fix #18940
| * remove unneeded icons from input fields to not distract from submit button, ↵Jan-Christoph Borchardt2015-10-305-34/+0
| | | | | | | | fix #18940
* | Merge pull request #20171 from owncloud/tags.js-remove-unneeded-varsThomas Müller2015-10-301-9/+0
|\ \ | | | | | | [tags] remove unneeded variables
| * | [tags] remove unneeded variablesMorris Jobke2015-10-301-9/+0
| | |
* | | Replace some OC_Config calls with ILogger methodsMorris Jobke2015-10-302-4/+5
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2015-10-3012-16/+80
| |
* | Merge pull request #20152 from owncloud/LukasReschke-patch-1Thomas Müller2015-10-291-4/+4
|\ \ | | | | | | Remove invalid type-cast
| * | Remove invalid type-castLukas Reschke2015-10-291-4/+4
| | | | | | | | | | | | | | | | | | This is an `is_array` operation and not a `in_array` one. Thus this typecast is not required. Fixes https://github.com/owncloud/core/issues/20095
* | | Merge pull request #20122 from owncloud/files-consolidateiconupdateThomas Müller2015-10-293-3/+23
|\ \ \ | |/ / |/| | Fix icon update to be more consistent
| * | Fix icon update to be more consistentVincent Petry2015-10-293-3/+23
| | | | | | | | | | | | Makes the details bar show the same icon as in the list.
* | | Merge pull request #11509 from owncloud/internal_email_templateThomas Müller2015-10-292-0/+52
|\ \ \ | |_|/ |/| | Allow separate templates for internal and external share notifications
| * | Allow separate templates for internal and external share notificationsStephen Colebrook2015-10-292-0/+52
| | |
* | | Merge pull request #19871 from owncloud/issue-19583-invalid-sharesThomas Müller2015-10-291-1/+16
|\ \ \ | | | | | | | | Issue 19583 invalid shares
| * | | Add a repair step that checks for group membership on sharesJoas Schilling2015-10-291-1/+16
| |/ /
* / / Add sharee list view js testsTom Needham2015-10-291-0/+158
|/ /
* / [tx-robot] updated from transifexJenkins for ownCloud2015-10-29100-138/+124
|/
* Merge pull request #20097 from owncloud/revert-19508Thomas Müller2015-10-282-16/+1
|\ | | | | Revert "setting to skip migration tests by default"
| * Revert "setting to skip migration tests by default"Morris Jobke2015-10-272-16/+1
| | | | | | | | This reverts commit 7cbdd9b90bcea3566b7d0198f23da3d427e6ef45.
* | [tx-robot] updated from transifexJenkins for ownCloud2015-10-284-4/+114
|/
* Merge pull request #20082 from owncloud/phil-davis-sharedialogviewspec-typosThomas Müller2015-10-271-4/+3
|\ | | | | sharedialogviewSpec.js couple of text typos
| * sharedialogviewSpec.js couple of text typosPhil Davis2015-10-271-4/+3
| | | | | | I noticed a new typo in https://github.com/owncloud/core/commit/15ef39d5b9655c6c10ea58ffa94b7a80efc6290d and looked for others while I am here.
* | Merge pull request #20078 from owncloud/tipsy-bodyThomas Müller2015-10-271-1/+2
|\ \ | |/ |/| Append tipsys to body
| * append tipsys to bodyHendrik Leppelsack2015-10-271-1/+2
| |
* | Merge pull request #19824 from owncloud/ie9-share-donotsendplaceholderaspasswordThomas Müller2015-10-271-7/+12
|\ \ | |/ |/| [IE9] Don't send link share password placeholder
| * [IE9] Don't send link share password placeholderVincent Petry2015-10-261-7/+12
| | | | | | | | | | | | | | | | | | When exiting the password field in the share dialog, IE9 would mistakenly think that the password has changed and would send the placeholder. This fix prevents changing the password whenever the placeholder is set as value.
* | [tx-robot] updated from transifexJenkins for ownCloud2015-10-276-6/+42
|/
* Merge pull request #19837 from owncloud/always-enabled-appsThomas Müller2015-10-261-0/+4
|\ | | | | Store list of apps which cannot be disabled in shipped.json
| * Store list of apps which cannot be disabled in shipped.jsonThomas Müller2015-10-261-0/+4
| |
* | Merge pull request #20049 from owncloud/make-author-file-completeThomas Müller2015-10-267-6/+8
|\ \ | | | | | | Generate author file by license.php build script
| * | Update license headersLukas Reschke2015-10-267-6/+8
| | |
* | | Fix share link focus on clickVincent Petry2015-10-262-2/+26
|/ / | | | | | | Clicking on the link share must focus and select it
* | Merge pull request #19982 from owncloud/fix-link-sharing-regression-masterThomas Müller2015-10-263-7/+36
|\ \ | |/ |/| Ensure the password is only hashed in case it's changed on the client…
| * Fix for broken ajax/share.php endpointRoeland Jago Douma2015-10-232-5/+27
| | | | | | | | | | Even more code mess :( All tests pass again. But I'm really not happy with this endpoint.
| * Ensure the password is only hashed in case it's changed on the client - ↵Thomas Müller2015-10-221-2/+9
| | | | | | | | fixes #19950
* | [tx-robot] updated from transifexJenkins for ownCloud2015-10-2512-0/+48
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-10-24136-148/+34
| |