Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| * | 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 | ||||
| * | | 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 | ||||
| * | | 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 " | ||||
| * | | 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 |
|\ \ \ | | | | | | | | | do not try to extract image infos from 0- or better less than 12-byte length files. | ||||
| * | | | Update image.php | j-ed | 2013-03-02 | 1 | -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-master | Thomas Müller | 2013-03-02 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | change bug tracker links to https://github.com/owncloud/core/blob/master... | ||||
| * \ \ \ | Merge branch 'master' into fixing-bugtracker-link-master | Lukas Reschke | 2013-03-01 | 46 | -749/+591 |
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | Conflicts: core/templates/exception.php settings/templates/help.php | ||||
| * | | | | change bug tracker links to ↵ | Thomas Mueller | 2013-03-01 | 2 | -3/+3 |
| | |_|/ | |/| | | | | | | | | | | https://github.com/owncloud/core/blob/master/CONTRIBUTING.md | ||||
* | | | | Merge pull request #2022 from owncloud/fix-notice | Thomas Müller | 2013-03-01 | 1 | -1/+2 |
|\ \ \ \ | | | | | | | | | | | Fix notice | ||||
| * | | | | 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 | ||||
| * | | | 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 |
|\ \ \ | |/ / |/| | | Replace insane auto sanitization with p() | ||||
| * | | 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 |
| | |\ \ | |_|/ / |/| | | | | | | | | | | | Conflicts: apps/files/templates/index.php | ||||
| * | | | 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 |
|\ \ \ | | | | | | | | | validate the generated email address and fall back to localhost.localdom... | ||||
| * | | | validate the generated email address and fall back to localhost.localdomain ↵ | Thomas Mueller | 2013-03-01 | 1 | -4/+7 |
|/ / / | | | | | | | | | | | | | | | | in case it is not valid fixes #1844 | ||||
* | | | Merge pull request #2015 from owncloud/fixing-2001-master | Bernhard Posselt | 2013-03-01 | 1 | -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 Mueller | 2013-03-01 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | files/folders a clear warning is displayed | ||||
* | | | | Merge pull request #2014 from owncloud/fixing-1909-master | Bernhard Posselt | 2013-03-01 | 1 | -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 Mueller | 2013-03-01 | 1 | -0/+3 |
|/ / / | | | | | | | | | | the peer cannot be verified. | ||||
* | | | Merge pull request #2005 from owncloud/trash_add_signals | Bernhard Posselt | 2013-03-01 | 1 | -0/+6 |
|\ \ \ | | | | | | | | | add post_moveToTrash and post_restore signals to the trash bin | ||||
| * | | | add additional parameter to signal | Björn Schießle | 2013-03-01 | 1 | -2/+6 |
| | | | | |||||
| * | | | add post_moveToTrash and post_restore signals to the trash bin | Björn Schießle | 2013-03-01 | 1 | -0/+2 |
| | | | | |||||
* | | | | Merge pull request #2007 from owncloud/fix_1834_master | Bernhard Posselt | 2013-03-01 | 2 | -8/+10 |
|\ \ \ \ | | | | | | | | | | | make sure that the version app always works on the users real home folder [master] | ||||
| * | | | | fix getVersions() call for the history view | Björn Schießle | 2013-03-01 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | make sure that the version app always work on the users real home folder and ↵ | Björn Schießle | 2013-03-01 | 1 | -7/+8 |
| |/ / / | | | | | | | | | | | | | not on the mount point | ||||
* | | | | Merge pull request #2008 from owncloud/1999-requesttoken | Frank Karlitschek | 2013-03-01 | 1 | -3/+7 |
|\ \ \ \ | |/ / / |/| | | | Check if requesttoken exists in session | ||||
| * | | | Check if requesttoken exists in session | Lukas Reschke | 2013-03-01 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | Ref #1999 | ||||
| * | | | Style fixes | Lukas Reschke | 2013-03-01 | 1 | -3/+3 |
| | | | | |||||
* | | | | 5.0 RC 1v5.0.0RC1 | Frank Karlitschek | 2013-03-01 | 1 | -2/+2 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-01 | 171 | -340/+441 |
| | | | | |||||
* | | | | Merge pull request #1979 from maelzx/patch-2 | Lukas Reschke | 2013-02-28 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Fix window.location mistakes in previous code | ||||
| * | | | | Fix window.location mistakes in previous code | maelzx | 2013-02-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Sorry guys, I commit the incomplete code. It should be window.location.assign(url); However this is just tested in google chrome. | ||||
* | | | | | Merge pull request #1992 from owncloud/fix-heartbeat | Lukas Reschke | 2013-02-28 | 1 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | The router base url is without / on the end | ||||
| * | | | | | The router base url is without / on the end | Bart Visscher | 2013-02-28 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | Merge pull request #1937 from owncloud/check-resharing | Bart Visscher | 2013-02-28 | 2 | -3/+28 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Check resharing setting | ||||
| * | | | | | Check resharing setting | Michael Gapczynski | 2013-02-26 | 2 | -3/+28 |
| | | | | | | |||||
| | | | * | | Sed was wrong | Lukas Reschke | 2013-02-28 | 1 | -1/+1 |
| | | | | | |