summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge master into filesystemRobin Appelman2012-11-08181-4788/+4393
|\
| * Merge pull request #326 from owncloud/add_creditsThomas Müller2012-11-081-1/+6
| |\
| | * add credits to personal page too so that non admins can see what they run.Frank Karlitschek2012-11-081-1/+6
| * | Merge pull request #324 from owncloud/fix_imageThomas Müller2012-11-083-2/+2
| |\ \ | | |/ | |/|
| | * fix the broken image path on the apps pageFrank Karlitschek2012-11-083-2/+2
| |/
| * Migration: Allow for no app data cases; handle file copying betterTom Needham2012-11-081-7/+5
| * Migration: On import of user accounts only import folders in home dir, use OC...Tom Needham2012-11-082-35/+13
| * Correct more data vs attr to fix #189Brice Maron2012-11-071-2/+2
| * [tx-robot] updated from transifexJenkins for ownCloud2012-11-08173-4744/+4368
| * normalize filepaths in OC_Files::getFileInfoRobin Appelman2012-11-071-0/+1
| * Revert "fix blocking drag & drop upload of folders"Robin Appelman2012-11-071-2/+2
| * check if $path is a empty stringBjörn Schießle2012-11-071-1/+1
* | merge master into filesystemRobin Appelman2012-11-0788-554/+2236
|\|
| * Merge pull request #307 from owncloud/etag-function-overwriteicewind19912012-11-071-2/+14
| |\
| | * Allow changing the way etags are generatedRobin Appelman2012-11-071-2/+14
| * | backport from approved patch in stable45:Björn Schießle2012-11-071-4/+1
| * | Fix quoting problem in fs mount. give Big DB error at least in PGBrice Maron2012-11-071-4/+4
| * | Merge pull request #303 from owncloud/fix_issue_95Björn Schießle2012-11-071-2/+2
| |\ \
| | * | urlencode file/dir to allow special characters in filename/path (issue #95)Björn Schießle2012-11-071-2/+2
| * | | Merge pull request #306 from owncloud/crumb_drop_fixBjörn Schießle2012-11-071-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | get the right file name for drag&drop. This was necessary after the switch to...Björn Schießle2012-11-071-1/+1
| | |/
| * | fix user specific mount configurationRobin Appelman2012-11-071-2/+2
| * | Merge pull request #289 from zimba12/masterThomas Müller2012-11-072-21/+24
| |\ \ | | |/ | |/|
| | * Moved relative_modified_date from file/js to core/jsAlessandro Cosentino2012-11-062-21/+24
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-11-0713-28/+34
| * | Merge pull request #294 from owncloud/fix_ldap_typo_set_not_get_valueLukas Reschke2012-11-061-1/+1
| |\ \ | | |/ | |/|
| | * LDAP: fix typo in config value handling.Arthur Schiwon2012-11-061-1/+1
| |/
| * Merge pull request #258 from wardragon/ldap_existence_check_no_refactorblizzz2012-11-062-6/+11
| |\
| | * Return an empty array on succesful existence checkLorenzo M. Catucci2012-11-052-3/+4
| | * Return true or false from readAttribute if $attr is emptyLorenzo M. Catucci2012-11-052-6/+10
| * | Merge pull request #273 from owncloud/fix_webdav_shared_91blizzz2012-11-061-7/+10
| |\ \
| | * | Return empty array if file does not exist inside Shared folder, fixes issue #91Michael Gapczynski2012-11-051-7/+10
| * | | Merge pull request #281 from butonic/fix_human_filesize_column_headerThomas Müller2012-11-061-1/+1
| |\ \ \
| | * | | fix human filesize column headerJörn Friedrich Dreyer2012-11-061-1/+1
| |/ / /
| * | | Merge pull request #265 from owncloud/fix-button-img-cursorThomas Müller2012-11-051-0/+1
| |\ \ \
| | * | | make images in buttons also show click-hand on hoverJan-Christoph Borchardt2012-11-051-0/+1
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2012-11-0624-55/+1666
| | |/ / | |/| |
| * | | Merge pull request #267 from owncloud/improve_files_updateThomas Müller2012-11-051-2/+2
| |\ \ \
| | * | | prepare SQL query only once, that's what prepared statements are for. Should ...Arthur Schiwon2012-11-051-2/+2
| | |/ /
| * | | Merge pull request #269 from owncloud/fix_fe_mkdir_warningThomas Müller2012-11-051-1/+6
| |\ \ \
| | * | | Fix mkdir and opendir warnings when path does not existArthur Schiwon2012-11-051-1/+6
| | |/ /
| * | | Merge pull request #268 from owncloud/fixing_template_testLukas Reschke2012-11-051-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | fixes #266Thomas Mueller2012-11-051-1/+1
| |/ /
| * | support string values ('true' and 'false') for configuring the secure paramet...Robin Appelman2012-11-054-3/+45
| * | Merge pull request #245 from owncloud/fileactionsThomas Müller2012-11-051-16/+10
| |\ \
| | * | remove debug statementsRobin Appelman2012-11-051-2/+0
| | * | this line shouldn't be hereRobin Appelman2012-11-041-1/+0
| | * | some more code reuse for fileactionsRobin Appelman2012-11-041-16/+13
| * | | Merge pull request #252 from owncloud/fix_user_webdavauthFrank Karlitschek2012-11-054-10/+13
| |\ \ \
| | * | | fix the webdavauth appFrank Karlitschek2012-11-053-4/+8