summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix type in var nameBjörn Schießle2013-03-042-2/+2
* fix quota calculation for trash and versionsBjörn Schießle2013-03-042-5/+5
* Merge pull request #2061 from owncloud/app-textFrank Karlitschek2013-03-041-1/+1
|\
| * Add the description as text and not as htmlLukas Reschke2013-03-041-1/+1
* | Merge pull request #2060 from owncloud/escapeGroupnameFrank Karlitschek2013-03-041-5/+5
|\ \
| * | Sanitize uid, group and quotaLukas Reschke2013-03-041-5/+5
| |/
* | Merge pull request #2059 from owncloud/getlogFrank Karlitschek2013-03-042-10/+3
|\ \
| * | Add log as text and not as HTMLLukas Reschke2013-03-032-10/+3
| |/
* | Merge pull request #2062 from owncloud/shareTypeBernhard Posselt2013-03-031-3/+3
|\ \
| * | Sanitize shareWithLukas Reschke2013-03-041-3/+3
| |/
* / [tx-robot] updated from transifexJenkins for ownCloud2013-03-04141-1244/+951
|/
* Merge pull request #2057 from owncloud/upgrade-fixesFrank Karlitschek2013-03-031-2/+4
|\
| * Disable loading of backgroundjobs js when upgrade is neededBart Visscher2013-03-031-1/+1
| * Check maintenance mode before loading apps in route matcherBart Visscher2013-03-031-1/+3
* | Merge pull request #2058 from owncloud/fix-getlogFrank Karlitschek2013-03-031-1/+10
|\ \ | |/ |/|
| * Fix encoding settings ajax getlogBart Visscher2013-03-031-1/+10
|/
* Merge pull request #2034 from owncloud/fix_bug47Michael Gapczynski2013-03-032-58/+68
|\
| * new Array() -> []Georg Ehrke2013-03-021-1/+1
| * update OC.Notification.showGeorg Ehrke2013-03-021-9/+3
| * fix oc#47Georg Ehrke2013-03-012-57/+73
* | Merge pull request #2050 from owncloud/fix-readfile-commentBernhard Posselt2013-03-031-1/+1
|\ \
| * | Chunk size comment should say kB, not MBMichael Gapczynski2013-03-031-1/+1
|/ /
* | Merge pull request #2046 from owncloud/add_ie_css_switchFrank Karlitschek2013-03-033-3/+18
|\ \
| * | add ie css switch to layout templatesJörn Friedrich Dreyer2013-03-033-3/+18
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2013-03-0366-481/+552
* | Add link to installation instructionsLukas Reschke2013-03-021-1/+1
* | Merge pull request #2036 from owncloud/escape-only-in-templateFrank Karlitschek2013-03-021-2/+2
|\ \
| * | Escape the data only in the templateLukas Reschke2013-03-021-2/+2
* | | Merge pull request #2033 from eMerzh/fix_ldap_quotingBernhard Posselt2013-03-021-3/+3
|\ \ \
| * | | Fix quoting of query for user_ldap ref #1983Brice Maron2013-03-021-3/+3
* | | | Merge pull request #2031 from eMerzh/fix_empty_display_nameeMerzh2013-03-022-2/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Avoid to display empty DisplayNames for menu and titleBrice Maron2013-03-022-2/+3
|/ / /
* | | Remove uneeded sanitizeHTMLLukas Reschke2013-03-021-1/+1
* | | Merge pull request #2021 from owncloud/fix-csp-docuFrank Karlitschek2013-03-021-1/+1
|\ \ \
| * | | Remove uneeded \ since we're using "Lukas Reschke2013-03-021-1/+1
* | | | Merge pull request #2026 from j-ed/masterLukas Reschke2013-03-021-2/+9
|\ \ \ \
| * | | | Update image.phpj-ed2013-03-021-2/+9
* | | | | Merge pull request #2020 from owncloud/fixing-bugtracker-link-masterThomas Müller2013-03-021-1/+1
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into fixing-bugtracker-link-masterLukas Reschke2013-03-0146-749/+591
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | change bug tracker links to https://github.com/owncloud/core/blob/master/CONT...Thomas Mueller2013-03-012-3/+3
| | |_|/ / | |/| | |
* | | | | Merge pull request #2022 from owncloud/fix-noticeThomas Müller2013-03-011-1/+2
|\ \ \ \ \
| * | | | | Fix noticeLukas Reschke2013-03-021-1/+2
| |/ / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-02174-4959/+6924
* | | | | Merge pull request #2019 from owncloud/fixing-languages-again-masterBart Visscher2013-03-011-1/+5
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | some more new languages recently introduced to ownCloudThomas Mueller2013-03-011-1/+5
| |/ / /
* | | | Merge pull request #1976 from owncloud/from-insane-autoescape-to-pLukas Reschke2013-03-0146-749/+591
|\ \ \ \ | |/ / / |/| | |
| * | | Merge masterLukas Reschke2013-03-011-1/+1
| |\ \ \
| | * \ \ Merge branch 'master' into from-insane-autoescape-to-pThomas Mueller2013-03-01181-363/+508
| | |\ \ \ | |_|/ / / |/| | | |
| * | | | Merge masterLukas Reschke2013-03-01181-364/+509
| |\ \ \ \ | |/ / / / |/| / / / | |/ / /
* | | | Merge pull request #2016 from owncloud/fixing-1844-masterLukas Reschke2013-03-011-4/+7
|\ \ \ \