summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Move .errormsg from settings-css to .warning in core. Reusable!kondou2013-08-184-15/+17
|
* Use appitem instead of always recreating a jquery objectkondou2013-08-181-15/+13
| | | | Also fix some wrong data storages
* Don't use an alert for displaying app-mgmt-errorskondou2013-08-184-11/+45
| | | | | | Rather display a dominant div and mark the problematic app in the applist. Fix #305
* Merge branch 'master' into improve_app-managementkondou2013-08-18760-14393/+10729
|\
| * Merge pull request #4493 from owncloud/fixing-initL10n-masterOwen Winkler2013-08-181-1/+1
| |\ | | | | | | fixing undefined js error
| | * 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 settings design
| | * 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
| |\ \ | | | | | | | | Add the option to provide templates for newly created files
| | * | 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
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/ajax/newfile.php
| | * | | 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 ↵Robin Appelman2013-08-072-236/+315
| | | | | | | | | | | | | | | | | | | | to register additional mimetype mappings
| * | | | Merge pull request #4427 from owncloud/fix_4425Morris Jobke2013-08-171-9/+21
| |\ \ \ \ | | | | | | | | | | | | use OC files API to create missing directory
| | * | | | 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 ↵Bjoern Schiessle2013-08-141-4/+7
| | | |_|/ | | |/| | | | | | | | | | | | chars in every environment correctly
| * | | | Merge pull request #4482 from owncloud/remove_cancel_button_filepickerKondou2013-08-171-4/+0
| |\ \ \ \ | | | | | | | | | | | | Remove cancel button from filepicker
| | * | | | Remove cancel button from filepickerkondou2013-08-171-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having the cancel button in the bottom right corner was a bit confusing. It's useless anyways, since there's a X in the top right.
| * | | | | Merge pull request #4475 from owncloud/brighter-font-colorMorris Jobke2013-08-172-5/+31
| |\ \ \ \ \ | | | | | | | | | | | | | | change font on login/install page from black to white
| | * | | | | 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 size
| | * | | | | 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
| |\ \ \ \ \ | | | | | | | | | | | | | | crypt.php clean up
| | * | | | | 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 ↵Bjoern Schiessle2013-08-092-7/+7
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | encryption_clean_up
| | | * | | | | 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
| | | | | | |
| * | | | | | Merge pull request #4471 from owncloud/password-iconThomas Müller2013-08-174-4/+7
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | use proper password icon, three dots are 'more'
| | * | | | | | use proper password icon, three dots are 'more'Jan-Christoph Borchardt2013-08-164-4/+7
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #4476 from owncloud/doc-on-masterThomas Müller2013-08-173-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | fix difference between packaged version and master
| | * | | | | | fix difference between packaged version and masterMorris Jobke2013-08-173-2/+2
| | |/ / / / /
| * | | | | | Merge pull request #4480 from owncloud/remove-ru_RU-masterThomas Müller2013-08-1723-2633/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | remove ru_RU - fixes #3135
| | * | | | | | remove ru_RU - fixes #3135Thomas Müller2013-08-1723-2633/+0
| | |/ / / / /
| * | | | | | Merge pull request #4193 from owncloud/versions_fix_cssMorris Jobke2013-08-172-9/+6
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | Versions fix css
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-28 09:47:14 +0000