Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #8382 from owncloud/enc_fix_decrypt_all | Vincent Petry | 2014-04-29 | 2 | -10/+52 |
|\ | |||||
| * | fix shouldEncrypt() method and improved decryptAll() unit tests | Bjoern Schiessle | 2014-04-28 | 2 | -10/+52 |
* | | Merge pull request #8285 from owncloud/better_getmountby_handling | icewind1991 | 2014-04-29 | 3 | -3/+4 |
|\ \ | |||||
| * | | Better handle return values from Filesystem::getMountBy* | Robin McCorkell | 2014-04-25 | 3 | -3/+4 |
* | | | Merge pull request #6870 from owncloud/uncheck-remember-checkbox | Jan-Christoph Borchardt | 2014-04-29 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | do not check 'remember' log in by default | Jan-Christoph Borchardt | 2014-01-21 | 1 | -1/+1 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-29 | 304 | -5308/+21503 |
* | | | | Merge pull request #8388 from owncloud/reset-3rdparty-master | Lukas Reschke | 2014-04-28 | 1 | -0/+0 |
|\ \ \ \ | |||||
| * | | | | Update 3rdparty | Thomas Müller | 2014-04-28 | 1 | -0/+0 |
* | | | | | Merge pull request #7852 from josh4trunks/basic_auth_fix | Thomas Müller | 2014-04-28 | 2 | -16/+14 |
|\ \ \ \ \ | |||||
| * | | | | | Remove missed stuff from merge | josh4trunks | 2014-04-03 | 1 | -3/+0 |
| * | | | | | Fixed Typo | josh4trunks | 2014-04-03 | 1 | -1/+1 |
| * | | | | | Don't always $cookie_path, only set it when needed | josh4trunks | 2014-04-03 | 1 | -3/+2 |
| * | | | | | cookie would be useless if value is not set | josh4trunks | 2014-04-03 | 1 | -1/+1 |
| * | | | | | Don't to set the cookie it wasn't needed. | josh4trunks | 2014-04-03 | 1 | -1/+1 |
| * | | | | | Fixes login / logout when HTTP Basic Headers are avilable. | josh4trunks | 2014-04-03 | 2 | -16/+18 |
* | | | | | | Merge pull request #8387 from wakeup/master | Lukas Reschke | 2014-04-28 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Update outdated comment | Volkan Gezer | 2014-04-28 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #7167 from owncloud/files-ajaxload-infscroll | Thomas Müller | 2014-04-28 | 19 | -771/+1742 |
|\ \ \ \ \ | |||||
| * | | | | | typos, naming, remove unused code, identation | Thomas Müller | 2014-04-28 | 3 | -53/+39 |
| * | | | | | Fixed drag and drop into folder and onto breadcrumb | Vincent Petry | 2014-04-28 | 3 | -82/+211 |
| * | | | | | Fixed selection summary calculation issue | Vincent Petry | 2014-04-28 | 2 | -3/+27 |
| * | | | | | Cleanup of event handlers | Vincent Petry | 2014-04-28 | 1 | -32/+32 |
| * | | | | | Cleanup and fix trashbin "clear all files" operation | Vincent Petry | 2014-04-28 | 2 | -6/+2 |
| * | | | | | Fixed drag shadow file sorting | Vincent Petry | 2014-04-28 | 1 | -0/+1 |
| * | | | | | Fixed selection to be based on FileList.files | Vincent Petry | 2014-04-28 | 5 | -161/+289 |
| * | | | | | Fix trashbin previews and "delete selected" | Vincent Petry | 2014-04-28 | 2 | -4/+4 |
| * | | | | | Make sure there are always enough elements visible on the page | Vincent Petry | 2014-04-28 | 2 | -0/+18 |
| * | | | | | Fixed insertion of files | Vincent Petry | 2014-04-28 | 4 | -40/+169 |
| * | | | | | Fixed file sorting to work with scrolling | Vincent Petry | 2014-04-28 | 2 | -106/+150 |
| * | | | | | Fix file selection for infinite scrolling | Vincent Petry | 2014-04-28 | 8 | -379/+626 |
| * | | | | | Fix file summary to use the whole file list | Vincent Petry | 2014-04-28 | 12 | -138/+342 |
| * | | | | | Added infinite scrolling (in-memory list) | Vincent Petry | 2014-04-28 | 2 | -6/+71 |
* | | | | | | Merge pull request #8380 from owncloud/kill_office_fallback | Thomas Müller | 2014-04-28 | 2 | -149/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | remove preview office fallback as it makes too much trouble and generates ina... | Georg Ehrke | 2014-04-28 | 2 | -149/+0 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #8340 from tribut/htaccess-escape-dots | Thomas Müller | 2014-04-28 | 1 | -6/+6 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Remove trailing tab | Felix Eckhofer | 2014-04-28 | 1 | -1/+1 |
| * | | | | | Escape literal dots in mod_rewrite regexes | Felix Eckhofer | 2014-04-28 | 1 | -6/+6 |
| |/ / / / | |||||
* | | | | | Merge pull request #8381 from owncloud/files_irods | Thomas Müller | 2014-04-28 | 82 | -8015/+0 |
|\ \ \ \ \ | |||||
| * | | | | | drop files_irods from apps_external | Thomas Müller | 2014-04-28 | 82 | -8015/+0 |
| |/ / / / | |||||
* | | | | | Merge pull request #8309 from DavidPrevot/chosen | Thomas Müller | 2014-04-28 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Adapt chosen (css) path | David Prévot | 2014-04-22 | 1 | -1/+1 |
* | | | | | Merge pull request #8327 from owncloud/l10n-files_external-fields | Thomas Müller | 2014-04-28 | 2 | -66/+67 |
|\ \ \ \ \ | |||||
| * | | | | | fix single quote sanitization | Volkan Gezer | 2014-04-26 | 1 | -1/+1 |
| * | | | | | Add translatable mount configs | Volkan Gezer | 2014-04-23 | 1 | -65/+66 |
| |/ / / / | |||||
* | | | | | Merge pull request #7473 from owncloud/append-error-document | Thomas Müller | 2014-04-28 | 3 | -48/+14 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into append-error-document | Thomas Müller | 2014-04-02 | 1730 | -59460/+97173 |
| |\ \ \ \ \ | |||||
| * | | | | | | A version bump is not necessary here | Lukas Reschke | 2014-02-28 | 1 | -1/+1 |
| * | | | | | | Typo + use regular assignment | Lukas Reschke | 2014-02-28 | 1 | -2/+2 |
| * | | | | | | Remove .htaccess creation code | Lukas Reschke | 2014-02-28 | 4 | -49/+15 |