summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #9065 from owncloud/migrator-keepprimaryindexnameVincent Petry2014-06-172-1/+28
|\
| * Added unit test for checkMigrate with primary key + autoincVincent Petry2014-06-171-0/+21
| * Do not rename primary key index when renaming tableVincent Petry2014-06-171-1/+7
* | Merge pull request #9067 from owncloud/pass-db-hostnameVincent Petry2014-06-171-1/+1
|\ \
| * | We obviously have to pass the hostname as is when there is no ':' in the host...Andreas Fischer2014-06-171-1/+1
* | | Merge pull request #9029 from owncloud/table-to-paragraph-layout-for-shareBjörn Schießle2014-06-173-56/+49
|\ \ \ | |/ / |/| |
| * | Migrate table layout to p layout for share settingsMorris Jobke2014-06-173-56/+49
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2014-06-17306-10008/+12300
* | Merge pull request #9059 from owncloud/simplify-warning-layoutVolkan Gezer2014-06-161-2/+4
|\ \
| * | simplify security warning on admin pageMorris Jobke2014-06-161-2/+4
* | | That file was accidentally commited. Partially revert https://github.com/ownc...Lukas Reschke2014-06-161-3/+0
* | | Add deprecation notice to load* functionsLukas Reschke2014-06-162-2/+9
* | | Merge pull request #9053 from owncloud/small_ux_improvementMorris Jobke2014-06-161-1/+2
|\ \ \
| * | | show explenation only if the setting is activatedBjoern Schiessle2014-06-161-1/+2
* | | | Merge pull request #9055 from owncloud/add_new_keynote_mimetypeMorris Jobke2014-06-161-0/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | add new keynote mimetypeJörn Friedrich Dreyer2014-06-161-0/+1
* | | | Merge pull request #9049 from owncloud/fix-upload-buttonVolkan Gezer2014-06-163-8/+12
|\ \ \ \ | |/ / / |/| | |
| * | | fix CSS for upload button - fixes #8939Morris Jobke2014-06-163-8/+12
| | |/ | |/|
* | | Merge pull request #8808 from owncloud/update_shipped_apps_from_appstoreGeorg Ehrke2014-06-1614-207/+599
|\ \ \ | |_|/ |/| |
| * | disable code check for shipped appsGeorg Ehrke2014-06-161-1/+1
| * | don't skip code check for skipped appsGeorg Ehrke2014-06-131-1/+1
| * | skip certain tests for shipped appsGeorg Ehrke2014-06-132-7/+14
| * | Update preseed-config.phpGeorg Ehrke2014-06-131-1/+1
| * | don't show update button when appstore is disabled or no writable dir existsGeorg Ehrke2014-06-101-0/+15
| * | fix php doc blockGeorg Ehrke2014-06-101-0/+2
| * | always return a bool in OC_App::updateAppGeorg Ehrke2014-06-101-1/+1
| * | fix php doc blockGeorg Ehrke2014-06-101-3/+1
| * | remove unnecessary @returnGeorg Ehrke2014-06-101-1/+0
| * | some additional type checksGeorg Ehrke2014-06-062-3/+3
| * | add additional type checkGeorg Ehrke2014-06-061-1/+1
| * | Merge branch 'master' into update_shipped_apps_from_appstoreGeorg Ehrke2014-06-051588-76651/+58886
| |\ \
| * | | reenable checkCode()Thomas Müller2014-06-051-1/+0
| * | | fix unit testsThomas Müller2014-06-051-9/+15
| * | | remove not needed unlink in installer testGeorg Ehrke2014-06-041-3/+0
| * | | add unit testGeorg Ehrke2014-06-045-17/+100
| * | | update autoloaderGeorg Ehrke2014-06-041-6/+5
| * | | remove console.log in apps.jsGeorg Ehrke2014-06-041-1/+0
| * | | use isset() instead of array_key_exists()Georg Ehrke2014-06-031-1/+1
| * | | various fixes as requested by pr reviewersGeorg Ehrke2014-06-025-28/+22
| * | | read ocsid from shipped apps on installGeorg Ehrke2014-05-311-0/+3
| * | | Merge branch 'master' into update_shipped_apps_from_appstoreGeorg Ehrke2014-05-311-3/+3
| |\ \ \
| * | | | add button for properly uninstalling appsGeorg Ehrke2014-05-315-11/+48
| * | | | Merge branch 'master' into update_shipped_apps_from_appstoreGeorg Ehrke2014-05-311948-48418/+116556
| |\ \ \ \
| * | | | | make it possible to update shipped apps via the appstoreGeorg Ehrke2014-05-316-183/+438
* | | | | | Merge pull request #9048 from owncloud/fix_9041Morris Jobke2014-06-161-2/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | styleArthur Schiwon2014-06-161-2/+2
| * | | | | escape before output, fixes #9041Arthur Schiwon2014-06-161-1/+1
|/ / / / /
* | | | | Merge pull request #9040 from owncloud/fix-xssMorris Jobke2014-06-162-6/+6
|\ \ \ \ \
| * | | | | Do even more sanitizationLukas Reschke2014-06-141-5/+5
| * | | | | Sanitize name of shareeLukas Reschke2014-06-141-1/+1