summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #2815 from owncloud/default-quotaThomas Tanghus2013-04-091-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Users: fix "Other.." quota option for the default quotaRobin Appelman2013-04-091-1/+1
* | | | | | | | Merge pull request #2819 from Kondou-ger/fix_2730Bernhard Posselt2013-04-091-4/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix #2730kondou2013-04-091-4/+4
|/ / / / / / /
* | | | | | | Merge pull request #2801 from OpenLarry/patch-1Bernhard Posselt2013-04-091-2/+2
|\ \ \ \ \ \ \
| * | | | | | | fixes #2679OpenLarry2013-04-091-2/+2
* | | | | | | | Merge pull request #2697 from owncloud/button-css-fixesBernhard Posselt2013-04-091-4/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | group some selectors againJan-Christoph Borchardt2013-04-031-7/+2
| * | | | | | | | add styles for disabled input fieldsJan-Christoph Borchardt2013-04-031-0/+9
| * | | | | | | | button selector cleanupJan-Christoph Borchardt2013-04-031-5/+19
* | | | | | | | | Merge pull request #2754 from owncloud/cookie-pathBernhard Posselt2013-04-092-4/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Juse send the cookies in the ownCloud directoryLukas Reschke2013-04-062-4/+7
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #2799 from owncloud/add-mimetype-filter-to-getdirectorycon...Bernhard Posselt2013-04-092-2/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add mimetype filter to getDirectoryContent functionBart Visscher2013-04-082-2/+4
* | | | | | | | | | Merge pull request #2797 from owncloud/fixing-2792-masterBjörn Schießle2013-04-091-0/+3
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | fixes #2792 - only touch if writableThomas Mueller2013-04-081-0/+3
| |/ / / / / / / /
* | | | | | | | | Merge pull request #2764 from owncloud/remove-limit-from-count-queryBernhard Posselt2013-04-091-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove wrong limit parameter from count query in compatibility functionBart Visscher2013-04-061-1/+1
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge pull request #2798 from owncloud/fixing-2789-masterBernhard Posselt2013-04-092-1/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fixes #2789 - no internet connectivity check if there is non on purposeThomas Mueller2013-04-082-1/+9
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #2800 from owncloud/fixing-2743-masterBernhard Posselt2013-04-091-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | fixes #2743 - use public OC_User::getDisplayName instead of OC_User::determin...Thomas Mueller2013-04-081-1/+1
| |/ / / / / / /
* | | | | / / / [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
| | |_|/ / / / / | |/| | | | | |