summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix quoting of query for user_ldap ref #1983Brice Maron2013-03-021-3/+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
|\ \ \
| * | | validate the generated email address and fall back to localhost.localdomain i...Thomas Mueller2013-03-011-4/+7
|/ / /
* | | Merge pull request #2015 from owncloud/fixing-2001-masterBernhard Posselt2013-03-011-1/+2
|\ \ \
| * | | fixes #2001 - in case the user has no permissions to upload/create files/fold...Thomas Mueller2013-03-011-1/+2
* | | | 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 and th...Thomas Mueller2013-03-011-0/+3
|/ / /
* | | Merge pull request #2005 from owncloud/trash_add_signalsBernhard Posselt2013-03-011-0/+6
|\ \ \
| * | | 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
|\ \ \ \
| * | | | 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
| |/ / /
* | | | Merge pull request #2008 from owncloud/1999-requesttokenFrank Karlitschek2013-03-011-3/+7
|\ \ \ \ | |/ / / |/| | |
| * | | Check if requesttoken exists in sessionLukas Reschke2013-03-011-0/+4
| * | | Style fixesLukas Reschke2013-03-011-3/+3
* | | | 5.0 RC 1v5.0.0RC1Frank Karlitschek2013-03-011-2/+2
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-01171-340/+441
* | | | Merge pull request #1979 from maelzx/patch-2Lukas Reschke2013-02-281-1/+1
|\ \ \ \
| * | | | Fix window.location mistakes in previous codemaelzx2013-02-281-1/+1
* | | | | Merge pull request #1992 from owncloud/fix-heartbeatLukas Reschke2013-02-281-2/+2
|\ \ \ \ \
| * | | | | The router base url is without / on the endBart Visscher2013-02-281-2/+2
* | | | | | Merge pull request #1937 from owncloud/check-resharingBart Visscher2013-02-282-3/+28
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Check resharing settingMichael Gapczynski2013-02-262-3/+28
| | | | * | Sed was wrongLukas Reschke2013-02-281-1/+1
| | | | * | Merge masterLukas Reschke2013-02-28248-3759/+2737
| | | | |\ \ | |_|_|_|/ / |/| | | | |
* | | | | | Merge pull request #1988 from owncloud/permissionscache_cleanicewind19912013-02-282-10/+18
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Cache: cleanup permissions cache when removing a file from the cacheRobin Appelman2013-02-281-0/+3
| * | | | | Cache: add option to delete file from permissions cache for all usersRobin Appelman2013-02-281-10/+15
* | | | | | Merge pull request #1989 from owncloud/selectSanitizeBjörn Schießle2013-02-281-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Sanitize HTML in html_select_optionsLukas Reschke2013-02-281-1/+1
* | | | | | Merge pull request #1987 from owncloud/fixinstalldepsBernhard Posselt2013-02-281-1/+10
|\ \ \ \ \ \
| * | | | | | add checks for xml and dom when installingBernhard Posselt2013-02-281-1/+10
| | |_|/ / / | |/| | | |