summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix l10nMorris Jobke2016-06-2064-64/+64
|
* fix l10nMorris Jobke2016-06-2044-44/+44
|
* fix stringsMorris Jobke2016-06-204-4/+4
|
* Fix themes readmeMorris Jobke2016-06-201-3/+3
|
* Merge pull request #157 from nblock/dev/remove-old-contacts-tableMarius Blüm2016-06-201-0/+1
|\ | | | | Remove obsolete contacts_cards_properties table
| * Remove obsolete contacts_cards_properties tableFlorian Preinstorfer2016-06-191-0/+1
| | | | | | | | | | | | | | The table contacts_cards_properties was part of the contacts app until ownCloud 8.2. It got replaced with cards_properties (part of dav). See also: ownCloud/core #21889
* | Merge pull request #163 from nextcloud/loading-spinnerWilliam Bargent2016-06-201-4/+4
|\ \ | | | | | | make loading spinner thicker and color lighter
| * | make loading spinner thicker and color lighterJan-Christoph Borchardt2016-06-201-4/+4
|/ /
* | Merge pull request #160 from nextcloud/rename_in_appsMorris Jobke2016-06-2061-61/+61
|\ \ | |/ |/| rename owncloud to nextcloud in Official apps button popup
| * fix translationsMorris Jobke2016-06-2060-60/+60
| |
| * rename owncloud to nextcloud in Official apps button popupTimo Witte2016-06-201-1/+1
|/
* Merge pull request #156 from nblock/dev/remove-old-gallery-tablesMarius Blüm2016-06-191-1/+3
|\ | | | | Drop obsolete tables: gallery_albums and gallery_photos
| * Drop obsolete tables: gallery_albums and gallery_photosFlorian Preinstorfer2016-06-191-1/+3
|/ | | | | Commit 34a21a63ce5730a4f45af6745b4acd6f702e6e79 renamed gallery_albums to pictures_images_cache and removed gallery_photos entirely.
* Merge pull request #133 from hailthemelody/masterMorris Jobke2016-06-161-2/+2
|\ | | | | revise updater.server.url to reflect nextcloud.org URL
| * revise updater.server.url to reflect nextcloud.org URL, also it's comment=2016-06-161-2/+2
| |
* | Merge pull request #131 from nextcloud/approved-colorMorris Jobke2016-06-161-1/+1
|\ \ | | | | | | Use blue as approved color in app management
| * | Use blue as approved color in app managementMorris Jobke2016-06-161-1/+1
|/ / | | | | | | * only changing the color - based on #53
* | Merge pull request #125 from nextcloud/fix-jsunitMorris Jobke2016-06-161-4/+2
|\ \ | | | | | | Fix failing JS unit tests
| * | Fix failing JS unit testsMorris Jobke2016-06-161-4/+2
|/ / | | | | | | * fixes #124
* | Merge pull request #112 from nextcloud/drop-useless-ie8-stuffblizzz2016-06-152-14/+0
|\ \ | | | | | | Drop useless IE8 rules
| * | Drop useless IE8 rulesMorris Jobke2016-06-152-14/+0
| |/
* | Merge pull request #83 from nextcloud/file-drop-highlightMarius Blüm2016-06-156-89/+281
|\ \ | | | | | | File drop highlight
| * | store icons in classVincent Chan2016-06-153-6/+9
| | |
| * | fixes responsive/mobile viewVincent Chan2016-06-152-5/+9
| | |
| * | dragging over folder will highlight folder onlyVincent Chan2016-06-152-0/+11
| | |
| * | restrict dropZone to app-content divVincent Chan2016-06-151-1/+1
| | |
| * | change folder icon when dragging over a directoryVincent Chan2016-06-153-4/+17
| | |
| * | properly fix folder upload to use delegatedEventVincent Chan2016-06-142-4/+12
| | |
| * | fixes direct upload to folderVincent Chan2016-06-141-5/+1
| | |
| * | adds visual indication for file drag and dropVincent Chan2016-06-132-2/+15
| | |
| * | update jQuery File Upload Plugin (9.12.5) to support dragleaveVincent Chan2016-06-131-84/+228
| | |
* | | Merge pull request #111 from nextcloud/strengthify-updateMarius Blüm2016-06-1510-130/+213
|\ \ \ | | | | | | | | Fix strengthify issues
| * | | fix strengthify in personal settingsMorris Jobke2016-06-153-4/+4
| | | |
| * | | fix setup page strengthifyMorris Jobke2016-06-154-10/+4
| | | | | | | | | | | | | | | | * fixes #105
| * | | Update strengthify to 0.5.1Morris Jobke2016-06-153-116/+205
| | |/ | |/|
* | | Merge pull request #113 from nextcloud/fix-more-buttonMarius Blüm2016-06-151-7/+7
|\ \ \ | |/ / |/| | fix padding of 3-dot button on mobile
| * | fix padding of 3-dot button on mobileJan-Christoph Borchardt2016-06-151-7/+7
| |/
* | Merge pull request #94 from nextcloud/ci-integration-testsMorris Jobke2016-06-153-0/+18
|\ \ | | | | | | Add integration tests
| * | Remove duplicate data folderLukas Reschke2016-06-151-1/+1
| | |
| * | add temporary cleanup step for CIMorris Jobke2016-06-141-0/+1
| | |
| * | fix integration tests for new admin_audit appMorris Jobke2016-06-141-0/+1
| | |
| * | Add integration testsMorris Jobke2016-06-142-0/+16
| | |
* | | Merge pull request #97 from nextcloud/update-message-fixMarius Blüm2016-06-147-14/+14
|\ \ \ | |/ / |/| | Change name of the product in update message
| * | Change name of the product in update messageMorris Jobke2016-06-147-14/+14
|/ / | | | | | | | | * also update all german translations * fixes #96
* | Merge pull request #90 from nextcloud/improved-autotestBjörn Schießle2016-06-141-2/+11
|\ \ | | | | | | allow to execute multiple tests in a directory at once
| * | allow to execute multiple tests in a directory at onceBjoern Schiessle2016-06-141-2/+11
| |/
* | Merge pull request #85 from nextcloud/downstream-160614Marius Blüm2016-06-1468-26/+218
|\ \ | | | | | | Downstream 16-06-14
| * \ Merge branch 'master' of https://github.com/owncloud/core into downstream-160614Arthur Schiwon2016-06-1468-26/+218
| |\ \
| | * | Use proper namespaces - fixes #25078 (#25079)Thomas Müller2016-06-131-1/+2
| | | |
| | * | [tx-robot] updated from transifexJenkins for ownCloud2016-06-1364-20/+188
| | | |