Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4683 from owncloud/publicuploadjserror | Thomas Müller | 2013-09-04 | 1 | -0/+1 |
|\ | |||||
| * | Fixed public upload error that prevents upload | Vincent Petry | 2013-09-01 | 1 | -0/+1 |
* | | Merge pull request #4473 from owncloud/texteditor_polishing | Jörn Friedrich Dreyer | 2013-09-03 | 1 | -1/+1 |
|\ \ | |||||
| * | | Revert "remove editor div in filelist", add "is deprecated" comment | Jörn Friedrich Dreyer | 2013-09-03 | 1 | -0/+1 |
| * | | 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 |
* | | | 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 |
|\ \ \ | |||||
| * | | | 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 |
* | | | 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 |
| |\ \ | |||||
| | * | | Reimplement filesummary in JS | kondou | 2013-08-28 | 4 | -40/+127 |
| * | | | 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 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | 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 | Thomas Müller | 2013-08-27 | 3 | -27/+33 |
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-28 | 1 | -1/+3 |
| |/ / / | |||||
| * | | | Merge pull request #4572 from NCTU-NBA/pr-checkbox-displacement | Morris Jobke | 2013-08-27 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | Fix "select all" checkbox displacement when checked | Pellaeon Lin | 2013-08-26 | 1 | -1/+1 |
| * | | | | LDAP: case insensitive replace for more robustness | Arthur Schiwon | 2013-08-27 | 1 | -1/+1 |
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-27 | 51 | -85/+63 |
| * | | | | the trash bin can also contain empty files. Don't use the trash bin size as i... | Bjoern Schiessle | 2013-08-27 | 1 | -4/+5 |
| * | | | | Merge pull request #4586 from owncloud/fixing-3431-master | Morris Jobke | 2013-08-27 | 7 | -186/+0 |
| |\ \ \ \ | |||||
| | * | | | | kill zh_CN.GB2312 | Thomas Müller | 2013-08-27 | 7 | -186/+0 |
| * | | | | | storage information is path specific | Thomas Müller | 2013-08-27 | 2 | -2/+2 |
| |/ / / / | |||||
* | | | | | use random string as id for checkbox | Georg Ehrke | 2013-08-26 | 1 | -1/+2 |
* | | | | | fix background size in filelist.js | Georg Ehrke | 2013-08-26 | 1 | -1/+1 |
* | | | | | Merge master into oc_preview | Georg Ehrke | 2013-08-26 | 14 | -217/+52 |
|\| | | | | |||||
| * | | | | Merge pull request #4542 from owncloud/fixing-4504-master | Morris Jobke | 2013-08-26 | 2 | -198/+7 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | remove duplicate code | Thomas Müller | 2013-08-22 | 2 | -198/+7 |
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-25 | 8 | -13/+28 |
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-23 | 4 | -0/+11 |
* | | | | | fix preview issue when uploading a file with parentheses | Georg Ehrke | 2013-08-26 | 1 | -1/+3 |
* | | | | | move path generation for previews to dedicated function | Georg Ehrke | 2013-08-23 | 2 | -3/+8 |
* | | | | | Merge branch 'master' into oc_preview | Georg Ehrke | 2013-08-23 | 96 | -477/+243 |
|\| | | | | |||||
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-22 | 5 | -10/+16 |
| * | | | | Merge pull request #4537 from owncloud/no-realpath | Thomas Müller | 2013-08-22 | 8 | -76/+76 |
| |\ \ \ \ | |||||
| | * | | | | Use __DIR__ instead of dirname(__FILE__). | Andreas Fischer | 2013-08-21 | 8 | -76/+76 |