Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix type in var name | Björn Schießle | 2013-03-04 | 2 | -2/+2 |
* | fix quota calculation for trash and versions | Björn Schießle | 2013-03-04 | 2 | -5/+5 |
* | Merge pull request #2061 from owncloud/app-text | Frank Karlitschek | 2013-03-04 | 1 | -1/+1 |
|\ | |||||
| * | Add the description as text and not as html | Lukas Reschke | 2013-03-04 | 1 | -1/+1 |
* | | Merge pull request #2060 from owncloud/escapeGroupname | Frank Karlitschek | 2013-03-04 | 1 | -5/+5 |
|\ \ | |||||
| * | | Sanitize uid, group and quota | Lukas Reschke | 2013-03-04 | 1 | -5/+5 |
| |/ | |||||
* | | Merge pull request #2059 from owncloud/getlog | Frank Karlitschek | 2013-03-04 | 2 | -10/+3 |
|\ \ | |||||
| * | | Add log as text and not as HTML | Lukas Reschke | 2013-03-03 | 2 | -10/+3 |
| |/ | |||||
* | | Merge pull request #2062 from owncloud/shareType | Bernhard Posselt | 2013-03-03 | 1 | -3/+3 |
|\ \ | |||||
| * | | Sanitize shareWith | Lukas Reschke | 2013-03-04 | 1 | -3/+3 |
| |/ | |||||
* / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-04 | 141 | -1244/+951 |
|/ | |||||
* | Merge pull request #2057 from owncloud/upgrade-fixes | Frank Karlitschek | 2013-03-03 | 1 | -2/+4 |
|\ | |||||
| * | Disable loading of backgroundjobs js when upgrade is needed | Bart Visscher | 2013-03-03 | 1 | -1/+1 |
| * | Check maintenance mode before loading apps in route matcher | Bart Visscher | 2013-03-03 | 1 | -1/+3 |
* | | Merge pull request #2058 from owncloud/fix-getlog | Frank Karlitschek | 2013-03-03 | 1 | -1/+10 |
|\ \ | |/ |/| | |||||
| * | Fix encoding settings ajax getlog | Bart Visscher | 2013-03-03 | 1 | -1/+10 |
|/ | |||||
* | Merge pull request #2034 from owncloud/fix_bug47 | Michael Gapczynski | 2013-03-03 | 2 | -58/+68 |
|\ | |||||
| * | new Array() -> [] | Georg Ehrke | 2013-03-02 | 1 | -1/+1 |
| * | update OC.Notification.show | Georg Ehrke | 2013-03-02 | 1 | -9/+3 |
| * | fix oc#47 | Georg Ehrke | 2013-03-01 | 2 | -57/+73 |
* | | Merge pull request #2050 from owncloud/fix-readfile-comment | Bernhard Posselt | 2013-03-03 | 1 | -1/+1 |
|\ \ | |||||
| * | | Chunk size comment should say kB, not MB | Michael Gapczynski | 2013-03-03 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #2046 from owncloud/add_ie_css_switch | Frank Karlitschek | 2013-03-03 | 3 | -3/+18 |
|\ \ | |||||
| * | | add ie css switch to layout templates | Jörn Friedrich Dreyer | 2013-03-03 | 3 | -3/+18 |
|/ / | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-03 | 66 | -481/+552 |
* | | Add link to installation instructions | Lukas Reschke | 2013-03-02 | 1 | -1/+1 |
* | | Merge pull request #2036 from owncloud/escape-only-in-template | Frank Karlitschek | 2013-03-02 | 1 | -2/+2 |
|\ \ | |||||
| * | | Escape the data only in the template | Lukas Reschke | 2013-03-02 | 1 | -2/+2 |
* | | | Merge pull request #2033 from eMerzh/fix_ldap_quoting | Bernhard Posselt | 2013-03-02 | 1 | -3/+3 |
|\ \ \ | |||||
| * | | | Fix quoting of query for user_ldap ref #1983 | Brice Maron | 2013-03-02 | 1 | -3/+3 |
* | | | | Merge pull request #2031 from eMerzh/fix_empty_display_name | eMerzh | 2013-03-02 | 2 | -2/+3 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Avoid to display empty DisplayNames for menu and title | Brice Maron | 2013-03-02 | 2 | -2/+3 |
|/ / / | |||||
* | | | Remove uneeded sanitizeHTML | Lukas Reschke | 2013-03-02 | 1 | -1/+1 |
* | | | Merge pull request #2021 from owncloud/fix-csp-docu | Frank Karlitschek | 2013-03-02 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Remove uneeded \ since we're using " | Lukas Reschke | 2013-03-02 | 1 | -1/+1 |
* | | | | Merge pull request #2026 from j-ed/master | Lukas Reschke | 2013-03-02 | 1 | -2/+9 |
|\ \ \ \ | |||||
| * | | | | Update image.php | j-ed | 2013-03-02 | 1 | -2/+9 |
* | | | | | Merge pull request #2020 from owncloud/fixing-bugtracker-link-master | Thomas Müller | 2013-03-02 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into fixing-bugtracker-link-master | Lukas Reschke | 2013-03-01 | 46 | -749/+591 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| * | | | | | change bug tracker links to https://github.com/owncloud/core/blob/master/CONT... | Thomas Mueller | 2013-03-01 | 2 | -3/+3 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #2022 from owncloud/fix-notice | Thomas Müller | 2013-03-01 | 1 | -1/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Fix notice | Lukas Reschke | 2013-03-02 | 1 | -1/+2 |
| |/ / / / | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-02 | 174 | -4959/+6924 |
* | | | | | Merge pull request #2019 from owncloud/fixing-languages-again-master | Bart Visscher | 2013-03-01 | 1 | -1/+5 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | some more new languages recently introduced to ownCloud | Thomas Mueller | 2013-03-01 | 1 | -1/+5 |
| |/ / / | |||||
* | | | | Merge pull request #1976 from owncloud/from-insane-autoescape-to-p | Lukas Reschke | 2013-03-01 | 46 | -749/+591 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Merge master | Lukas Reschke | 2013-03-01 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'master' into from-insane-autoescape-to-p | Thomas Mueller | 2013-03-01 | 181 | -363/+508 |
| | |\ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Merge master | Lukas Reschke | 2013-03-01 | 181 | -364/+509 |
| |\ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
* | | | | Merge pull request #2016 from owncloud/fixing-1844-master | Lukas Reschke | 2013-03-01 | 1 | -4/+7 |
|\ \ \ \ |