summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-04-09412-1860/+2202
* Merge pull request #2785 from owncloud/vobject_stringpropertyThomas Müller2013-04-082-0/+99
|\
| * StringProperty unittestThomas Tanghus2013-04-081-0/+19
| * Add OC\VObject\StringProperty. Partial fix for owncloud/apps#762Thomas Tanghus2013-04-081-0/+80
* | [tx-robot] updated from transifexJenkins for ownCloud2013-04-08239-3768/+3951
|/
* Merge pull request #2767 from owncloud/js_compatibilityThomas Tanghus2013-04-062-72/+104
|\
| * Move compatibility functions to compatibility.js and add two more.Thomas Tanghus2013-04-062-72/+104
* | Merge pull request #2279 from owncloud/refactor_upload_jsBart Visscher2013-04-064-252/+298
|\ \ | |/ |/|
| * use css browser switch instead of deprecated jquery browser detectionJörn Friedrich Dreyer2013-03-281-7/+7
| * '#upload' is actually '#uploadprogresswrapper', fix css and js to show cancel...Jörn Friedrich Dreyer2013-03-282-6/+7
| * use local variable to walk DOM only onceJörn Friedrich Dreyer2013-03-281-4/+5
| * use === to compare empty string ''Jörn Friedrich Dreyer2013-03-281-1/+1
| * don't update progress bar in ie < 10Jörn Friedrich Dreyer2013-03-281-1/+3
| * return created table row, use as context in fileupload eventsJörn Friedrich Dreyer2013-03-281-11/+153
| * refactor files.js, make proper use of fileupload eventsJörn Friedrich Dreyer2013-03-281-237/+136
| * return original filename to fileuploadJörn Friedrich Dreyer2013-03-281-0/+1
* | Merge pull request #1974 from owncloud/use-rawurlencodeBart Visscher2013-04-061-2/+2
|\ \
| * | Just use rawurlencode in files list templateBart Visscher2013-02-271-2/+2
* | | Merge pull request #2759 from owncloud/fix-2718Bart Visscher2013-04-061-0/+1
|\ \ \
| * | | Set file perms to 0640 of mount.json - fixes #2718Lukas Reschke2013-04-061-0/+1
* | | | Merge pull request #2610 from owncloud/vcategories_purge_multiBart Visscher2013-04-061-6/+14
|\ \ \ \
| * | | | Remove redundant lineThomas Tanghus2013-04-041-1/+0
| * | | | Don't try to call a an array :-PThomas Tanghus2013-03-301-1/+1
| * | | | Typehint and check $ids parameter.Thomas Tanghus2013-03-291-3/+7
| * | | | Allow purging multiple objects from category index table.Thomas Tanghus2013-03-291-5/+10
| | |_|/ | |/| |
* | | | Merge pull request #2738 from Kondou-ger/fix_alert_issuesBart Visscher2013-04-064-17/+17
|\ \ \ \ | |_|/ / |/| | |
| * | | Translate 'Error' in corekondou2013-04-063-11/+11
| * | | Fixed things in alert-messagesroot2013-04-054-17/+17
* | | | Merge pull request #2751 from Borkason/patch-1Frank Karlitschek2013-04-061-2/+2
|\ \ \ \
| * | | | Fix indentation in util.php.Birk Borkason2013-04-051-2/+2
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-0634-82/+2491
* | | | | Merge pull request #2750 from Kondou-ger/fix_2693Bart Visscher2013-04-051-3/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix Typokondou2013-04-051-2/+2
| * | | | Fix #2693kondou2013-04-051-2/+2
|/ / / /
* | | | Merge pull request #2737 from Kondou-ger/proper_css_commentsJan-Christoph Borchardt2013-04-051-1/+1
|\ \ \ \
| * | | | Proper CSS commentroot2013-04-051-1/+1
| |/ / /
* | | | Update config.sample.phpFrank Karlitschek2013-04-051-2/+2
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-0524-145/+248
* | | | Merge pull request #2732 from owncloud/sane_version_paramThomas Tanghus2013-04-041-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Add a name to the version parameterLukas Reschke2013-04-051-1/+1
|/ / /
* | | Merge pull request #2611 from owncloud/filename-widthBart Visscher2013-04-041-1/+1
|\ \ \
| * | | Using max-width instead of width for filename.raghunayyar2013-03-301-1/+1
| * | | Adds a fixed width to the filename to prevent horizontal scroll.raghunayyar2013-03-291-1/+1
| |/ /
* | | Merge pull request #2708 from owncloud/dont_expose_installatioBart Visscher2013-04-041-1/+1
|\ \ \
| * | | Don't expose the server installation timeLukas Reschke2013-04-041-1/+1
* | | | Merge pull request #2706 from owncloud/random_is_random_and_not_timeBart Visscher2013-04-041-3/+3
|\ \ \ \
| * | | | Use random bytes instead of timeLukas Reschke2013-04-041-3/+3
| * | | | Use a more random source...Lukas Reschke2013-04-041-1/+1
* | | | | Merge pull request #2707 from owncloud/remove_brainfucked_methodBart Visscher2013-04-041-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | *gnaaarf*Lukas Reschke2013-04-041-1/+1
|/ / / /