summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4496 from owncloud/fixing-error-page-layout-masterKondou2013-08-181-0/+1
|\
| * fixing error page layoutThomas Müller2013-08-181-0/+1
* | Merge pull request #4485 from guruz/class_autoloader_optimizationMarkus Goetz2013-08-182-1/+54
|\ \
| * | Class Auto Loader: Cache paths in APCMarkus Goetz2013-08-182-1/+54
* | | Merge pull request #4483 from owncloud/compare-true-falseBart Visscher2013-08-189-16/+16
|\ \ \
| * | | Use boolean casting for bitwise and result.Andreas Fischer2013-08-171-1/+1
| * | | Add trailing comma for all touched array lines.Andreas Fischer2013-08-171-1/+1
| * | | Fix spacing of all touched lines.Andreas Fischer2013-08-173-3/+3
| * | | Compare result are already true/falseBart Visscher2013-08-179-16/+16
* | | | Merge pull request #4486 from owncloud/ldap_adjust_cacheBart Visscher2013-08-181-1/+6
|\ \ \ \
| * | | | LDAP: use memcache if availableArthur Schiwon2013-08-171-1/+6
| |/ / /
* | | | Merge pull request #4493 from owncloud/fixing-initL10n-masterOwen Winkler2013-08-181-1/+1
|\ \ \ \
| * | | | Fixed inconsistent spacing.Owen Winkler2013-08-181-1/+1
| * | | | fixing undefined js errorThomas Müller2013-08-171-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #4426 from owncloud/ldap_settings_designJan-Christoph Borchardt2013-08-185-9/+49
|\ \ \ \ | |/ / / |/| | |
| * | | LDAP: Update Host in configuration chooser on SaveArthur Schiwon2013-08-151-0/+7
| * | | LDAP: Show Host name in configuration drop downArthur Schiwon2013-08-153-1/+31
| * | | LDAP: slightly smaller input fieldsArthur Schiwon2013-08-151-1/+1
| * | | LDAP: move small info text strings into tooltipsArthur Schiwon2013-08-141-7/+4
| * | | LDAP: right align labels on settings pageArthur Schiwon2013-08-141-0/+6
* | | | Merge pull request #4339 from owncloud/mimetype-defaultsThomas Müller2013-08-178-551/+715
|\ \ \ \
| * | | | communicate size of newly created file back and update UIThomas Müller2013-08-163-310/+316
| * | | | Merge branch 'master' into mimetype-defaultsThomas Müller2013-08-161402-11847/+19120
| |\ \ \ \
| * | | | | actually register html templateRobin Appelman2013-08-071-5/+9
| * | | | | use ===Robin Appelman2013-08-071-4/+4
| * | | | | add template for html filesRobin Appelman2013-08-071-0/+9
| * | | | | add the option to have templates for newly created filesRobin Appelman2013-08-073-34/+98
| * | | | | split of mimetype detection code from OC_Helper, adding the option for apps t...Robin Appelman2013-08-072-236/+315
* | | | | | Merge pull request #4427 from owncloud/fix_4425Morris Jobke2013-08-171-9/+21
|\ \ \ \ \ \
| * | | | | | switched to dirname()Bjoern Schiessle2013-08-171-1/+1
| * | | | | | added missing parameter documentationBjoern Schiessle2013-08-171-1/+2
| * | | | | | added createMissingDirectories() methodBjoern Schiessle2013-08-171-26/+27
| * | | | | | also create root dir if it doesn't exist yetBjoern Schiessle2013-08-141-6/+13
| * | | | | | use OC files API to create missing directory which should handle special char...Bjoern Schiessle2013-08-141-4/+7
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #4482 from owncloud/remove_cancel_button_filepickerKondou2013-08-171-4/+0
|\ \ \ \ \ \
| * | | | | | Remove cancel button from filepickerkondou2013-08-171-4/+0
* | | | | | | Merge pull request #4475 from owncloud/brighter-font-colorMorris Jobke2013-08-172-5/+31
|\ \ \ \ \ \ \
| * | | | | | | fixes for IE8Morris Jobke2013-08-171-3/+3
| * | | | | | | change font on login/install page from black to whiteMorris Jobke2013-08-172-5/+31
| |/ / / / / /
* | | | | | | Merge pull request #4481 from owncloud/fix_versioning_size_checkBjörn Schießle2013-08-171-10/+9
|\ \ \ \ \ \ \
| * | | | | | | first check if file exists before checking the files sizeBjoern Schiessle2013-08-171-10/+9
| |/ / / / / /
* | | | | | | Merge pull request #4352 from owncloud/encryption_clean_upBjörn Schießle2013-08-175-445/+50
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | change decryptUnknownKeyfile() to decryptKeyfile(), we always use openssl_sealBjoern Schiessle2013-08-121-30/+6
| * | | | | | Merge branch 'encryption_clean_up' of github.com:owncloud/core into encryptio...Bjoern Schiessle2013-08-092-7/+7
| |\ \ \ \ \ \
| | * | | | | | fixing typos and PHPDocThomas Müller2013-08-082-7/+7
| * | | | | | | remove old comments, TODos, etc.Bjoern Schiessle2013-08-092-66/+0
| |/ / / / / /
| * | | | | | remove todo itemBjoern Schiessle2013-08-081-4/+0
| * | | | | | adapt tests to the changes in crypt.phpBjoern Schiessle2013-08-082-244/+31
| * | | | | | make methods private which are not used from outsideBjoern Schiessle2013-08-081-101/+13
* | | | | | | LDAP: only connect to LDAP once on loginArthur Schiwon2013-08-172-6/+18