summaryrefslogtreecommitdiffstats
path: root/core/templates
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1902 from owncloud/angularcspFrank Karlitschek2013-02-263-3/+3
|\
| * add CSP turned on for angularjsBernhard Posselt2013-02-253-3/+3
* | Merge branch 'master' of github.com:owncloud/core into issue_1776Qingping Hou2013-02-252-5/+17
|\ \
| * \ Merge pull request #1837 from owncloud/fix-user-templateLukas Reschke2013-02-251-1/+1
| |\ \
| | * | Remove unneeded code for user layout templateBart Visscher2013-02-221-1/+1
| * | | Merge branch 'master' into master-sqlserverThomas Mueller2013-02-226-27/+55
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'master' into master-sqlserverThomas Mueller2013-02-182-3/+3
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'master' into master-sqlserverThomas Mueller2013-02-142-3/+3
| |\ \ \
| * \ \ \ Merge branch 'master' into master-sqlserverThomas Mueller2013-02-125-11/+10
| |\ \ \ \
| * | | | | Bugfixes and cleanup MS SQL Server installationAdministrator2013-02-101-1/+1
| * | | | | Added MS SQL Server supportTobias Ramforth2013-02-081-4/+16
* | | | | | add span tag to displayname on expand buttonQingping Hou2013-02-251-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge pull request #1711 from owncloud/style-cleanupJörn Friedrich Dreyer2013-02-226-26/+54
|\ \ \ \ \
| * | | | | Fix review issuesBart Visscher2013-02-221-4/+4
| * | | | | Join split translated stringsBart Visscher2013-02-212-11/+5
| * | | | | Style cleanup core dirBart Visscher2013-02-217-30/+64
| | |_|_|/ | |/| | |
* / | | | fix giant advanced caret in installationJan-Christoph Borchardt2013-02-211-1/+1
|/ / / /
* | | | Fix strict standard warning in user templateRobin Appelman2013-02-151-1/+1
* | | | Merge pull request #1683 from owncloud/ie-fixesJan-Christoph Borchardt2013-02-152-2/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | exchange bright caret with dark triangleJan-Christoph Borchardt2013-02-141-1/+1
| * | | fix navigation icons SVG replacement, also hover and active opacity for IEJan-Christoph Borchardt2013-02-141-1/+1
| * | | fix caret on installation page for IEJan-Christoph Borchardt2013-02-141-1/+1
| | |/ | |/|
* | | Merge pull request #1662 from owncloud/style-cleanupBart Visscher2013-02-141-2/+2
|\ \ \
| * | | Fix indentation styleBart Visscher2013-02-141-2/+2
| |/ /
* / / Sanitize HTMLLukas Reschke2013-02-141-1/+1
|/ /
* | Merge pull request #1538 from raghunayyar/admin-password-toggleJan-Christoph Borchardt2013-02-101-1/+1
|\ \
| * | Removed whitespace from installation.phpraghunayyar2013-02-081-3/+3
| * | Password Toggle Works on Installation as well.raghunayyar2013-02-081-4/+4
* | | use proper HTML for other security warning tooJan-Christoph Borchardt2013-02-081-3/+2
* | | improve and shorten security warning, add link to docs, fix #1342Jan-Christoph Borchardt2013-02-081-1/+2
|/ /
* | Merge pull request #1514 from owncloud/fix-setupLukas Reschke2013-02-073-3/+0
|\ \
| * | Move loading of js_config to templatelayoutBart Visscher2013-02-073-3/+0
| |/
* | Merge pull request #1529 from owncloud/installation-login-fixesThomas Müller2013-02-072-3/+5
|\ \
| * | make show password toggle work for installation (once #1525 is fixed)Jan-Christoph Borchardt2013-02-071-2/+4
| * | make show password not specific to log inJan-Christoph Borchardt2013-02-071-1/+1
| |/
* / Fix warning with displayname in user layout templateBart Visscher2013-02-071-1/+1
|/
* fix shorttag issue mentioned in #1357Jan-Christoph Borchardt2013-02-061-2/+2
* Merge pull request #1497 from owncloud/collapse-usermenuJan-Christoph Borchardt2013-02-061-1/+1
|\
| * collapse user menu when inside one of the settings sectionsJan-Christoph Borchardt2013-02-061-1/+1
* | Merge pull request #1357 from owncloud/alternative-loging-masterThomas Müller2013-02-061-1/+15
|\ \ | |/ |/|
| * move inline style to CSS file, fix detailsJan-Christoph Borchardt2013-02-061-3/+3
| * add support for apps to register alternative login methodsThomas Mueller2013-01-291-1/+15
* | Password Toggle Support for Loginraghunayyar2013-02-031-2/+4
* | use translate string for Log out, remove titleJan-Christoph Borchardt2013-01-311-2/+2
* | fix svg fallback replacement for settings iconsJan-Christoph Borchardt2013-01-311-1/+1
* | use new user function to display real name if available, username still fallbackJan-Christoph Borchardt2013-01-301-1/+1
* | Merge branch 'master' into navigationJan-Christoph Borchardt2013-01-301-1/+1
|\ \
| * \ Merge pull request #1360 from owncloud/display_nameLukas Reschke2013-01-291-1/+1
| |\ \ | | |/ | |/|
| | * prevent xssBjörn Schießle2013-01-291-1/+1
| | * add display name to title instead if login-IDBjörn Schießle2013-01-241-1/+1