summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | 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
* | | | | | | | | | | Merge pull request #4471 from owncloud/password-iconThomas Müller2013-08-174-4/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 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 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 #3135Thomas Müller2013-08-1723-2633/+0
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #4193 from owncloud/versions_fix_cssMorris Jobke2013-08-172-9/+6
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | increase width of versions dialogBjoern Schiessle2013-08-171-0/+4
| * | | | | | | | | | css for button no longer neededBjörn Schießle2013-07-251-3/+0
| * | | | | | | | | | remove unused code; use jqueryBjörn Schießle2013-07-251-6/+2
| * | | | | | | | | | fix cssBjörn Schießle2013-07-251-1/+1
* | | | | | | | | | | Merge pull request #4442 from owncloud/no-smb-client-on-windows-masterMorris Jobke2013-08-161-10/+16
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | no files external for SMB on windowsThomas Müller2013-08-151-10/+16
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #4314 from owncloud/css-fixesJan-Christoph Borchardt2013-08-165-42/+21
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | tixing width and position of wider error messagesThomas Müller2013-08-162-1/+6
| * | | | | | | | | | | merge master into css-fixesJan-Christoph Borchardt2013-08-161473-14328/+24962
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | change long couldn't be determined string to question mark againJan-Christoph Borchardt2013-08-041-1/+1
| * | | | | | | | | | | wrap code output in error messages, fix #4231Jan-Christoph Borchardt2013-07-311-0/+4
| * | | | | | | | | | | remove table layout for background jobsJan-Christoph Borchardt2013-07-311-14/+6
| * | | | | | | | | | | remove unused and never to be used paginationJan-Christoph Borchardt2013-07-311-22/+0
| * | | | | | | | | | | remove ugly inset shadow from headerJan-Christoph Borchardt2013-07-301-1/+4
| * | | | | | | | | | | reduce z-index of settings popup, fix #4212Jan-Christoph Borchardt2013-07-301-1/+1
* | | | | | | | | | | | Merge pull request #4032 from owncloud/more-whitespaceMorris Jobke2013-08-161-47/+82
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ merge master into more-whitespaceJan-Christoph Borchardt2013-08-152568-39800/+129181
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | prevent ugly selection effect on accidental selection, fix #3713Jan-Christoph Borchardt2013-07-091-0/+4