Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1902 from owncloud/angularcsp | Frank Karlitschek | 2013-02-26 | 3 | -3/+3 |
|\ | |||||
| * | add CSP turned on for angularjs | Bernhard Posselt | 2013-02-25 | 3 | -3/+3 |
* | | Merge branch 'master' of github.com:owncloud/core into issue_1776 | Qingping Hou | 2013-02-25 | 2 | -5/+17 |
|\ \ | |||||
| * \ | Merge pull request #1837 from owncloud/fix-user-template | Lukas Reschke | 2013-02-25 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Remove unneeded code for user layout template | Bart Visscher | 2013-02-22 | 1 | -1/+1 |
| * | | | Merge branch 'master' into master-sqlserver | Thomas Mueller | 2013-02-22 | 6 | -27/+55 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Merge branch 'master' into master-sqlserver | Thomas Mueller | 2013-02-18 | 2 | -3/+3 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Merge branch 'master' into master-sqlserver | Thomas Mueller | 2013-02-14 | 2 | -3/+3 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into master-sqlserver | Thomas Mueller | 2013-02-12 | 5 | -11/+10 |
| |\ \ \ \ | |||||
| * | | | | | Bugfixes and cleanup MS SQL Server installation | Administrator | 2013-02-10 | 1 | -1/+1 |
| * | | | | | Added MS SQL Server support | Tobias Ramforth | 2013-02-08 | 1 | -4/+16 |
* | | | | | | add span tag to displayname on expand button | Qingping Hou | 2013-02-25 | 1 | -1/+1 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge pull request #1711 from owncloud/style-cleanup | Jörn Friedrich Dreyer | 2013-02-22 | 6 | -26/+54 |
|\ \ \ \ \ | |||||
| * | | | | | Fix review issues | Bart Visscher | 2013-02-22 | 1 | -4/+4 |
| * | | | | | Join split translated strings | Bart Visscher | 2013-02-21 | 2 | -11/+5 |
| * | | | | | Style cleanup core dir | Bart Visscher | 2013-02-21 | 7 | -30/+64 |
| | |_|_|/ | |/| | | | |||||
* / | | | | fix giant advanced caret in installation | Jan-Christoph Borchardt | 2013-02-21 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Fix strict standard warning in user template | Robin Appelman | 2013-02-15 | 1 | -1/+1 |
* | | | | Merge pull request #1683 from owncloud/ie-fixes | Jan-Christoph Borchardt | 2013-02-15 | 2 | -2/+2 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | exchange bright caret with dark triangle | Jan-Christoph Borchardt | 2013-02-14 | 1 | -1/+1 |
| * | | | fix navigation icons SVG replacement, also hover and active opacity for IE | Jan-Christoph Borchardt | 2013-02-14 | 1 | -1/+1 |
| * | | | fix caret on installation page for IE | Jan-Christoph Borchardt | 2013-02-14 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge pull request #1662 from owncloud/style-cleanup | Bart Visscher | 2013-02-14 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | Fix indentation style | Bart Visscher | 2013-02-14 | 1 | -2/+2 |
| |/ / | |||||
* / / | Sanitize HTML | Lukas Reschke | 2013-02-14 | 1 | -1/+1 |
|/ / | |||||
* | | 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 |