Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1569 from owncloud/clean-app-id | Thomas Müller | 2013-02-09 | 1 | -0/+1 |
|\ | | | | | Remove invalid characters from app id to prevent loading of invalid reso... | ||||
| * | Merge branch 'master' into clean-app-id | Thomas Müller | 2013-02-09 | 47 | -109/+101 |
| |\ | |||||
| * | | Remove invalid characters from app id to prevent loading of invalid resources | Bart Visscher | 2013-02-09 | 1 | -0/+1 |
| | | | |||||
* | | | added icons and mimetypes for .msi and .exe files | Bernhard Posselt | 2013-02-09 | 1 | -0/+0 |
| | | | |||||
* | | | Merge pull request #1561 from Raydiation/master | Jörn Friedrich Dreyer | 2013-02-09 | 1 | -0/+2 |
|\ \ \ | | | | | | | | | Moved the iframe height and width fix from js to css | ||||
| * | | | moved iframe height and width fix from js to css | Bernhard Posselt | 2013-02-09 | 1 | -0/+2 |
| | | | | |||||
* | | | | Revert "moved iframe height and width fix from js to css" | Bernhard Posselt | 2013-02-09 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | This reverts commit 842fc85b9a42aaa0ce31c71e05507ed5eeaa6dc4. | ||||
* | | | | Revert "added exe and msi filetypes and icon" | Bernhard Posselt | 2013-02-09 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | This reverts commit aa1adf42c74569f2591a59855bf370584ed1e5cc. | ||||
* | | | | added exe and msi filetypes and icon | Bernhard Posselt | 2013-02-09 | 1 | -0/+0 |
| | | | | |||||
* | | | | moved iframe height and width fix from js to css | Bernhard Posselt | 2013-02-09 | 1 | -0/+2 |
| |_|/ |/| | | |||||
* | | | Merge pull request #1481 from owncloud/fixing-1354-master | Thomas Müller | 2013-02-09 | 2 | -1/+5 |
|\ \ \ | | | | | | | | | basic WebDAV test in place now | ||||
| * \ \ | Merge branch 'master' into fixing-1354-master | Thomas Mueller | 2013-02-07 | 4 | -7/+39 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: settings/admin.php settings/templates/admin.php | ||||
| * | | | | Execute the post setup check after finishing the setup | Bart Visscher | 2013-02-06 | 2 | -1/+5 |
| | | | | | |||||
* | | | | | Merge pull request #1545 from owncloud/fix-oc_webroot | Thomas Müller | 2013-02-09 | 1 | -1/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | fixup oc_webroot correctly before and after setup | ||||
| * | | | | | fix-oc_webroot | Bart Visscher | 2013-02-08 | 1 | -1/+3 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #1537 from owncloud/fix_sharing_dropdown_event_handlers | Thomas Müller | 2013-02-09 | 1 | -60/+71 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | attach handlers to document instead of filelist | ||||
| * | | | | attach handlers to document instead of filelist, minor whitespace cleanups | Jörn Friedrich Dreyer | 2013-02-08 | 1 | -60/+71 |
| |/ / / | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-09 | 41 | -41/+15 |
| | | | | |||||
* | | | | Merge pull request #1547 from owncloud/navigation-color | Thomas Müller | 2013-02-08 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | brighter grey for the navigation bar | ||||
| * | | | | brighter grey for the navigation bar, hopefully solves the weird similarity ↵ | Jan-Christoph Borchardt | 2013-02-08 | 1 | -2/+2 |
| |/ / / | | | | | | | | | | | | | to the header | ||||
* | | | | 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 | 2 | -1/+3 |
|/ / / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-08 | 53 | -53/+13 |
| | | | |||||
* | | | Merge pull request #1514 from owncloud/fix-setup | Lukas Reschke | 2013-02-07 | 5 | -8/+7 |
|\ \ \ | | | | | | | | | Fix setup | ||||
| * | | | Fill oc_webroot with the expected value | Bart Visscher | 2013-02-07 | 1 | -0/+1 |
| | | | | |||||
| * | | | Fix disabling setup form on submit | Bart Visscher | 2013-02-07 | 1 | -5/+3 |
| | | | | |||||
| * | | | Define the variables that are expected to exist but won't be set in setup | Bart Visscher | 2013-02-07 | 1 | -0/+3 |
| | | | | |||||
| * | | | Move loading of js_config to templatelayout | Bart Visscher | 2013-02-07 | 3 | -3/+0 |
| | | | | | | | | | | | | | | | | Also check for installed flag because this isn't available before setup | ||||
* | | | | Merge pull request #1529 from owncloud/installation-login-fixes | Thomas Müller | 2013-02-07 | 3 | -28/+22 |
|\ \ \ \ | | | | | | | | | | | Installation login fixes | ||||
| * | | | | make show password toggle work for installation (once #1525 is fixed) | Jan-Christoph Borchardt | 2013-02-07 | 2 | -4/+6 |
| | | | | | |||||
| * | | | | make show password not specific to log in | Jan-Christoph Borchardt | 2013-02-07 | 2 | -7/+6 |
| | | | | | |||||
| * | | | | remove duplicate show password toggle code, move current one to proper location | Jan-Christoph Borchardt | 2013-02-07 | 1 | -19/+11 |
| | | | | | |||||
| * | | | | some comments for CSS documentation | Jan-Christoph Borchardt | 2013-02-07 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | fix database labels having left padding | Jan-Christoph Borchardt | 2013-02-07 | 1 | -0/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #1526 from owncloud/l10n-support-master | Lukas Reschke | 2013-02-07 | 2 | -3/+3 |
|\ \ \ \ | | | | | | | | | | | L10n support master | ||||
| * | | | | l10n support enhanced in core | Thomas Mueller | 2013-02-07 | 2 | -3/+3 |
| |/ / / | |||||
* | | | | Merge pull request #1530 from owncloud/fix-warning-displayname-layout | blizzz | 2013-02-07 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | Fix warning with displayname in user layout template | ||||
| * | | | Fix warning with displayname in user layout template | Bart Visscher | 2013-02-07 | 1 | -1/+1 |
| |/ / | |||||
* / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-07 | 1 | -0/+3 |
|/ / | |||||
* | | fix shorttag issue mentioned in #1357 | Jan-Christoph Borchardt | 2013-02-06 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #1459 from owncloud/infield-detail | Jan-Christoph Borchardt | 2013-02-06 | 1 | -1/+1 |
|\ \ | | | | | | | shift infield labels just a tiny bit to the right so the cursor doesn't ... | ||||
| * | | shift infield labels just a tiny bit to the right so the cursor doesn't overlap | Jan-Christoph Borchardt | 2013-02-05 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #1428 from owncloud/content_positioning | Thomas Tanghus | 2013-02-06 | 1 | -3/+11 |
|\ \ \ | | | | | | | | | Fix leftcontent positioning. Ref #1255 | ||||
| * | | | Reduce top position for content below controls. | Thomas Tanghus | 2013-02-06 | 1 | -1/+1 |
| | | | | |||||
| * | | | Add 'hascontrols' class for content with fixed topbar. | Thomas Tanghus | 2013-02-04 | 1 | -1/+9 |
| | | | | |||||
| * | | | Add box-sizing to controls. | Thomas Tanghus | 2013-02-04 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix leftcontent positioning. Ref #1255 | Thomas Tanghus | 2013-02-03 | 1 | -3/+3 |
| | | | | |||||
* | | | | Merge pull request #1497 from owncloud/collapse-usermenu | Jan-Christoph Borchardt | 2013-02-06 | 2 | -2/+5 |
|\ \ \ \ | | | | | | | | | | | collapse user menu when inside one of the settings sections | ||||
| * | | | | collapse user menu when inside one of the settings sections | Jan-Christoph Borchardt | 2013-02-06 | 2 | -2/+5 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #1357 from owncloud/alternative-loging-master | Thomas Müller | 2013-02-06 | 2 | -1/+19 |
|\ \ \ \ | |/ / / |/| | | | add support for apps to register alternative login methods |