summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Show original path information in trashbin and sharing viewsRobin McCorkell2014-09-112-0/+6
* fix notification visibility, fix #11016Jan-Christoph Borchardt2014-09-111-1/+1
* Merge pull request #11007 from owncloud/replaces-10850Thomas Müller2014-09-113-1/+3
|\
| * Add X-UA-Compatible to all templatesLukas Reschke2014-09-113-1/+3
* | Merge pull request #3937 from owncloud/refresh_if_maintenance_is_overLukas Reschke2014-09-112-1/+21
|\ \ | |/ |/|
| * Refresh if maintenance mode is overkondou2014-09-092-1/+21
* | [tx-robot] updated from transifexJenkins for ownCloud2014-09-113-45/+166
* | [tx-robot] updated from transifexJenkins for ownCloud2014-09-1012-0/+15
* | Merge pull request #9512 from libasys/patch-2Lukas Reschke2014-09-091-1/+2
|\ \ | |/ |/|
| * Fix use Sharing Api with calendarlibasys2014-07-081-2/+3
* | Merge pull request #10948 from owncloud/fix-zindexLukas Reschke2014-09-091-3/+3
|\ \
| * | fix z-index of header and dropdowns, fix user menu not showing on mobileJan-Christoph Borchardt2014-09-081-3/+3
* | | Merge pull request #9753 from owncloud/filepath-cssThomas Müller2014-09-092-1/+21
|\ \ \
| * | | Add beforeeach and aftereachLukas Reschke2014-09-091-4/+6
| * | | Add unittest for filePathLukas Reschke2014-09-091-0/+18
| * | | Remove special case for css in OC.filePathRobin Appelman2014-07-211-1/+1
* | | | Merge pull request #10928 from owncloud/allow_dot_in_dbname_on_web_installLukas Reschke2014-09-091-0/+3
|\ \ \ \
| * | | | allow . in dbname on web installJörn Friedrich Dreyer2014-09-081-0/+3
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-0936-36/+0
* | | | | Merge pull request #10858 from owncloud/issue/10847VicDeo2014-09-091-1/+1
|\ \ \ \ \
| * | | | | Fix broken new lines in plain text mail templateJoas Schilling2014-09-041-1/+1
* | | | | | Merge pull request #10944 from owncloud/fix-nojavascript-styleJan-Christoph Borchardt2014-09-084-15/+17
|\ \ \ \ \ \
| * | | | | | also add no-JavaScript notice to log in and sharing pages because they do not...Jan-Christoph Borchardt2014-09-083-2/+4
| * | | | | | fix styling and wording of no-JavaScript messageJan-Christoph Borchardt2014-09-082-14/+14
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #10739 from owncloud/eventsource-publicLukas Reschke2014-09-081-1/+1
|\ \ \ \ \ \
| * | | | | | Better phpdoc and method namingRobin Appelman2014-09-041-1/+1
| * | | | | | Use the public api to get event sourcesRobin Appelman2014-09-031-1/+1
| |/ / / / /
* | | | | | Merge pull request #10755 from owncloud/shorter_sharing_linksLukas Reschke2014-09-085-5/+37
|\ \ \ \ \ \
| * | | | | | Use a route instead of s.php and convert tokens asapkondou2014-09-046-8/+33
| * | | | | | Initial work on shorter linkskondou2014-09-042-2/+9
* | | | | | | Merge pull request #10451 from k4k/login_logo_alignment_fixVolkan Gezer2014-09-082-3/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | improve logo flexibility to fix wide custom logo alignment, fix #9339twood82014-08-152-3/+1
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-071-0/+3
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-061-4/+4
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-051-0/+4
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #10818 from owncloud/enableappforgroupfixLukas Reschke2014-09-041-0/+4
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix upgrade process when apps enabled for specific groupsVincent Petry2014-09-021-0/+4
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-0458-114/+0
* | | | | | Merge pull request #10667 from pmjdebruijn/itunes-appidThomas Müller2014-09-032-2/+2
|\ \ \ \ \ \
| * | | | | | templates: use p() for getiTunesAppIdPascal de Bruijn2014-08-282-2/+2
| * | | | | | defaults: add customizable defaultiTunesAppIdPascal de Bruijn2014-08-272-2/+2
* | | | | | | Merge pull request #10642 from owncloud/securityutilsLukas Reschke2014-09-032-8/+0
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Merge branch 'master' into securityutilsLukas Reschke2014-08-31128-908/+9294
| |\ \ \ \ \ \
| * | | | | | | Add some security utilitiesLukas Reschke2014-08-272-8/+0
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-031-0/+5
* | | | | | | | also style submit buttonsBernhard Posselt2014-09-021-1/+2
| |_|_|/ / / / |/| | | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-021-1/+2
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-012-0/+10
* | | | | | | Add app utilities - CSS menus for sidebarBernhard Posselt2014-08-313-7/+199
| |/ / / / / |/| | | | |
* | | | | | Use public api for getting l10nRobin Appelman2014-08-315-7/+7