summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | Merge pull request #7211 from mattcaron/masterVincent Petry2014-02-171-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Consolidate two sections, per code review. Issue #1648Matthew Caron2014-02-171-6/+2
| * | | | | | | | | | | | | | | | | Fit shared videos to viewer, just like images. Issue #1648Matthew Caron2014-02-141-0/+7
* | | | | | | | | | | | | | | | | | Merge pull request #7231 from owncloud/proper-content-typeJörn Friedrich Dreyer2014-02-171-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Use the proper content-typeLukas Reschke2014-02-171-0/+2
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #7233 from owncloud/fix_5567Jörn Friedrich Dreyer2014-02-173-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | LDAP: improve wizard strings, fixes #5567Arthur Schiwon2014-02-173-3/+3
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge pull request #7132 from owncloud/issue/6920Jan-Christoph Borchardt2014-02-171-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Do not select input for all text input fieldsJoas Schilling2014-02-071-4/+0
* | | | | | | | | | | | | | | | | | Merge pull request #6892 from owncloud/issuetemplate-enhancementsLukas Reschke2014-02-171-16/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Removed quota questionVincent Petry2014-02-171-2/+0
| * | | | | | | | | | | | | | | | | Added boldening of entries for readabilityVincent Petry2014-01-221-13/+18
| * | | | | | | | | | | | | | | | | Added explicit quota + encryption questionsVincent Petry2014-01-221-1/+5
| * | | | | | | | | | | | | | | | | Moved steps to reproduce to the topVincent Petry2014-01-221-5/+5
* | | | | | | | | | | | | | | | | | Merge pull request #7155 from owncloud/enc_improved_error_handlingBjörn Schießle2014-02-178-53/+184
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | don't block login forever if we are stuck in the middle of the initial encryp...Bjoern Schiessle2014-02-175-10/+24
| * | | | | | | | | | | | | | | | | catch errors during decryptionBjoern Schiessle2014-02-173-17/+113
| * | | | | | | | | | | | | | | | | catch errors during initial encryptionBjoern Schiessle2014-02-172-26/+47
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge pull request #7156 from owncloud/backgroundjob-publicThomas Müller2014-02-1412-65/+437
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Add unit tests for JobListRobin Appelman2014-02-124-26/+238
| * | | | | | | | | | | | | | | | Additional phpdocRobin Appelman2014-02-123-6/+31
| * | | | | | | | | | | | | | | | Remove internal methods from the public interfaceRobin Appelman2014-02-121-7/+1
| * | | | | | | | | | | | | | | | Merge branch 'master' into backgroundjob-publicRobin Appelman2014-02-126-1/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Add the background job list to the public server containerRobin Appelman2014-02-119-38/+179
* | | | | | | | | | | | | | | | | | Merge pull request #7207 from owncloud/fileinfo-serializableMorris Jobke2014-02-141-5/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | remove the JsonSerializable interface from \OC\Files\FileInfoRobin Appelman2014-02-141-5/+1
* | | | | | | | | | | | | | | | | | Merge pull request #7204 from owncloud/groupexists-duplicateThomas Müller2014-02-142-10/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Fix test cases for group managerRobin Appelman2014-02-142-4/+37
| * | | | | | | | | | | | | | | | | | remove duplicate call to groupExistsRobin Appelman2014-02-141-6/+4
* | | | | | | | | | | | | | | | | | | Merge pull request #7206 from owncloud/fix_enc_testsblizzz2014-02-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | fileinfo is no longer a arrayBjoern Schiessle2014-02-141-1/+1
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge pull request #6748 from owncloud/fileinfoicewind19912014-02-148-34/+367
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | merge master into fileinfoRobin Appelman2014-01-29125-5300/+16010
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Add isReadable, isUpdateable, isDeletable, isShareableRobin Appelman2014-01-242-1/+65
| * | | | | | | | | | | | | | | | | | undo 3rdparty changeRobin Appelman2014-01-201-0/+0
| * | | | | | | | | | | | | | | | | | undo 3rdparty changeRobin Appelman2014-01-201-0/+0
| * | | | | | | | | | | | | | | | | | Merge branch 'master' into fileinfoRobin Appelman2014-01-1733-85/+269
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | remove more is_array from encryptionRobin Appelman2014-01-173-13/+13
| * | | | | | | | | | | | | | | | | | | Dont use php5.4 only featuresRobin Appelman2014-01-171-2/+3
| * | | | | | | | | | | | | | | | | | | Don't use is_array on FileInfoRobin Appelman2014-01-172-3/+3
| * | | | | | | | | | | | | | | | | | | Merge branch 'master' into fileinfoRobin Appelman2014-01-1429-3395/+101
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | add Support for passing a FileInfo instance to View->putFileInfoRobin Appelman2014-01-132-1/+8
| * | | | | | | | | | | | | | | | | | | | remove ArrayAccess, JsonSerializable from the public part of FileInfoRobin Appelman2014-01-132-17/+7
| * | | | | | | | | | | | | | | | | | | | Extends phpdoc for \OCP\File\FileInfoRobin Appelman2014-01-131-4/+37
| * | | | | | | | | | | | | | | | | | | | Add a FileInfo class which holds all info of a file and return that from getF...Robin Appelman2014-01-134-18/+257
* | | | | | | | | | | | | | | | | | | | | Merge pull request #6726 from owncloud/fix_6630Vincent Petry2014-02-145-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Fixed double file encoding for previewsVincent Petry2014-01-302-2/+2
| * | | | | | | | | | | | | | | | | | | | | remove empty lineGeorg Ehrke2014-01-301-1/+0
| * | | | | | | | | | | | | | | | | | | | | don't urldecode get var, php does this automaticallyGeorg Ehrke2014-01-303-3/+4
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #7183 from owncloud/remove-force-lowercaseThomas Müller2014-02-141-3/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |