Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-08 | 417 | -2774/+7832 |
* | Merge pull request #1527 from owncloud/simplyfy_file_mimetype_parsing | icewind1991 | 2013-02-07 | 1 | -4/+3 |
|\ | |||||
| * | simplyfy mimetype parsing of 'file' output | Jörn Friedrich Dreyer | 2013-02-07 | 1 | -4/+3 |
* | | Merge pull request #1514 from owncloud/fix-setup | Lukas Reschke | 2013-02-07 | 6 | -8/+10 |
|\ \ | |||||
| * | | 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 | 4 | -3/+3 |
* | | | Merge pull request #1529 from owncloud/installation-login-fixes | Thomas Müller | 2013-02-07 | 3 | -28/+22 |
|\ \ \ | |||||
| * | | | 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 #1507 from tripflex/master | Bart Visscher | 2013-02-07 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Remove left float from actions div class | Myles McNamara | 2013-02-06 | 1 | -1/+1 |
* | | | | Merge pull request #1526 from owncloud/l10n-support-master | Lukas Reschke | 2013-02-07 | 7 | -14/+25 |
|\ \ \ \ | |||||
| * | | | | l10n support enhanced in core | Thomas Mueller | 2013-02-07 | 2 | -3/+3 |
| * | | | | l10n support enhanced in files_versions | Thomas Mueller | 2013-02-07 | 1 | -1/+1 |
| * | | | | l10n support enhanced in files_trashbin | Thomas Mueller | 2013-02-07 | 2 | -3/+6 |
| * | | | | l10n support enhanced in files_version | Thomas Mueller | 2013-02-07 | 3 | -8/+16 |
* | | | | | Merge pull request #1530 from owncloud/fix-warning-displayname-layout | blizzz | 2013-02-07 | 2 | -1/+4 |
|\ \ \ \ \ | |||||
| * | | | | | Fix warning with displayname in user layout template | Bart Visscher | 2013-02-07 | 2 | -1/+4 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #1531 from owncloud/cron_no_routes | blizzz | 2013-02-07 | 2 | -9/+15 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Fix previous commit | Robin Appelman | 2013-02-07 | 1 | -1/+1 |
| * | | | | Use dummy request method in CLI | Robin Appelman | 2013-02-07 | 1 | -1/+5 |
| * | | | | Don't try to use routes when called from cli | Robin Appelman | 2013-02-07 | 1 | -8/+10 |
|/ / / / | |||||
* | | | | Merge pull request #1524 from owncloud/fix_ldaps_tls_setting | blizzz | 2013-02-07 | 2 | -4/+16 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Typo | Arthur Schiwon | 2013-02-07 | 1 | -1/+1 |
| * | | | LDAP: better detect timeouts. do not try to reconnect. do not try to bind whe... | Arthur Schiwon | 2013-02-06 | 1 | -3/+10 |
| * | | | LDAP: when ldaps and tls are configured, disable the latter one - they do not... | Arthur Schiwon | 2013-02-06 | 1 | -0/+5 |
| * | | | LDAP: info string improved | Arthur Schiwon | 2013-02-06 | 1 | -1/+1 |
* | | | | Merge pull request #1451 from eMerzh/fix_1065 | Thomas Müller | 2013-02-07 | 1 | -0/+3 |
|\ \ \ \ | |||||
| * | | | | Add Redirect to getUrlContent fix #1065 | Brice Maron | 2013-02-04 | 1 | -0/+3 |
* | | | | | Merge pull request #1518 from schiesbn/trash_layout_fix | blizzz | 2013-02-07 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | add class hascontrols to trash bin file table | Björn Schießle | 2013-02-07 | 1 | -1/+1 |
* | | | | | | Merge pull request #1522 from schiesbn/trash_bin_fix | Björn Schießle | 2013-02-07 | 5 | -9/+8 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | remove debug output | Björn Schießle | 2013-02-07 | 1 | -1/+0 |
| * | | | | | rename OCA_Trash to OCA\Files_Trashbin | Björn Schießle | 2013-02-07 | 5 | -7/+7 |
| * | | | | | OCA_Versions is now known as OCA\Files_Versions | Björn Schießle | 2013-02-07 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-07 | 339 | -4724/+6613 |
* | | | | | Merge pull request #1500 from chriskoch/patch-1 | Frank Karlitschek | 2013-02-06 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Update lib/public/util.php | Christian Koch | 2013-02-06 | 1 | -2/+2 |
* | | | | | | Merge pull request #1509 from owncloud/correct-public-contacts-tests | Lukas Reschke | 2013-02-06 | 2 | -6/+6 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Correct lib/public/contacts.php tests | Bart Visscher | 2013-02-06 | 2 | -6/+6 |
* | | | | | | Merge pull request #1443 from owncloud/use-module-file-info-master | Lukas Reschke | 2013-02-06 | 3 | -1/+23 |
|\ \ \ \ \ \ | |||||
| * | | | | | | we get best results regarding mime type detection if we use fileinfo - let's ... | Thomas Mueller | 2013-02-04 | 3 | -1/+23 |
* | | | | | | | Merge pull request #1506 from owncloud/files_encryption | Lukas Reschke | 2013-02-06 | 6 | -42/+32 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Reverted fix temporarily; another fix by LukasReschke is awaiting merge | Sam Tuke | 2013-02-06 | 1 | -1/+3 |
| * | | | | | | | Merge branch 'master' into files_encryption | Sam Tuke | 2013-02-06 | 15 | -24/+497 |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | |