summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* [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
|\
| * always share with same default permissions, no special handling for remote sh...Björn Schießle2016-04-201-15/+11
| * 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
|\ \
| * | 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
|\ \ \ | |/ / |/| |
| * | 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"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 - 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 requestsChristoph Wurst2016-04-182-4/+12
* | | | Merge pull request #24081 from owncloud/migrate-deprecated-jquery-v1-functionsThomas Müller2016-04-204-14/+15
|\ \ \ \ | |_|/ / |/| | |
| * | | 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 owncloud/remember-email-when-setting-expiratio...Jan-Christoph Borchardt2016-04-204-70/+186
|\ \ \ \
| * | | | extract mail view for sending share invitationsChristoph Wurst2016-04-194-70/+186
| |/ / /
* | | | [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
|\ \ \ \
| * | | | remove unneeded filesMorris Jobke2016-04-184-79/+0
| * | | | Fix gitignore for core/vendorMorris Jobke2016-04-181-1/+3
| | |_|/ | |/| |
* | | | Merge pull request #24054 from owncloud/data_fingerprintRoeland Douma2016-04-192-0/+54
|\ \ \ \ | |_|/ / |/| | |
| * | | 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
|\ \ \
| * | | 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 valuesJohn Molakvoæ2016-04-181-1/+7
* | | | | Move logout to controllerLukas Reschke2016-04-183-2/+26
* | | | | Merge pull request #23911 from owncloud/split-upgrade-commandChristoph Wurst2016-04-182-2/+0
|\ \ \ \ \
| * | | | | Move version check code out of class UpdaterThomas Müller2016-04-182-2/+0
| | |_|/ / | |/| | |
* / | | | Suggest cli based updater in case the instance is bigger - #23913Thomas Müller2016-04-182-1/+23
|/ / / /
* | | | Merge pull request #23947 from owncloud/login-to-ctrlLukas Reschke2016-04-184-2/+155
|\ \ \ \ | |/ / / |/| | |
| * | | Also check for an empty stringLukas Reschke2016-04-151-4/+4
| * | | Rename `username` to `loginName`Lukas Reschke2016-04-152-5/+5
| * | | Use !== instead of emptyLukas Reschke2016-04-151-4/+4
| * | | Move login form into controllerLukas Reschke2016-04-154-1/+154
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-172-0/+2
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-162-0/+4
|/ / /