summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge pull request #9515 from owncloud/update-sharecleanupfixVincent Petry2014-07-082-10/+24
|\ \ \ \ \ \
| * | | | | | Fix update cleanup to only affect file and foldersVincent Petry2014-07-082-10/+24
* | | | | | | Merge pull request #9507 from owncloud/fix-9302-masterThomas Müller2014-07-086-211/+60
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Upload abortion is now detected within the OC_Connector_Sabre_File::put()Thomas Müller2014-07-086-211/+60
| |/ / / / /
* | | | | | Merge pull request #9412 from owncloud/public-api-activityThomas Müller2014-07-085-2/+589
|\ \ \ \ \ \
| * | | | | | Adding new interface \OCP\Activity\IExtentsionThomas Müller2014-07-085-2/+589
* | | | | | | port of #9500Arthur Schiwon2014-07-086-161/+536
* | | | | | | use case insensitive LIKE when searching for files in mysqlRobin Appelman2014-07-081-0/+2
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge pull request #9504 from owncloud/repair-collationThomas Müller2014-07-085-2/+152
|\ \ \ \ \ \
| * | | | | | Add repair step to set MySQL collation to utf8_binRobin Appelman2014-07-085-2/+152
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #9509 from owncloud/ctjctj-fix_amazons3Thomas Müller2014-07-081-13/+17
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix Signiture Does Not Match when mounting Amazon S3 external storageChristopher T. Johnson2014-07-081-13/+17
| | |/ / / | |/| | |
* | | | | Ignore core/js/jquery.placeholder.jsThomas Müller2014-07-081-0/+1
* | | | | Ignore core/js/snap.jsThomas Müller2014-07-081-0/+1
|/ / / /
* | | | Merge pull request #9506 from owncloud/fix-fielset-legendsJan-Christoph Borchardt2014-07-081-3/+3
|\ \ \ \ | |/ / / |/| | |
| * | | specify CSS rule for warning & update fieldsets - fixes #9491Morris Jobke2014-07-071-3/+3
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-08208-1589/+2793
* | | | Merge pull request #9495 from owncloud/remove-moved-mountVincent Petry2014-07-073-8/+21
|\ \ \ \
| * | | | When changing the mountpoint of an external storage, ensure the old one is re...Robin Appelman2014-07-073-8/+21
| | |_|/ | |/| |
* | | | Merge pull request #9505 from stephane84/fix-9497Vincent Petry2014-07-071-0/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Fixes #9497Stephane V2014-07-071-0/+1
* | | | Merge pull request #9499 from owncloud/shares-hidetokenrecipientMorris Jobke2014-07-072-1/+45
|\ \ \ \
| * | | | Do not show recipient for link shares in file listVincent Petry2014-07-072-1/+45
* | | | | Merge pull request #9502 from owncloud/add_ocsidsMorris Jobke2014-07-0715-7/+17
|\ \ \ \ \
| * | | | | add ocsids to info.xmlGeorg Ehrke2014-07-0715-7/+17
| |/ / / /
* | | | | Merge pull request #9415 from owncloud/external-sharedialogMorris Jobke2014-07-074-26/+69
|\ \ \ \ \
| * | | | | Improved external share dialogVincent Petry2014-07-071-4/+31
| * | | | | Fixed dialogs styling, reversed buttonsVincent Petry2014-07-073-22/+38
| |/ / / /
* | | | | Merge pull request #9494 from owncloud/issue/9490Morris Jobke2014-07-073-8/+16
|\ \ \ \ \
| * | | | | Add comment to overwrite* configs about CLI/cron problemsJoas Schilling2014-07-071-4/+4
| * | | | | Only calculate the WEBROOT from scriptName if it contains $SUBURIJoas Schilling2014-07-071-3/+11
| * | | | | Only overwrite serverHost when in unit testsJoas Schilling2014-07-071-1/+1
* | | | | | Merge pull request #9501 from owncloud/shares-listsortMorris Jobke2014-07-071-3/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fixed shared list sortingVincent Petry2014-07-071-3/+2
|/ / / / /
* | | | | Merge pull request #9492 from owncloud/repait-innodb-masterThomas Müller2014-07-073-0/+117
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | MySQL: adding repair step to convert MyIsam tables to InnoDBThomas Müller2014-07-073-0/+117
* | | | | Merge pull request #9488 from owncloud/fix-ctrl-click-appJan-Christoph Borchardt2014-07-071-1/+3
|\ \ \ \ \
| * | | | | fix loading spinner on ctrl click a app entry- fixes #9063Morris Jobke2014-07-071-1/+3
| | |/ / / | |/| | |
* | | | | Merge pull request #9479 from stephane84/fix-9147Morris Jobke2014-07-071-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Bug 9147 owncloud/coreStephane V2014-07-061-0/+1
| | |/ / | |/| |
* | | | Merge pull request #9468 from owncloud/fix_logout_error_messagesVincent Petry2014-07-071-1/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | fix phpDocBlock for OC_App::getAppInfoGeorg Ehrke2014-07-051-1/+1
| * | | better validation: cadd extra check if appinfo/info.xml existsGeorg Ehrke2014-07-051-0/+3
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-0723-37/+46
* | | | Merge pull request #9469 from owncloud/replace_uninstall_button_with_linkMorris Jobke2014-07-062-7/+7
|\ \ \ \
| * | | | improvements for uninstall buttonGeorg Ehrke2014-07-052-7/+7
| |/ / /
* | | | Revert "fix version number - @karlitschek ;)"Morris Jobke2014-07-061-1/+1
* | | | Merge pull request #9453 from owncloud/enc_fix_wrong_file_sizeFrank Karlitschek2014-07-062-6/+10
|\ \ \ \ | |_|/ / |/| | |
| * | | improved unit testsBjoern Schiessle2014-07-041-4/+8
| * | | always take unencrypted sizeBjoern Schiessle2014-07-041-2/+2