Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #9515 from owncloud/update-sharecleanupfix | Vincent Petry | 2014-07-08 | 2 | -10/+24 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix update cleanup to only affect file and folders | Vincent Petry | 2014-07-08 | 2 | -10/+24 | |
* | | | | | | | Merge pull request #9507 from owncloud/fix-9302-master | Thomas Müller | 2014-07-08 | 6 | -211/+60 | |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | ||||||
| * | | | | | | Upload abortion is now detected within the OC_Connector_Sabre_File::put() | Thomas Müller | 2014-07-08 | 6 | -211/+60 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #9412 from owncloud/public-api-activity | Thomas Müller | 2014-07-08 | 5 | -2/+589 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Adding new interface \OCP\Activity\IExtentsion | Thomas Müller | 2014-07-08 | 5 | -2/+589 | |
* | | | | | | | port of #9500 | Arthur Schiwon | 2014-07-08 | 6 | -161/+536 | |
* | | | | | | | use case insensitive LIKE when searching for files in mysql | Robin Appelman | 2014-07-08 | 1 | -0/+2 | |
| |_|_|_|_|/ |/| | | | | | ||||||
* | | | | | | Merge pull request #9504 from owncloud/repair-collation | Thomas Müller | 2014-07-08 | 5 | -2/+152 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Add repair step to set MySQL collation to utf8_bin | Robin Appelman | 2014-07-08 | 5 | -2/+152 | |
| | |_|_|/ / | |/| | | | | ||||||
* | | | | | | Merge pull request #9509 from owncloud/ctjctj-fix_amazons3 | Thomas Müller | 2014-07-08 | 1 | -13/+17 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Fix Signiture Does Not Match when mounting Amazon S3 external storage | Christopher T. Johnson | 2014-07-08 | 1 | -13/+17 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Ignore core/js/jquery.placeholder.js | Thomas Müller | 2014-07-08 | 1 | -0/+1 | |
* | | | | | Ignore core/js/snap.js | Thomas Müller | 2014-07-08 | 1 | -0/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #9506 from owncloud/fix-fielset-legends | Jan-Christoph Borchardt | 2014-07-08 | 1 | -3/+3 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | specify CSS rule for warning & update fieldsets - fixes #9491 | Morris Jobke | 2014-07-07 | 1 | -3/+3 | |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-08 | 208 | -1589/+2793 | |
* | | | | Merge pull request #9495 from owncloud/remove-moved-mount | Vincent Petry | 2014-07-07 | 3 | -8/+21 | |
|\ \ \ \ | ||||||
| * | | | | When changing the mountpoint of an external storage, ensure the old one is re... | Robin Appelman | 2014-07-07 | 3 | -8/+21 | |
| | |_|/ | |/| | | ||||||
* | | | | Merge pull request #9505 from stephane84/fix-9497 | Vincent Petry | 2014-07-07 | 1 | -0/+1 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | Fixes #9497 | Stephane V | 2014-07-07 | 1 | -0/+1 | |
* | | | | Merge pull request #9499 from owncloud/shares-hidetokenrecipient | Morris Jobke | 2014-07-07 | 2 | -1/+45 | |
|\ \ \ \ | ||||||
| * | | | | Do not show recipient for link shares in file list | Vincent Petry | 2014-07-07 | 2 | -1/+45 | |
* | | | | | Merge pull request #9502 from owncloud/add_ocsids | Morris Jobke | 2014-07-07 | 15 | -7/+17 | |
|\ \ \ \ \ | ||||||
| * | | | | | add ocsids to info.xml | Georg Ehrke | 2014-07-07 | 15 | -7/+17 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #9415 from owncloud/external-sharedialog | Morris Jobke | 2014-07-07 | 4 | -26/+69 | |
|\ \ \ \ \ | ||||||
| * | | | | | Improved external share dialog | Vincent Petry | 2014-07-07 | 1 | -4/+31 | |
| * | | | | | Fixed dialogs styling, reversed buttons | Vincent Petry | 2014-07-07 | 3 | -22/+38 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #9494 from owncloud/issue/9490 | Morris Jobke | 2014-07-07 | 3 | -8/+16 | |
|\ \ \ \ \ | ||||||
| * | | | | | Add comment to overwrite* configs about CLI/cron problems | Joas Schilling | 2014-07-07 | 1 | -4/+4 | |
| * | | | | | Only calculate the WEBROOT from scriptName if it contains $SUBURI | Joas Schilling | 2014-07-07 | 1 | -3/+11 | |
| * | | | | | Only overwrite serverHost when in unit tests | Joas Schilling | 2014-07-07 | 1 | -1/+1 | |
* | | | | | | Merge pull request #9501 from owncloud/shares-listsort | Morris Jobke | 2014-07-07 | 1 | -3/+2 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | Fixed shared list sorting | Vincent Petry | 2014-07-07 | 1 | -3/+2 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #9492 from owncloud/repait-innodb-master | Thomas Müller | 2014-07-07 | 3 | -0/+117 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | ||||||
| * | | | | MySQL: adding repair step to convert MyIsam tables to InnoDB | Thomas Müller | 2014-07-07 | 3 | -0/+117 | |
* | | | | | Merge pull request #9488 from owncloud/fix-ctrl-click-app | Jan-Christoph Borchardt | 2014-07-07 | 1 | -1/+3 | |
|\ \ \ \ \ | ||||||
| * | | | | | fix loading spinner on ctrl click a app entry- fixes #9063 | Morris Jobke | 2014-07-07 | 1 | -1/+3 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge pull request #9479 from stephane84/fix-9147 | Morris Jobke | 2014-07-07 | 1 | -0/+1 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Bug 9147 owncloud/core | Stephane V | 2014-07-06 | 1 | -0/+1 | |
| | |/ / | |/| | | ||||||
* | | | | Merge pull request #9468 from owncloud/fix_logout_error_messages | Vincent Petry | 2014-07-07 | 1 | -1/+4 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | fix phpDocBlock for OC_App::getAppInfo | Georg Ehrke | 2014-07-05 | 1 | -1/+1 | |
| * | | | better validation: cadd extra check if appinfo/info.xml exists | Georg Ehrke | 2014-07-05 | 1 | -0/+3 | |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-07 | 23 | -37/+46 | |
* | | | | Merge pull request #9469 from owncloud/replace_uninstall_button_with_link | Morris Jobke | 2014-07-06 | 2 | -7/+7 | |
|\ \ \ \ | ||||||
| * | | | | improvements for uninstall button | Georg Ehrke | 2014-07-05 | 2 | -7/+7 | |
| |/ / / | ||||||
* | | | | Revert "fix version number - @karlitschek ;)" | Morris Jobke | 2014-07-06 | 1 | -1/+1 | |
* | | | | Merge pull request #9453 from owncloud/enc_fix_wrong_file_size | Frank Karlitschek | 2014-07-06 | 2 | -6/+10 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | improved unit tests | Bjoern Schiessle | 2014-07-04 | 1 | -4/+8 | |
| * | | | always take unencrypted size | Bjoern Schiessle | 2014-07-04 | 1 | -2/+2 |