summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-07-1241-262/+357
|
* Merge pull request #9597 from owncloud/enc-removelegacytestsThomas Müller2014-07-111-0/+4
|\ | | | | Disable legacy encryption tests
| * Disable legacy encryption testsVincent Petry2014-07-111-0/+4
|/ | | | | It seems these tests are not needed any more, but will now be skipped instead until the case is cleared out.
* Merge pull request #9569 from owncloud/fix-require-of-blowfish-masterMorris Jobke2014-07-102-2/+0
|\ | | | | [OC8] remove pointless require of Blowfish.php
| * remove pointless require of Blowfish.phpThomas Müller2014-07-102-2/+0
|/
* Merge pull request #9538 from owncloud/fileactions-cleanupVincent Petry2014-07-107-43/+137
|\ | | | | Propagate file action changes to the file lists
| * Propagate file action changes to the file listsVincent Petry2014-07-097-43/+137
| | | | | | | | | | | | | | | | | | Whenever an app needs to register an event late, it does that on the original file actions object. Since the file actions that the file list work on is a merged list, not the original one, the registration event needs to be propagated there as well.
* | Merge pull request #9525 from owncloud/incrementuser2Vincent Petry2014-07-104-37/+109
|\ \ | | | | | | increment/decrement group and user counts when necessary
| * | use .filterAttr()Thomas Müller2014-07-091-4/+4
| | |
| * | use .filterAttr()Thomas Müller2014-07-091-7/+8
| | |
| * | some more cleanupThomas Müller2014-07-091-38/+36
| | |
| * | magic strings - bad kungfuThomas Müller2014-07-091-0/+3
| | |
| * | remove the group in case the last user has removed from that groupThomas Müller2014-07-091-0/+12
| | |
| * | fixing JS synatx errorsThomas Müller2014-07-092-5/+5
| | |
| * | avoid global selectorArthur Schiwon2014-07-091-1/+1
| | |
| * | increase/decrease everyone count on user creation/deletionArthur Schiwon2014-07-093-8/+42
| | |
| * | decrease user count in affected groups after user deleteArthur Schiwon2014-07-091-0/+14
| | |
| * | increment group counters when a user is createdArthur Schiwon2014-07-093-3/+13
| | |
* | | Merge pull request #9536 from owncloud/default-app-groups-masterMorris Jobke2014-07-101-97/+97
|\ \ \ | | | | | | | | Default app groups master
| * | | adding 'groups' entry to remote appsThomas Müller2014-07-091-1/+2
| | | |
| * | | fixing typosThomas Müller2014-07-091-97/+96
| | | |
* | | | Merge pull request #9516 from owncloud/kill-legacy-encryption-oc8Vincent Petry2014-07-109-881/+3
|\ \ \ \ | | | | | | | | | | [OC8] Kill legacy encryption migration
| * | | | Kill legacy encryption migrationThomas Müller2014-07-089-881/+3
| | | | |
* | | | | Merge pull request #9519 from owncloud/search-bounceVincent Petry2014-07-101-2/+2
|\ \ \ \ \ | | | | | | | | | | | | debounce the search function
| * | | | | debounce the search functionRobin Appelman2014-07-081-2/+2
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-10173-829/+859
| | | | | |
* | | | | | Merge pull request #9460 from owncloud/versions-localVincent Petry2014-07-101-5/+4
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Dont assume local home storage for files_version
| * | | | | Dont delete versions as local filesRobin Appelman2014-07-071-5/+4
| | | | | |
* | | | | | Merge pull request #9534 from owncloud/fix-9532-masterThomas Müller2014-07-091-233/+0
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | De-double class name
| * | | | | test class is already in preferences.phpArthur Schiwon2014-07-091-233/+0
| | | | | |
| * | | | | De-double class nameThomas Müller2014-07-091-1/+1
|/ / / / /
* | | | | Merge pull request #9510 from libasys/patch-1Thomas Müller2014-07-091-1/+1
|\ \ \ \ \ | | | | | | | | | | | | BugFix missing $item on 'file_target' Line 1911
| * | | | | BugFix missing $item on 'file_target' Line 1911libasys2014-07-081-1/+1
| | |_|/ / | |/| | | | | | | | I think this should be right!
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-09462-3876/+3964
| | | | |
* | | | | Merge pull request #9528 from owncloud/fix-apostropThomas Müller2014-07-091-1/+1
|\ \ \ \ \ | | | | | | | | | | | | fix apostrophe fixes #9486
| * | | | | fix apostrophe fixes #9486Volkan Gezer2014-07-081-1/+1
|/ / / / /
* | | | | Merge pull request #9385 from owncloud/fix-7052blizzz2014-07-088-44/+516
|\ \ \ \ \ | | | | | | | | | | | | support for AD primary groups
| * | | | | support for AD primary groupsArthur Schiwon2014-07-088-44/+516
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support for primary groups actually the problem is only known on AD, it is only needed to take care of their attributes adjust to ADs special behaviour this change was not intended cache the SID value so it is not requested over and over again theres only one, use singular we are access add tests for new Access methods add tests for new Group methods address scrutinizer findings, mostly doc call ldap_explode_dn from ldap wrapper, enables tests without php5-ldap PHP Doc yo dawg, i heard you like backslashes … php doc fix PHPDoc updated and typos fixed while reviewing
* | | | | | 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>'