Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #9065 from owncloud/migrator-keepprimaryindexname | Vincent Petry | 2014-06-17 | 2 | -1/+28 |
|\ | |||||
| * | Added unit test for checkMigrate with primary key + autoinc | Vincent Petry | 2014-06-17 | 1 | -0/+21 |
| * | Do not rename primary key index when renaming table | Vincent Petry | 2014-06-17 | 1 | -1/+7 |
* | | Merge pull request #9067 from owncloud/pass-db-hostname | Vincent Petry | 2014-06-17 | 1 | -1/+1 |
|\ \ | |||||
| * | | We obviously have to pass the hostname as is when there is no ':' in the host... | Andreas Fischer | 2014-06-17 | 1 | -1/+1 |
* | | | Merge pull request #9029 from owncloud/table-to-paragraph-layout-for-share | Björn Schießle | 2014-06-17 | 3 | -56/+49 |
|\ \ \ | |/ / |/| | | |||||
| * | | Migrate table layout to p layout for share settings | Morris Jobke | 2014-06-17 | 3 | -56/+49 |
|/ / | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-17 | 306 | -10008/+12300 |
* | | Merge pull request #9059 from owncloud/simplify-warning-layout | Volkan Gezer | 2014-06-16 | 1 | -2/+4 |
|\ \ | |||||
| * | | simplify security warning on admin page | Morris Jobke | 2014-06-16 | 1 | -2/+4 |
* | | | That file was accidentally commited. Partially revert https://github.com/ownc... | Lukas Reschke | 2014-06-16 | 1 | -3/+0 |
* | | | Add deprecation notice to load* functions | Lukas Reschke | 2014-06-16 | 2 | -2/+9 |
* | | | Merge pull request #9053 from owncloud/small_ux_improvement | Morris Jobke | 2014-06-16 | 1 | -1/+2 |
|\ \ \ | |||||
| * | | | show explenation only if the setting is activated | Bjoern Schiessle | 2014-06-16 | 1 | -1/+2 |
* | | | | Merge pull request #9055 from owncloud/add_new_keynote_mimetype | Morris Jobke | 2014-06-16 | 1 | -0/+1 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | add new keynote mimetype | Jörn Friedrich Dreyer | 2014-06-16 | 1 | -0/+1 |
* | | | | Merge pull request #9049 from owncloud/fix-upload-button | Volkan Gezer | 2014-06-16 | 3 | -8/+12 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | fix CSS for upload button - fixes #8939 | Morris Jobke | 2014-06-16 | 3 | -8/+12 |
| | |/ | |/| | |||||
* | | | Merge pull request #8808 from owncloud/update_shipped_apps_from_appstore | Georg Ehrke | 2014-06-16 | 14 | -207/+599 |
|\ \ \ | |_|/ |/| | | |||||
| * | | disable code check for shipped apps | Georg Ehrke | 2014-06-16 | 1 | -1/+1 |
| * | | don't skip code check for skipped apps | Georg Ehrke | 2014-06-13 | 1 | -1/+1 |
| * | | skip certain tests for shipped apps | Georg Ehrke | 2014-06-13 | 2 | -7/+14 |
| * | | Update preseed-config.php | Georg Ehrke | 2014-06-13 | 1 | -1/+1 |
| * | | don't show update button when appstore is disabled or no writable dir exists | Georg Ehrke | 2014-06-10 | 1 | -0/+15 |
| * | | fix php doc block | Georg Ehrke | 2014-06-10 | 1 | -0/+2 |
| * | | always return a bool in OC_App::updateApp | Georg Ehrke | 2014-06-10 | 1 | -1/+1 |
| * | | fix php doc block | Georg Ehrke | 2014-06-10 | 1 | -3/+1 |
| * | | remove unnecessary @return | Georg Ehrke | 2014-06-10 | 1 | -1/+0 |
| * | | some additional type checks | Georg Ehrke | 2014-06-06 | 2 | -3/+3 |
| * | | add additional type check | Georg Ehrke | 2014-06-06 | 1 | -1/+1 |
| * | | Merge branch 'master' into update_shipped_apps_from_appstore | Georg Ehrke | 2014-06-05 | 1588 | -76651/+58886 |
| |\ \ | |||||
| * | | | reenable checkCode() | Thomas Müller | 2014-06-05 | 1 | -1/+0 |
| * | | | fix unit tests | Thomas Müller | 2014-06-05 | 1 | -9/+15 |
| * | | | remove not needed unlink in installer test | Georg Ehrke | 2014-06-04 | 1 | -3/+0 |
| * | | | add unit test | Georg Ehrke | 2014-06-04 | 5 | -17/+100 |
| * | | | update autoloader | Georg Ehrke | 2014-06-04 | 1 | -6/+5 |
| * | | | remove console.log in apps.js | Georg Ehrke | 2014-06-04 | 1 | -1/+0 |
| * | | | use isset() instead of array_key_exists() | Georg Ehrke | 2014-06-03 | 1 | -1/+1 |
| * | | | various fixes as requested by pr reviewers | Georg Ehrke | 2014-06-02 | 5 | -28/+22 |
| * | | | read ocsid from shipped apps on install | Georg Ehrke | 2014-05-31 | 1 | -0/+3 |
| * | | | Merge branch 'master' into update_shipped_apps_from_appstore | Georg Ehrke | 2014-05-31 | 1 | -3/+3 |
| |\ \ \ | |||||
| * | | | | add button for properly uninstalling apps | Georg Ehrke | 2014-05-31 | 5 | -11/+48 |
| * | | | | Merge branch 'master' into update_shipped_apps_from_appstore | Georg Ehrke | 2014-05-31 | 1948 | -48418/+116556 |
| |\ \ \ \ | |||||
| * | | | | | make it possible to update shipped apps via the appstore | Georg Ehrke | 2014-05-31 | 6 | -183/+438 |
* | | | | | | Merge pull request #9048 from owncloud/fix_9041 | Morris Jobke | 2014-06-16 | 1 | -2/+2 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | style | Arthur Schiwon | 2014-06-16 | 1 | -2/+2 |
| * | | | | | escape before output, fixes #9041 | Arthur Schiwon | 2014-06-16 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #9040 from owncloud/fix-xss | Morris Jobke | 2014-06-16 | 2 | -6/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Do even more sanitization | Lukas Reschke | 2014-06-14 | 1 | -5/+5 |
| * | | | | | Sanitize name of sharee | Lukas Reschke | 2014-06-14 | 1 | -1/+1 |