aboutsummaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-07-1767-83/+190
* Merge pull request #9653 from owncloud/fix-9590Vincent Petry2014-07-163-14/+27
|\
| * fix CSS coding styleMorris Jobke2014-07-161-5/+6
| * Fix #9590. Fix #9612.Stephane V2014-07-153-14/+26
* | Merge pull request #9662 from owncloud/enc_error_handling_masterBjörn Schießle2014-07-165-25/+74
|\ \
| * | introduce some encryption exceptions and catch additional error casesBjoern Schiessle2014-07-164-25/+73
| * | make sure that the crypt library is loadedBjoern Schiessle2014-07-161-0/+1
* | | Merge pull request #9647 from owncloud/files_external_multiuser_testsRobin McCorkell2014-07-161-0/+37
|\ \ \
| * | | Add unit test for multi-user configuration loadingRobin McCorkell2014-07-151-0/+37
| | |/ | |/|
* | | Merge pull request #9664 from owncloud/enc-removelegacytestsMorris Jobke2014-07-161-84/+0
|\ \ \
| * | | Removed legacy encryption testsVincent Petry2014-07-161-84/+0
| | |/ | |/|
* / | Correctly return the owner display name for children of sharesVincent Petry2014-07-162-1/+20
|/ /
* / [tx-robot] updated from transifexJenkins for ownCloud2014-07-16116-53/+87
|/
* Merge pull request #9639 from owncloud/prevent-irc-trolls-fro-using-thisicewind19912014-07-151-1/+1
|\
| * Update info.xmlLukas Reschke2014-07-151-1/+1
* | Merge pull request #8987 from owncloud/lastindexid-debugVincent Petry2014-07-151-6/+37
|\ \ | |/ |/|
| * - Added test to trigger index id errorVincent Petry2014-07-141-6/+37
* | throw exception if file is to large for trash binBjoern Schiessle2014-07-153-6/+46
* | Merge pull request #9570 from PhilJung/masterblizzz2014-07-152-1/+153
|\ \
| * | File written by blizzzPhilippe Jung2014-07-141-0/+151
| * | [Issue #9559] identifiers uid=xxx must be considered as user DN and not as ow...Philippe Jung2014-07-101-1/+2
* | | Merge pull request #9596 from owncloud/fixing-9503-masterMorris Jobke2014-07-152-5/+5
|\ \ \
| * | | 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
|\ \
| * | Added mountType attribute and adapted Delete action textVincent Petry2014-07-145-5/+30
* | | Merge pull request #9605 from owncloud/sftp-missing-streamwrapperVincent Petry2014-07-141-0/+15
|\ \ \ | |/ / |/| |
| * | 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 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
| |/ / |/| |
* | | 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 listsVincent Petry2014-07-097-43/+137
* | | Merge pull request #9516 from owncloud/kill-legacy-encryption-oc8Vincent Petry2014-07-108-881/+3
|\ \ \ | |_|/ |/| |
| * | 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 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 groupsArthur Schiwon2014-07-088-44/+516
* | | | 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-082-2/+0
|\ \ \ \
| * | | | Upload abortion is now detected within the OC_Connector_Sabre_File::put()Thomas Müller2014-07-082-2/+0
| |/ / /