Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4496 from owncloud/fixing-error-page-layout-master | Kondou | 2013-08-18 | 1 | -0/+1 |
|\ | |||||
| * | fixing error page layout | Thomas Müller | 2013-08-18 | 1 | -0/+1 |
* | | Merge pull request #4485 from guruz/class_autoloader_optimization | Markus Goetz | 2013-08-18 | 2 | -1/+54 |
|\ \ | |||||
| * | | Class Auto Loader: Cache paths in APC | Markus Goetz | 2013-08-18 | 2 | -1/+54 |
* | | | Merge pull request #4483 from owncloud/compare-true-false | Bart Visscher | 2013-08-18 | 9 | -16/+16 |
|\ \ \ | |||||
| * | | | Use boolean casting for bitwise and result. | Andreas Fischer | 2013-08-17 | 1 | -1/+1 |
| * | | | Add trailing comma for all touched array lines. | Andreas Fischer | 2013-08-17 | 1 | -1/+1 |
| * | | | Fix spacing of all touched lines. | Andreas Fischer | 2013-08-17 | 3 | -3/+3 |
| * | | | Compare result are already true/false | Bart Visscher | 2013-08-17 | 9 | -16/+16 |
* | | | | Merge pull request #4486 from owncloud/ldap_adjust_cache | Bart Visscher | 2013-08-18 | 1 | -1/+6 |
|\ \ \ \ | |||||
| * | | | | LDAP: use memcache if available | Arthur Schiwon | 2013-08-17 | 1 | -1/+6 |
| |/ / / | |||||
* | | | | Merge pull request #4493 from owncloud/fixing-initL10n-master | Owen Winkler | 2013-08-18 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Fixed inconsistent spacing. | Owen Winkler | 2013-08-18 | 1 | -1/+1 |
| * | | | | fixing undefined js error | Thomas Müller | 2013-08-17 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #4426 from owncloud/ldap_settings_design | Jan-Christoph Borchardt | 2013-08-18 | 5 | -9/+49 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | LDAP: Update Host in configuration chooser on Save | Arthur Schiwon | 2013-08-15 | 1 | -0/+7 |
| * | | | LDAP: Show Host name in configuration drop down | Arthur Schiwon | 2013-08-15 | 3 | -1/+31 |
| * | | | LDAP: slightly smaller input fields | Arthur Schiwon | 2013-08-15 | 1 | -1/+1 |
| * | | | LDAP: move small info text strings into tooltips | Arthur Schiwon | 2013-08-14 | 1 | -7/+4 |
| * | | | LDAP: right align labels on settings page | Arthur Schiwon | 2013-08-14 | 1 | -0/+6 |
* | | | | Merge pull request #4339 from owncloud/mimetype-defaults | Thomas Müller | 2013-08-17 | 8 | -551/+715 |
|\ \ \ \ | |||||
| * | | | | communicate size of newly created file back and update UI | Thomas Müller | 2013-08-16 | 3 | -310/+316 |
| * | | | | Merge branch 'master' into mimetype-defaults | Thomas Müller | 2013-08-16 | 1402 | -11847/+19120 |
| |\ \ \ \ | |||||
| * | | | | | actually register html template | Robin Appelman | 2013-08-07 | 1 | -5/+9 |
| * | | | | | use === | Robin Appelman | 2013-08-07 | 1 | -4/+4 |
| * | | | | | add template for html files | Robin Appelman | 2013-08-07 | 1 | -0/+9 |
| * | | | | | add the option to have templates for newly created files | Robin Appelman | 2013-08-07 | 3 | -34/+98 |
| * | | | | | split of mimetype detection code from OC_Helper, adding the option for apps t... | Robin Appelman | 2013-08-07 | 2 | -236/+315 |
* | | | | | | Merge pull request #4427 from owncloud/fix_4425 | Morris Jobke | 2013-08-17 | 1 | -9/+21 |
|\ \ \ \ \ \ | |||||
| * | | | | | | switched to dirname() | Bjoern Schiessle | 2013-08-17 | 1 | -1/+1 |
| * | | | | | | added missing parameter documentation | Bjoern Schiessle | 2013-08-17 | 1 | -1/+2 |
| * | | | | | | added createMissingDirectories() method | Bjoern Schiessle | 2013-08-17 | 1 | -26/+27 |
| * | | | | | | also create root dir if it doesn't exist yet | Bjoern Schiessle | 2013-08-14 | 1 | -6/+13 |
| * | | | | | | use OC files API to create missing directory which should handle special char... | Bjoern Schiessle | 2013-08-14 | 1 | -4/+7 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #4482 from owncloud/remove_cancel_button_filepicker | Kondou | 2013-08-17 | 1 | -4/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove cancel button from filepicker | kondou | 2013-08-17 | 1 | -4/+0 |
* | | | | | | | Merge pull request #4475 from owncloud/brighter-font-color | Morris Jobke | 2013-08-17 | 2 | -5/+31 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fixes for IE8 | Morris Jobke | 2013-08-17 | 1 | -3/+3 |
| * | | | | | | | change font on login/install page from black to white | Morris Jobke | 2013-08-17 | 2 | -5/+31 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #4481 from owncloud/fix_versioning_size_check | Björn Schießle | 2013-08-17 | 1 | -10/+9 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | first check if file exists before checking the files size | Bjoern Schiessle | 2013-08-17 | 1 | -10/+9 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #4352 from owncloud/encryption_clean_up | Björn Schießle | 2013-08-17 | 5 | -445/+50 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | change decryptUnknownKeyfile() to decryptKeyfile(), we always use openssl_seal | Bjoern Schiessle | 2013-08-12 | 1 | -30/+6 |
| * | | | | | | Merge branch 'encryption_clean_up' of github.com:owncloud/core into encryptio... | Bjoern Schiessle | 2013-08-09 | 2 | -7/+7 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | fixing typos and PHPDoc | Thomas Müller | 2013-08-08 | 2 | -7/+7 |
| * | | | | | | | remove old comments, TODos, etc. | Bjoern Schiessle | 2013-08-09 | 2 | -66/+0 |
| |/ / / / / / | |||||
| * | | | | | | remove todo item | Bjoern Schiessle | 2013-08-08 | 1 | -4/+0 |
| * | | | | | | adapt tests to the changes in crypt.php | Bjoern Schiessle | 2013-08-08 | 2 | -244/+31 |
| * | | | | | | make methods private which are not used from outside | Bjoern Schiessle | 2013-08-08 | 1 | -101/+13 |
* | | | | | | | LDAP: only connect to LDAP once on login | Arthur Schiwon | 2013-08-17 | 2 | -6/+18 |