Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1538 from raghunayyar/admin-password-toggle | Jan-Christoph Borchardt | 2013-02-10 | 1 | -1/+1 |
|\ | |||||
| * | Removed whitespace from installation.php | raghunayyar | 2013-02-08 | 1 | -3/+3 |
| * | Password Toggle Works on Installation as well. | raghunayyar | 2013-02-08 | 1 | -4/+4 |
* | | use proper HTML for other security warning too | Jan-Christoph Borchardt | 2013-02-08 | 1 | -3/+2 |
* | | improve and shorten security warning, add link to docs, fix #1342 | Jan-Christoph Borchardt | 2013-02-08 | 1 | -1/+2 |
|/ | |||||
* | Merge pull request #1514 from owncloud/fix-setup | Lukas Reschke | 2013-02-07 | 3 | -3/+0 |
|\ | |||||
| * | Move loading of js_config to templatelayout | Bart Visscher | 2013-02-07 | 3 | -3/+0 |
* | | Merge pull request #1529 from owncloud/installation-login-fixes | Thomas Müller | 2013-02-07 | 2 | -3/+5 |
|\ \ | |||||
| * | | make show password toggle work for installation (once #1525 is fixed) | Jan-Christoph Borchardt | 2013-02-07 | 1 | -2/+4 |
| * | | make show password not specific to log in | Jan-Christoph Borchardt | 2013-02-07 | 1 | -1/+1 |
| |/ | |||||
* / | Fix warning with displayname in user layout template | Bart Visscher | 2013-02-07 | 1 | -1/+1 |
|/ | |||||
* | fix shorttag issue mentioned in #1357 | Jan-Christoph Borchardt | 2013-02-06 | 1 | -2/+2 |
* | Merge pull request #1497 from owncloud/collapse-usermenu | Jan-Christoph Borchardt | 2013-02-06 | 1 | -1/+1 |
|\ | |||||
| * | collapse user menu when inside one of the settings sections | Jan-Christoph Borchardt | 2013-02-06 | 1 | -1/+1 |
* | | Merge pull request #1357 from owncloud/alternative-loging-master | Thomas Müller | 2013-02-06 | 1 | -1/+15 |
|\ \ | |/ |/| | |||||
| * | move inline style to CSS file, fix details | Jan-Christoph Borchardt | 2013-02-06 | 1 | -3/+3 |
| * | add support for apps to register alternative login methods | Thomas Mueller | 2013-01-29 | 1 | -1/+15 |
* | | Password Toggle Support for Login | raghunayyar | 2013-02-03 | 1 | -2/+4 |
* | | use translate string for Log out, remove title | Jan-Christoph Borchardt | 2013-01-31 | 1 | -2/+2 |
* | | fix svg fallback replacement for settings icons | Jan-Christoph Borchardt | 2013-01-31 | 1 | -1/+1 |
* | | use new user function to display real name if available, username still fallback | Jan-Christoph Borchardt | 2013-01-30 | 1 | -1/+1 |
* | | Merge branch 'master' into navigation | Jan-Christoph Borchardt | 2013-01-30 | 1 | -1/+1 |
|\ \ | |||||
| * \ | Merge pull request #1360 from owncloud/display_name | Lukas Reschke | 2013-01-29 | 1 | -1/+1 |
| |\ \ | | |/ | |/| | |||||
| | * | prevent xss | Björn Schießle | 2013-01-29 | 1 | -1/+1 |
| | * | add display name to title instead if login-ID | Björn Schießle | 2013-01-24 | 1 | -1/+1 |
* | | | merge styles | Jan-Christoph Borchardt | 2013-01-28 | 5 | -67/+10 |
|\| | | |||||
| * | | Merge branch 'master' into updater-CSP | Thomas Mueller | 2013-01-28 | 3 | -2/+7 |
| |\ \ | |||||
| | * | | Use global oc_requesttoken for Event Source | Michael Gapczynski | 2013-01-26 | 1 | -1/+0 |
| | * | | Merge pull request #1059 from owncloud/fixing-998-master | Thomas Müller | 2013-01-26 | 1 | -1/+4 |
| | |\ \ | |||||
| | | * \ | Merge branch 'master' into fixing-998-master | Thomas Mueller | 2013-01-18 | 6 | -69/+52 |
| | | |\ \ | |||||
| | | * | | | fixing text-align on navigation menu - closing div was missing - THX Lukas | Thomas Mueller | 2013-01-11 | 1 | -1/+1 |
| | | * | | | displaying notification now centered | Thomas Mueller | 2013-01-11 | 1 | -1/+4 |
| | * | | | | Merge pull request #1306 from owncloud/smart-app-banner | Thomas Müller | 2013-01-26 | 2 | -0/+2 |
| | |\ \ \ \ | |||||
| | | * | | | | add smart app banner to promote ios app | Georg Ehrke | 2013-01-25 | 2 | -0/+2 |
| | | | |_|/ | | | |/| | | |||||
| * | / | | | Move update inline JS | Lukas Reschke | 2013-01-25 | 1 | -27/+1 |
| |/ / / / | |||||
| * | | | | Fix merge conflict | Lukas Reschke | 2013-01-23 | 1 | -12/+0 |
| * | | | | Fix merge conflict | Lukas Reschke | 2013-01-23 | 1 | -8/+0 |
| * | | | | Merge master... | Lukas Reschke | 2013-01-23 | 2 | -0/+20 |
| |\| | | | |||||
| | * | | | Merge pull request #1113 from owncloud/fix-issue-1085 | Michael Gapczynski | 2013-01-22 | 2 | -2/+0 |
| | |\ \ \ | | | |_|/ | | |/| | | |||||
| | | * | | Merge branch 'master' into fix-issue-1085 | Michael Gapczynski | 2013-01-07 | 1 | -1/+1 |
| | | |\| | |||||
| | | * | | Move template parameters around so database error page is properly rendered | Michael Gapczynski | 2013-01-07 | 2 | -2/+0 |
| * | | | | Move timezone check to external JS | Lukas Reschke | 2013-01-21 | 1 | -6/+1 |
| * | | | | Move config to core/js/config.php | Lukas Reschke | 2013-01-21 | 3 | -34/+3 |
| |/ / / | |||||
* | | | | fix up content and content-wrapper merge ... | Jan-Christoph Borchardt | 2013-01-18 | 3 | -49/+51 |
|\| | | | |||||
| * | | | dont resize content div with javascript but use css box-sizing to do it | Bernhard Posselt | 2013-01-16 | 1 | -2/+4 |
| * | | | Spaces to tabs | Bart Visscher | 2013-01-16 | 1 | -43/+43 |
| * | | | Merge branch 'master' into fixing-unused-and-undefined-in-master | Thomas Mueller | 2013-01-14 | 3 | -20/+1 |
| |\ \ \ | |||||
| * | | | | fixing <input> tag | Thomas Mueller | 2013-01-07 | 1 | -4/+4 |
| | |_|/ | |/| | | |||||
* | | | | new app icon style for new design | Jan-Christoph Borchardt | 2013-01-17 | 1 | -1/+1 |
* | | | | merge master into navigation | Jan-Christoph Borchardt | 2013-01-15 | 6 | -50/+80 |
|\ \ \ \ | | |/ / | |/| | |