Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [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 |
|\ \ | |||||
| * | | validate the generated email address and fall back to localhost.localdomain i... | Thomas Mueller | 2013-03-01 | 1 | -4/+7 |
|/ / | |||||
* | | Merge pull request #2015 from owncloud/fixing-2001-master | Bernhard Posselt | 2013-03-01 | 1 | -1/+2 |
|\ \ | |||||
| * | | fixes #2001 - in case the user has no permissions to upload/create files/fold... | Thomas Mueller | 2013-03-01 | 1 | -1/+2 |
* | | | 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 and th... | Thomas Mueller | 2013-03-01 | 1 | -0/+3 |
|/ / | |||||
* | | Merge pull request #2005 from owncloud/trash_add_signals | Bernhard Posselt | 2013-03-01 | 1 | -0/+6 |
|\ \ | |||||
| * | | 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 |
|\ \ \ | |||||
| * | | | 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 |
| |/ / | |||||
* | | | Merge pull request #2008 from owncloud/1999-requesttoken | Frank Karlitschek | 2013-03-01 | 1 | -3/+7 |
|\ \ \ | |/ / |/| | | |||||
| * | | Check if requesttoken exists in session | Lukas Reschke | 2013-03-01 | 1 | -0/+4 |
| * | | 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 | maelzx | 2013-02-28 | 1 | -1/+1 |
* | | | | 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 | 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 | Michael Gapczynski | 2013-02-26 | 2 | -3/+28 |
| | | | * | Sed was wrong | Lukas Reschke | 2013-02-28 | 1 | -1/+1 |
| | | | * | Merge master | Lukas Reschke | 2013-02-28 | 248 | -3759/+2737 |
| | | | |\ | |_|_|_|/ |/| | | | | |||||
* | | | | | Merge pull request #1988 from owncloud/permissionscache_clean | icewind1991 | 2013-02-28 | 2 | -10/+18 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Cache: cleanup permissions cache when removing a file from the cache | Robin Appelman | 2013-02-28 | 1 | -0/+3 |
| * | | | | Cache: add option to delete file from permissions cache for all users | Robin Appelman | 2013-02-28 | 1 | -10/+15 |
* | | | | | Merge pull request #1989 from owncloud/selectSanitize | Björn Schießle | 2013-02-28 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Sanitize HTML in html_select_options | Lukas Reschke | 2013-02-28 | 1 | -1/+1 |
* | | | | | Merge pull request #1987 from owncloud/fixinstalldeps | Bernhard Posselt | 2013-02-28 | 1 | -1/+10 |
|\ \ \ \ \ | |||||
| * | | | | | add checks for xml and dom when installing | Bernhard Posselt | 2013-02-28 | 1 | -1/+10 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #1397 from owncloud/trash_fileactions | Jan-Christoph Borchardt | 2013-02-28 | 4 | -31/+72 |
|\ \ \ \ \ | |||||
| * | | | | | Trash: fix opening folders | Robin Appelman | 2013-02-28 | 1 | -2/+4 |
| * | | | | | Trash: disable text editor from trash for now | Robin Appelman | 2013-02-27 | 1 | -0/+4 |
| * | | | | | Trash: fix download.php | Robin Appelman | 2013-02-27 | 1 | -1/+1 |
| * | | | | | Trash: fix trash when default quota is used | Robin Appelman | 2013-02-27 | 1 | -1/+1 |
| * | | | | | Merge master into trash_fileactions | Robin Appelman | 2013-02-27 | 1359 | -26581/+90396 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | merge master into trash_fileactions | Robin Appelman | 2013-02-08 | 823 | -16352/+28509 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Trash: use the same sorting algoritm as files | Robin Appelman | 2013-01-31 | 1 | -0/+12 |
| * | | | | | | | Trash: fix opening folders | Robin Appelman | 2013-01-31 | 1 | -0/+2 |
| * | | | | | | | Trash: enable fileactions while viewing trash | Robin Appelman | 2013-01-31 | 1 | -9/+27 |
| * | | | | | | | Trash: don't use depricated filesystem api classes | Robin Appelman | 2013-01-31 | 2 | -107/+107 |