summaryrefslogtreecommitdiffstats
path: root/core/templates
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | merge stylesJan-Christoph Borchardt2013-01-285-67/+10
|\| |
| * | Merge branch 'master' into updater-CSPThomas Mueller2013-01-283-2/+7
| |\ \
| | * | Use global oc_requesttoken for Event SourceMichael Gapczynski2013-01-261-1/+0
| | * | Merge pull request #1059 from owncloud/fixing-998-masterThomas Müller2013-01-261-1/+4
| | |\ \
| | | * \ Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-186-69/+52
| | | |\ \
| | | * | | fixing text-align on navigation menu - closing div was missing - THX LukasThomas Mueller2013-01-111-1/+1
| | | * | | displaying notification now centeredThomas Mueller2013-01-111-1/+4
| | * | | | Merge pull request #1306 from owncloud/smart-app-bannerThomas Müller2013-01-262-0/+2
| | |\ \ \ \
| | | * | | | add smart app banner to promote ios appGeorg Ehrke2013-01-252-0/+2
| | | | |_|/ | | | |/| |
| * | / | | Move update inline JSLukas Reschke2013-01-251-27/+1
| |/ / / /
| * | | | Fix merge conflictLukas Reschke2013-01-231-12/+0
| * | | | Fix merge conflictLukas Reschke2013-01-231-8/+0
| * | | | Merge master...Lukas Reschke2013-01-232-0/+20
| |\| | |
| | * | | Merge pull request #1113 from owncloud/fix-issue-1085Michael Gapczynski2013-01-222-2/+0
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Merge branch 'master' into fix-issue-1085Michael Gapczynski2013-01-071-1/+1
| | | |\|
| | | * | Move template parameters around so database error page is properly renderedMichael Gapczynski2013-01-072-2/+0
| * | | | Move timezone check to external JSLukas Reschke2013-01-211-6/+1
| * | | | Move config to core/js/config.phpLukas Reschke2013-01-213-34/+3
| |/ / /
* | | | fix up content and content-wrapper merge ...Jan-Christoph Borchardt2013-01-183-49/+51
|\| | |
| * | | dont resize content div with javascript but use css box-sizing to do itBernhard Posselt2013-01-161-2/+4
| * | | Spaces to tabsBart Visscher2013-01-161-43/+43
| * | | Merge branch 'master' into fixing-unused-and-undefined-in-masterThomas Mueller2013-01-143-20/+1
| |\ \ \
| * | | | fixing <input> tagThomas Mueller2013-01-071-4/+4
| | |_|/ | |/| |
* | | | new app icon style for new designJan-Christoph Borchardt2013-01-171-1/+1
* | | | merge master into navigationJan-Christoph Borchardt2013-01-156-50/+80
|\ \ \ \ | | |/ / | |/| |