summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixes #8326: deletion of directories on S3Johan Björk2014-07-081-17/+12
|
* Merge pull request #9515 from owncloud/update-sharecleanupfixVincent Petry2014-07-082-10/+24
|\ | | | | Fix update cleanup to only affect file and folders
| * Fix update cleanup to only affect file and foldersVincent Petry2014-07-082-10/+24
| | | | | | | | | | | | Fix bug in the SQL query that cleans up stray shares for removed files/folders, which is now correctly limited to that item type instead of also removing all other share types.
* | 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...
| * | Upload abortion is now detected within the OC_Connector_Sabre_File::put()Thomas Müller2014-07-086-211/+60
| |/ | | | | | | | | | | OC_Connector_Sabre_AbortedUploadDetectionPlugin is pointless Adding unit test testUploadAbort()
* | Merge pull request #9412 from owncloud/public-api-activityThomas Müller2014-07-085-2/+589
|\ \ | | | | | | Public api activity
| * | Adding new interface \OCP\Activity\IExtentsionThomas Müller2014-07-085-2/+589
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding method getNotificationTypes() Adding method filterNotificationTypes() Adding method getDefaultTypes() Adding method translate() and getTypeIcon() Adding method getGroupParameter() Adding method getNavigation() Adding method getNavigation() Adding method isFilterValid() and getQueryForFilter() Adding unit tests for \OC\ActivityManager
* | | port of #9500Arthur Schiwon2014-07-086-161/+536
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | don't trigger update from checkPassword, it is already called by userExists, this is enough. do not write to database when the value is the same add test cases. also split test classes in a file each, looks like only the first class is being executed also appconfig shall not write to database if the value is unchanged
* | | 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_bin
| * | | Add repair step to set MySQL collation to utf8_binRobin Appelman2014-07-085-2/+152
| | | | | | | | | | | | | | | | | | | | Set default collation of mysql connection to utf8_bin Set utf_bin as default collation for new tables
* | | | 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 storage
| * | | Fix Signiture Does Not Match when mounting Amazon S3 external storageChristopher T. Johnson2014-07-081-13/+17
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason the aws-sdk-php package does not caclulate the signiture correctly when accessing an object in a bucket with a name of '.'. When we are at the top of a S3 bucket there is a need(?) to have a directory name. Per standard Unix the name picked was '.' (dot or period). This choice exercises the aws-sdk bug. This fix is to add a field to the method to store the name to use instead of '.' which at this point is hard coded to '<root>'. We also add a private function 'cleanKey()' which will test for the '.' name and replace it with the variable. Finally all calls to manipulate objects where the path is not obviously not '.' are processed through cleanKey(). An example where we don't process through clean key would be 'Key' => $path.'/', Use correct relationship operator Per feed back use === instead of == use '/' instead of '<root>'
* | | 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
| * 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 ...
| * | When changing the mountpoint of an external storage, ensure the old one is ↵Robin Appelman2014-07-073-8/+21
| | | | | | | | | | | | removed
* | | Merge pull request #9505 from stephane84/fix-9497Vincent Petry2014-07-071-0/+1
|\ \ \ | |_|/ |/| | Refocus input field after user creation
| * | 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 list
| * | | Do not show recipient for link shares in file listVincent Petry2014-07-072-1/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the "Shared with link" section, the share_with field can contain a value when a password was set. This fix prevents this value to be shown as it is not intended for the end user.
* | | | Merge pull request #9502 from owncloud/add_ocsidsMorris Jobke2014-07-0715-7/+17
|\ \ \ \ | | | | | | | | | | Add ocsids for shipped apps in core repo
| * | | | 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 dialog
| * | | | Improved external share dialogVincent Petry2014-07-071-4/+31
| | | | | | | | | | | | | | | | | | | | | | | | | Changed title, label and buttons. Removed icon.
| * | | | Fixed dialogs styling, reversed buttonsVincent Petry2014-07-073-22/+38
| |/ / / | | | | | | | | | | | | Default dialog button is now on the right, other one on the left.
* | | | Merge pull request #9494 from owncloud/issue/9490Morris Jobke2014-07-073-8/+16
|\ \ \ \ | | | | | | | | | | [issues/9490] \OC::$WEBROOT is invalid when called from cron.php
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If not we are most likely in CLI mode. However to be able to still generate valid URLs, we need to use the overwrite webroot instead. Fix #9490
| * | | | Only overwrite serverHost when in unit testsJoas Schilling2014-07-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | The intention of the original commit 12f7cb87679453fa96c796df857b7e7193d4ee09 was to fix tests. But cron should always return a valid host not localhost.
* | | | | Merge pull request #9501 from owncloud/shares-listsortMorris Jobke2014-07-071-3/+2
|\ \ \ \ \ | |_|/ / / |/| | | | Fixed shared list sorting
| * | | | Fixed shared list sortingVincent Petry2014-07-071-3/+2
|/ / / / | | | | | | | | | | | | | | | | Use Array.sort instead of underscore's sortBy() as they don't use the same method/function signature.
* | | | Merge pull request #9492 from owncloud/repait-innodb-masterThomas Müller2014-07-073-0/+117
|\ \ \ \ | |_|_|/ |/| | | MySQL: adding repair step to convert MyIsam tables to InnoDB
| * | | 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 #9063
| * | | | 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
|\ \ \ \ | |_|/ / |/| | | Log table design glitch in date field
| * | | Bug 9147 owncloud/coreStephane V2014-07-061-0/+1
| | |/ | |/| | | | | | | Added class="date" in the latest column of the log table to get everything on one line (in the ajax request).
* | | Merge pull request #9468 from owncloud/fix_logout_error_messagesVincent Petry2014-07-071-1/+4
|\ \ \ | |_|/ |/| | better validation: cadd extra check if appinfo/info.xml exists
| * | 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 button
| * | | improvements for uninstall buttonGeorg Ehrke2014-07-052-7/+7
| |/ /
* | | Revert "fix version number - @karlitschek ;)"Morris Jobke2014-07-061-1/+1
| | | | | | | | | | | | This reverts commit f1b3e03f7fdb6272bbc4320d75b8bb0df4a05557.
* | | Merge pull request #9453 from owncloud/enc_fix_wrong_file_sizeFrank Karlitschek2014-07-062-6/+10
|\ \ \ | |_|/ |/| | [encryption] always take unencrypted size
| * | improved unit testsBjoern Schiessle2014-07-041-4/+8
| | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-10 18:53:02 +0000