summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Adding progress to occ upgradeThomas Müller2016-04-281-15/+51
|
* Adding progress to web upgradeThomas Müller2016-04-281-6/+58
|
* Adding progress to occ maintenance:repairThomas Müller2016-04-282-16/+57
|
* [tx-robot] updated from transifexJenkins for ownCloud2016-04-282-0/+6
|
* Merge pull request #21417 from J0WI/css-fixesThomas Müller2016-04-277-27/+38
|\ | | | | css fallbacks and code style fixes
| * fixed fallbacks and code stylejowi2016-01-027-27/+38
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2016-04-278-2/+22
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2016-04-266-38/+58
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2016-04-256-0/+6
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2016-04-2410-18/+50
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2016-04-238-0/+52
| |
* | Deprecate appinfo/update.php - RepairSteps within info.xml are to be usedThomas Müller2016-04-221-0/+18
| |
* | Merge pull request #23918 from owncloud/cruds-for-federated-sharesBjörn Schießle2016-04-222-34/+16
|\ \ | | | | | | bring back CRUDS permissions for federated shares
| * | always share with same default permissions, no special handling for remote ↵Björn Schießle2016-04-201-15/+11
| | | | | | | | | | | | shares
| * | bring back CRUDS permissions for federated sharesBjoern Schiessle2016-04-182-19/+5
| | |
* | | Merge pull request #24085 from owncloud/feedback-on-app-migrationsThomas Müller2016-04-222-7/+23
|\ \ \ | | | | | | | | App migration steps need to push feedback to the user ....
| * | | Adding pre- and post-migration repair stepsThomas Müller2016-04-221-6/+22
| | | |
| * | | Remove deprecated HTTPHelper from InfoParserThomas Müller2016-04-221-1/+1
| | | |
* | | | Merge pull request #24126 from owncloud/err-reload-delayLukas Reschke2016-04-222-4/+17
|\ \ \ \ | |/ / / |/| | | Delay reloading the page if an ajax error occurs, show notification
| * | | Add test for reload delayRobin McCorkell2016-04-201-3/+15
| | | |
| * | | Delay reloading the page if an ajax error occurs, show notificationRobin McCorkell2016-04-201-1/+2
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-226-0/+6
| | | |
* | | | Merge pull request #24138 from owncloud/revert-22760-tooltip-cssfixThomas Müller2016-04-211-1/+0
|\ \ \ \ | | | | | | | | | | Revert "add word wrap to tooltips. Fixes #22746"
| * | | | Revert "add word wrap to tooltips. Fixes #22746"Lukas Reschke2016-04-201-1/+0
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-21134-280/+360
|/ / / /
* | | | Merge pull request #24132 from owncloud/fix-web-updaterThomas Müller2016-04-201-3/+3
|\ \ \ \ | | | | | | | | | | Fix web updater
| * | | | Fix web updater - fixes #24115Thomas Müller2016-04-201-3/+3
| |/ / /
* | | | Merge pull request #23990 from owncloud/heartbeat-debounceMorris Jobke2016-04-202-4/+12
|\ \ \ \ | | | | | | | | | | Debounce heartbeat ajax calls to lower the number of requests
| * | | | Debounce heartbeat ajax calls to lower the number of requestsChristoph Wurst2016-04-182-4/+12
| | | | | | | | | | | | | | | | | | | | fixes #22397
* | | | | Merge pull request #24081 from owncloud/migrate-deprecated-jquery-v1-functionsThomas Müller2016-04-204-14/+15
|\ \ \ \ \ | |_|/ / / |/| | | | migrate deprecated jQuery 1.x functions
| * | | | replace $().attr('checked') by $().prop('checked', state) or $().is(':checked')Christoph Wurst2016-04-194-8/+8
| | | | |
| * | | | replace $.parseJSON() by JSON.parse()Christoph Wurst2016-04-192-4/+1
| | | | |
| * | | | remove deprecated jQuery.browserChristoph Wurst2016-04-191-4/+8
| | | | |
* | | | | Merge pull request #23980 from ↵Jan-Christoph Borchardt2016-04-204-70/+186
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | owncloud/remember-email-when-setting-expirationdate remember email when setting expiration date
| * | | | | extract mail view for sending share invitationsChristoph Wurst2016-04-194-70/+186
| |/ / / / | | | | | | | | | | | | | | | fixes #22947
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-2012-0/+48
| | | | |
* | | | | Merge pull request #24062 from owncloud/fix-gitignoreThomas Müller2016-04-195-80/+3
|\ \ \ \ \ | | | | | | | | | | | | Fix gitignore for core/vendor
| * | | | | remove unneeded filesMorris Jobke2016-04-184-79/+0
| | | | | |
| * | | | | Fix gitignore for core/vendorMorris Jobke2016-04-181-1/+3
| | |_|/ / | |/| | | | | | | | | | | | | * es6-promise and davclient.js
* | | | | Merge pull request #24054 from owncloud/data_fingerprintRoeland Douma2016-04-192-0/+54
|\ \ \ \ \ | |_|/ / / |/| | | | Add data-fingerprint property
| * | | | Add occ command for updating the data-fingerprintRoeland Jago Douma2016-04-182-0/+54
| |/ / /
* | | | Merge pull request #23993 from owncloud/update-to-jquery2Thomas Müller2016-04-1914-5255/+4885
|\ \ \ \ | | | | | | | | | | Update jquery to version 2.2.3
| * | | | Turn off jQuery animations when testingChristoph Wurst2016-04-181-0/+2
| | | | |
| * | | | downgrade jquery, update jquery-migrateChristoph Wurst2016-04-1510-3079/+2673
| | | | |
| * | | | add jquery files to gitChristoph Wurst2016-04-144-1/+9848
| | | | |
| * | | | update jquery to version 2.2.3Christoph Wurst2016-04-146-9829/+16
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-1980-80/+2
| | | | |
* | | | | Merge pull request #24049 from owncloud/skjnldsv-fix-colors-valuesThomas Müller2016-04-191-1/+7
|\ \ \ \ \ | | | | | | | | | | | | Fix rgb values
| * | | | | Fix rgb valuesJohn Molakvoæ2016-04-181-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix was required because values was too big for rgb and breaking the brightness calculation. Now we have the initial sat (70%) and the reduction to 60 if too bright working again.
* | | | | | Move logout to controllerLukas Reschke2016-04-183-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | Testable code. Yay.