aboutsummaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge pull request #9570 from PhilJung/masterblizzz2014-07-152-1/+153
|\ \ \ \ \ | | | | | | | | | | | | [Issue #9559] identifiers uid=xxx must be considered as user DN and not ...
| * | | | | File written by blizzzPhilippe Jung2014-07-141-0/+151
| | | | | |
| * | | | | [Issue #9559] identifiers uid=xxx must be considered as user DN and not as ↵Philippe Jung2014-07-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | owncloud users
* | | | | | Merge pull request #9596 from owncloud/fixing-9503-masterMorris Jobke2014-07-152-5/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | reduce share action text to the user name only
| * | | | | | reduce share action text to the user name onlyThomas Müller2014-07-142-5/+5
| | |/ / / / | |/| | | |
* / | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-1554-54/+62
|/ / / / /
* | | | | Merge pull request #9572 from owncloud/deleteunsharetooltipBjörn Schießle2014-07-145-5/+30
|\ \ \ \ \ | | | | | | | | | | | | mountType attribute + delete hint fix
| * | | | | Added mountType attribute and adapted Delete action textVincent Petry2014-07-145-5/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added mountType attribute for files/folder to indicated whether they are regular, external or shared. The client side then adapts the "Delete" action hint text based on this information. Only the mount roots must have the delete icon hint adapted. To make this detectable on the client side, the mountType can now be null, "shared", "shared-root", "external" or "external-root". This also gives room to icon customization on the client side.
* | | | | | Merge pull request #9605 from owncloud/sftp-missing-streamwrapperVincent Petry2014-07-141-0/+15
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | Re-add missing sftp:// stream wrapper
| * | | | Add short description explaining how SFTP ext storage class works.Andreas Fischer2014-07-121-0/+4
| | | | |
| * | | | The file providing the sftp:// scheme needs to be included manually.Andreas Fischer2014-07-121-0/+11
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-141-0/+4
| | | | |
* | | | | Merge pull request #9563 from owncloud/version-delete-cacheMorris Jobke2014-07-131-4/+21
|\ \ \ \ \ | | | | | | | | | | | | Remove deleted versions from the cache
| * | | | | Remove deleted versions from the cacheRobin Appelman2014-07-101-4/+21
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-134-1/+25
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-124-2/+31
| | | | | |
* | | | | | 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.
* | | | | 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 #9516 from owncloud/kill-legacy-encryption-oc8Vincent Petry2014-07-108-881/+3
|\ \ \ \ | |_|/ / |/| | | [OC8] Kill legacy encryption migration
| * | | Kill legacy encryption migrationThomas Müller2014-07-088-881/+3
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-104-0/+15
| | | |
* | | | 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
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-0978-12/+130
| | | |
* | | | 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-082-2/+0
|\ \ \ \ | | | | | | | | | | 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-082-2/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | OC_Connector_Sabre_AbortedUploadDetectionPlugin is pointless Adding unit test testUploadAbort()
* | | | port of #9500Arthur Schiwon2014-07-081-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | 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>'
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-0862-116/+69
| | |
* | | 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 #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-0714-7/+14
|\ \ \ | | | | | | | | Add ocsids for shipped apps in core repo
| * | | add ocsids to info.xmlGeorg Ehrke2014-07-0714-7/+14
| |/ /
* | | Merge pull request #9415 from owncloud/external-sharedialogMorris Jobke2014-07-071-4/+31
|\ \ \ | | | | | | | | Improved external share dialog
| * | | Improved external share dialogVincent Petry2014-07-071-4/+31
| |/ / | | | | | | | | | | | | Changed title, label and buttons. Removed icon.
* / / 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.
* | [tx-robot] updated from transifexJenkins for ownCloud2014-07-072-0/+3
| |
* | 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
| | |
| * | always take unencrypted sizeBjoern Schiessle2014-07-041-2/+2
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-062-0/+4
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-0599-99/+33
| | |