Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
* | | | | | | Merge pull request #4471 from owncloud/password-icon | Thomas Müller | 2013-08-17 | 4 | -4/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | use proper password icon, three dots are 'more' | Jan-Christoph Borchardt | 2013-08-16 | 4 | -4/+7 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #4476 from owncloud/doc-on-master | Thomas Müller | 2013-08-17 | 3 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fix difference between packaged version and master | Morris Jobke | 2013-08-17 | 3 | -2/+2 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #4480 from owncloud/remove-ru_RU-master | Thomas Müller | 2013-08-17 | 23 | -2633/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | remove ru_RU - fixes #3135 | Thomas Müller | 2013-08-17 | 23 | -2633/+0 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #4193 from owncloud/versions_fix_css | Morris Jobke | 2013-08-17 | 2 | -9/+6 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | increase width of versions dialog | Bjoern Schiessle | 2013-08-17 | 1 | -0/+4 |
| * | | | | | css for button no longer needed | Björn Schießle | 2013-07-25 | 1 | -3/+0 |
| * | | | | | remove unused code; use jquery | Björn Schießle | 2013-07-25 | 1 | -6/+2 |
| * | | | | | fix css | Björn Schießle | 2013-07-25 | 1 | -1/+1 |
* | | | | | | Merge pull request #4442 from owncloud/no-smb-client-on-windows-master | Morris Jobke | 2013-08-16 | 1 | -10/+16 |
|\ \ \ \ \ \ | |||||
| * | | | | | | no files external for SMB on windows | Thomas Müller | 2013-08-15 | 1 | -10/+16 |
* | | | | | | | Merge pull request #4314 from owncloud/css-fixes | Jan-Christoph Borchardt | 2013-08-16 | 5 | -42/+21 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | tixing width and position of wider error messages | Thomas Müller | 2013-08-16 | 2 | -1/+6 |
| * | | | | | | | merge master into css-fixes | Jan-Christoph Borchardt | 2013-08-16 | 1473 | -14328/+24962 |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| * | | | | | | | change long couldn't be determined string to question mark again | Jan-Christoph Borchardt | 2013-08-04 | 1 | -1/+1 |
| * | | | | | | | wrap code output in error messages, fix #4231 | Jan-Christoph Borchardt | 2013-07-31 | 1 | -0/+4 |
| * | | | | | | | remove table layout for background jobs | Jan-Christoph Borchardt | 2013-07-31 | 1 | -14/+6 |
| * | | | | | | | remove unused and never to be used pagination | Jan-Christoph Borchardt | 2013-07-31 | 1 | -22/+0 |