summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 #2034 from owncloud/fix_bug47Michael Gapczynski2013-03-032-58/+68
|\ | | | | Fix #47 - Duplicate files create a (2) when multiples are uploaded
| * 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 MB
| * | 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 templates
| * | 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 template
| * | 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 #1983
| * | | 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 title
| * | | 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 "
| * | | 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
|\ \ \ \ | | | | | | | | | | do not try to extract image infos from 0- or better less than 12-byte length files.
| * | | | Update image.phpj-ed2013-03-021-2/+9
| | | | | | | | | | | | | | | | | | | | don't try to extract image infos from 0- or better less than 12 byte length files. See description of `exif_imagetype` function at `http://php.net/manual/de/function.exif-imagetype.php`.
* | | | | Merge pull request #2020 from owncloud/fixing-bugtracker-link-masterThomas Müller2013-03-021-1/+1
|\ \ \ \ \ | | | | | | | | | | | | change bug tracker links to https://github.com/owncloud/core/blob/master...
| * \ \ \ \ Merge branch 'master' into fixing-bugtracker-link-masterLukas Reschke2013-03-0146-749/+591
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: core/templates/exception.php settings/templates/help.php
| * | | | | change bug tracker links to ↵Thomas Mueller2013-03-012-3/+3
| | |_|/ / | |/| | | | | | | | | | | | | https://github.com/owncloud/core/blob/master/CONTRIBUTING.md
* | | | | Merge pull request #2022 from owncloud/fix-noticeThomas Müller2013-03-011-1/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix notice
| * | | | | 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 ownCloud
| * | | | 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
|\ \ \ \ | |/ / / |/| | | Replace insane auto sanitization with p()
| * | | Merge masterLukas Reschke2013-03-011-1/+1
| |\ \ \
| | * \ \ Merge branch 'master' into from-insane-autoescape-to-pThomas Mueller2013-03-01181-363/+508
| | |\ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Conflicts: apps/files/templates/index.php
| * | | | Merge masterLukas Reschke2013-03-01181-364/+509
| |\ \ \ \ | |/ / / / |/| / / / | |/ / /
* | | | Merge pull request #2016 from owncloud/fixing-1844-masterLukas Reschke2013-03-011-4/+7
|\ \ \ \ | | | | | | | | | | validate the generated email address and fall back to localhost.localdom...
| * | | | validate the generated email address and fall back to localhost.localdomain ↵Thomas Mueller2013-03-011-4/+7
|/ / / / | | | | | | | | | | | | | | | | | | | | in case it is not valid fixes #1844
* | | | Merge pull request #2015 from owncloud/fixing-2001-masterBernhard Posselt2013-03-011-1/+2
|\ \ \ \ | | | | | | | | | | in case the user has no permissions to upload/create files...
| * | | | fixes #2001 - in case the user has no permissions to upload/create ↵Thomas Mueller2013-03-011-1/+2
| | | | | | | | | | | | | | | | | | | | files/folders a clear warning is displayed
* | | | | Merge pull request #2014 from owncloud/fixing-1909-masterBernhard Posselt2013-03-011-0/+3
|\ \ \ \ \ | |/ / / / |/| | | | for this self test we don't care if the ssl certificate is self signed a...
| * | | | for this self test we don't care if the ssl certificate is self signed and ↵Thomas Mueller2013-03-011-0/+3
|/ / / / | | | | | | | | | | | | the peer cannot be verified.
* | | | Merge pull request #2005 from owncloud/trash_add_signalsBernhard Posselt2013-03-011-0/+6
|\ \ \ \ | | | | | | | | | | add post_moveToTrash and post_restore signals to the trash bin
| * | | | add additional parameter to signalBjörn Schießle2013-03-011-2/+6
| | | | |
| * | | | add post_moveToTrash and post_restore signals to the trash binBjörn Schießle2013-03-011-0/+2
| | | | |
* | | | | Merge pull request #2007 from owncloud/fix_1834_masterBernhard Posselt2013-03-012-8/+10
|\ \ \ \ \ | | | | | | | | | | | | make sure that the version app always works on the users real home folder [master]
| * | | | | fix getVersions() call for the history viewBjörn Schießle2013-03-011-1/+2
| | | | | |
| * | | | | make sure that the version app always work on the users real home folder and ↵Björn Schießle2013-03-011-7/+8
| |/ / / / | | | | | | | | | | | | | | | not on the mount point
* | | | | Merge pull request #2008 from owncloud/1999-requesttokenFrank Karlitschek2013-03-011-3/+7
|\ \ \ \ \ | |/ / / / |/| | | | Check if requesttoken exists in session
| * | | | Check if requesttoken exists in sessionLukas Reschke2013-03-011-0/+4
| | | | | | | | | | | | | | | | | | | | Ref #1999
| * | | | Style fixesLukas Reschke2013-03-011-3/+3
| | | | |