summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-04-1069-799/+1074
|
* Merge pull request #2758 from Kondou-ger/refactor_OCdialogsBart Visscher2013-04-092-154/+312
|\ | | | | Refactor OCdialogs.
| * Fix OC.dialogs.form()kondou2013-04-091-3/+3
| | | | | | | | Don't do _too_ much escapeHTML()
| * Remove manual mimetype checking.kondou2013-04-081-5/+1
| |
| * Make files _and_ directorys selectable/browsable.kondou2013-04-061-10/+13
| | | | | | | | | | Also make long variables more readable by splitting them up into shorter ones.
| * Make files selectable again.kondou2013-04-061-3/+3
| |
| * Fix repeating directory names.kondou2013-04-062-15/+18
| | | | | | | | Also fix some CSS for Firefox.
| * Make directories show at top.kondou2013-04-061-2/+12
| |
| * Make directories clickable.kondou2013-04-061-13/+23
| | | | | | | | A bit bugged though ...
| * Small fixeskondou2013-04-062-37/+37
| | | | | | | | | | | | | | * escapeHTML(everything) * curly braces for if * camelcase function_to_call * add missing semicolae (?)
| * Refactor OCdialogs.kondou2013-04-062-152/+288
| | | | | | | | Fix #2557 and make the whole code more usable.
* | Merge pull request #2834 from owncloud/suppress-setup-warningLukas Reschke2013-04-091-1/+1
|\ \ | | | | | | Suppress the notice from the nullbyte check
| * | Suppress the notice from the nullbyte checkBart Visscher2013-04-091-1/+1
| | |
* | | Merge pull request #2147 from eMerzh/split_configeMerzh2013-04-091-7/+17
|\ \ \ | |/ / |/| | [OC6] Allow to load splited config files
| * | Small perf improvement : filter before sortBrice Maron2013-03-091-3/+3
| | |
| * | Allow to load splited config files ref #946Brice Maron2013-03-061-7/+17
| | |
* | | Merge pull request #2811 from owncloud/app-version-checkThomas Müller2013-04-091-0/+8
|\ \ \ | | | | | | | | added yet another test for the verion compare check due to mail
| * | | used oc version 5.0.3Bernhard Posselt2013-04-091-1/+1
| | | |
| * | | added yet another test for the verion compare check due to mailBernhard Posselt2013-04-091-0/+8
| | | |
* | | | Merge pull request #2815 from owncloud/default-quotaThomas Tanghus2013-04-091-1/+1
|\ \ \ \ | | | | | | | | | | Users: fix "Other.." quota option for the default quota
| * | | | 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 #2730
| * | | | Fix #2730kondou2013-04-091-4/+4
|/ / / / | | | | | | | | | | | | | | | | Swap OC.dialogs.alert()'s parameters, so Error is shown as its title.
* | | | Merge pull request #2801 from OpenLarry/patch-1Bernhard Posselt2013-04-091-2/+2
|\ \ \ \ | | | | | | | | | | fixes #2679 - 5.0.3 Renaming -> Nothing happens
| * | | | fixes #2679OpenLarry2013-04-091-2/+2
| | | | |
* | | | | Merge pull request #2697 from owncloud/button-css-fixesBernhard Posselt2013-04-091-4/+22
|\ \ \ \ \ | | | | | | | | | | | | Button css fixes
| * | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | Just send the cookies in the ownCloud directory
| * | | | | | Juse send the cookies in the ownCloud directoryLukas Reschke2013-04-062-4/+7
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #2799 from ↵Bernhard Posselt2013-04-092-2/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/add-mimetype-filter-to-getdirectorycontent Add mimetype filter to getDirectoryContent function
| * | | | | | 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 writable
| * | | | | | 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 function
| * | | | | | 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 purpose
| * | | | | | | 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::det...
| * | | | | | | fixes #2743 - use public OC_User::getDisplayName instead of ↵Thomas Mueller2013-04-081-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | OC_User::determineDisplayName
* | | | | / / [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
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Add OC\VObject\StringProperty. Partial fix for owncloud/apps#762
| * | | | | 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.
| * | | | | 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
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Refactor upload js
| * | | | | use css browser switch instead of deprecated jquery browser detectionJörn Friedrich Dreyer2013-03-281-7/+7
| | | | | |