Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-11 | 3 | -0/+16 |
| | |||||
* | Merge pull request #4788 from owncloud/fixin-irods-session-master | Bart Visscher | 2013-09-11 | 1 | -9/+10 |
|\ | | | | | Fixing session handling in iRODS | ||||
| * | never hack late night | Thomas Müller | 2013-09-11 | 1 | -1/+1 |
| | | |||||
| * | fixing boolean handling | Thomas Müller | 2013-09-11 | 1 | -2/+2 |
| | | |||||
| * | proper test for use_logon_credentials | Thomas Müller | 2013-09-10 | 1 | -1/+1 |
| | | |||||
| * | use \OC::$session instead of $_SESSION | Thomas Müller | 2013-09-10 | 1 | -8/+9 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-10 | 13 | -35/+76 |
| | | |||||
* | | removing all ?> jutt in case | Thomas Müller | 2013-09-10 | 57 | -105/+0 |
| | | |||||
* | | removing ?> followed by whitespaces | Thomas Müller | 2013-09-10 | 5 | -10/+0 |
|/ | |||||
* | Merge pull request #4647 from owncloud/fix_4619 | Thomas Müller | 2013-09-10 | 1 | -0/+3 |
|\ | | | | | Workaround for IE 9 & 10 for clicking filelist after adding new item | ||||
| * | Workaround for IE 9 & 10 for clicking filelist after adding new item | ringmaster | 2013-08-29 | 1 | -0/+3 |
| | | |||||
* | | Merge pull request #4726 from owncloud/files-ie8-missingfilecheckboxes | Thomas Tanghus | 2013-09-09 | 1 | -1/+6 |
|\ \ | | | | | | | Fixed missing checkboxes in IE8 | ||||
| * | | Fixed missing checkboxes in IE8 | Vincent Petry | 2013-09-08 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | IE8 is not happy with the :checked CSS3 selector which causes it to ignore the whole rule. Replace it with a more compatible selector. | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-08 | 3 | -3/+6 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-07 | 8 | -8/+22 |
| | | | |||||
* | | | coding style fixes | Bjoern Schiessle | 2013-09-06 | 1 | -1/+2 |
| | | | |||||
* | | | fix part file handling and real size calculation, this should also solve #4581 | Bjoern Schiessle | 2013-09-06 | 3 | -45/+24 |
| | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/lib/stream.php | ||||
* | | | check shares for the real file and not for the .part file | Bjoern Schiessle | 2013-09-06 | 1 | -0/+5 |
| | | | |||||
* | | | first check if a extension exists before comparing it | Bjoern Schiessle | 2013-09-06 | 1 | -1/+1 |
| | | | |||||
* | | | handle part files correctly | Bjoern Schiessle | 2013-09-06 | 1 | -6/+27 |
| | | | |||||
* | | | prefix #filestable to tbody tr | Pete McFarlane | 2013-09-06 | 1 | -3/+3 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-05 | 14 | -15/+45 |
| | | | |||||
* | | | Merge pull request #4683 from owncloud/publicuploadjserror | Thomas Müller | 2013-09-04 | 1 | -0/+1 |
|\ \ \ | |/ / |/| | | Fixed public upload error that prevents upload | ||||
| * | | Fixed public upload error that prevents upload | Vincent Petry | 2013-09-01 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Public upload is broken because the file_upload_param variable expected to exist by public.js didn't. This fix sets the variable scope to the window to make it accessible outside. | ||||
* | | | Merge pull request #4473 from owncloud/texteditor_polishing | Jörn Friedrich Dreyer | 2013-09-03 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Texteditor polishing | ||||
| * | | | Revert "remove editor div in filelist", add "is deprecated" comment | Jörn Friedrich Dreyer | 2013-09-03 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | This reverts commit 64d09452f55c0c73fe0d55a70f82d8ad7a386d7c. | ||||
| * | | | remove editor div in filelist | Jörn Friedrich Dreyer | 2013-08-16 | 1 | -1/+0 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-03 | 8 | -7/+37 |
| | | | | |||||
* | | | | This function doesn't cache anymore. Adjusted PHPDoc to suit. | ringmaster | 2013-09-02 | 1 | -1/+1 |
| | | | | |||||
* | | | | Don't cache the pkey, skip generation if the keyfile exists | ringmaster | 2013-09-02 | 2 | -13/+11 |
| | | | | |||||
* | | | | Employ config option for OpenSSL config file, if provided. | Owen Winkler | 2013-09-02 | 2 | -6/+20 |
| | | | | | | | | | | | | | | | | This should help make OpenSSL configuration on Windows servers easier by allowing the openssl.cnf file to be set directly in the ownCloud config, rather than in SetEnv commands that don't exist and are hard to replicate in IIS. | ||||
* | | | | Start a branch for easier OpenSSL configuration. | Owen Winkler | 2013-09-02 | 2 | -1/+12 |
| | | | | |||||
* | | | | Merge pull request #4671 from owncloud/emptycontent | Bernhard Posselt | 2013-09-01 | 4 | -10/+4 |
|\ \ \ \ | | | | | | | | | | | centers text message in empty-content page (files and files_trashbin apps) | ||||
| * | | | | rename emptyfolder to emptycontent | Alessandro Cosentino | 2013-08-31 | 2 | -3/+3 |
| | | | | | |||||
| * | | | | text centered horizontally and vertically in emptycontent div | Alessandro Cosentino | 2013-08-31 | 2 | -7/+1 |
| | |/ / | |/| | | |||||
* / | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-01 | 49 | -32/+96 |
|/ / / | |||||
* | | | fix issue with filetable background | Georg Ehrke | 2013-08-30 | 1 | -1/+1 |
| | | | |||||
* | | | Merge master into oc_preview | Georg Ehrke | 2013-08-30 | 73 | -300/+164 |
|\ \ \ | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-30 | 72 | -296/+163 |
| | | | | |||||
| * | | | prefix 'tbody tr' to separate app/core css errors | petemcfarlane | 2013-08-30 | 1 | -1/+1 |
| | |/ | |/| | | | | | | | For specific details see: https://github.com/owncloud/core/pull/4536/files#r6082305 | ||||
* | | | use gerMimeTypeDetector detectPath instead of getMimeType | Georg Ehrke | 2013-08-30 | 1 | -1/+1 |
| | | | |||||
* | | | Merge master into oc_preview | Georg Ehrke | 2013-08-29 | 85 | -354/+1742 |
|\| | | |||||
| * | | Merge pull request #3926 from owncloud/improve_filesummary | Thomas Müller | 2013-08-28 | 4 | -40/+127 |
| |\ \ | | | | | | | | | Improve filelist summary | ||||
| | * | | Reimplement filesummary in JS | kondou | 2013-08-28 | 4 | -40/+127 |
| | | | | | | | | | | | | | | | | Fix #993 | ||||
| * | | | also move empty folders to the trash bin as discussed here #4590 | Bjoern Schiessle | 2013-08-28 | 1 | -5/+0 |
| | | | | |||||
| * | | | Merge pull request #4489 from owncloud/clean-3rdparty-mess-master | Bart Visscher | 2013-08-28 | 15 | -2/+1506 |
| |\ \ \ | | |/ / | |/| | | Clean 3rdparty mess master | ||||
| | * | | fixing require path | Thomas Müller | 2013-08-18 | 2 | -2/+2 |
| | | | | |||||
| | * | | moving Dropbox and smb4php 3rdparty code over to the apps | Thomas Müller | 2013-08-17 | 15 | -2/+1506 |
| | | | | |||||
| * | | | Merge pull request #4601 from owncloud/fixing-4341-master | Morris Jobke | 2013-08-28 | 3 | -27/+33 |
| |\ \ \ | | | | | | | | | | | backport of #4357 to master | ||||
| | * | | | backport of #4357 to master | Thomas Müller | 2013-08-27 | 3 | -27/+33 |
| | | | | |