Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into fileapi-foreward | Robin Appelman | 2013-09-12 | 687 | -5744/+14825 |
|\ | |||||
| * | Merge pull request #4816 from owncloud/fixing-723-master | Jan-Christoph Borchardt | 2013-09-12 | 7 | -22/+56 |
| |\ | |||||
| | * | adding calls to \OCA\files\lib\Helper::determineIcon($i) in files, trashbin a... | Thomas Müller | 2013-09-12 | 4 | -0/+18 |
| | * | added determineIcon to \OCA\files\lib\Helper | Thomas Müller | 2013-09-12 | 1 | -0/+29 |
| | * | remove unused $relativePath | Thomas Müller | 2013-09-12 | 1 | -2/+0 |
| | * | move icon generation logic out of the template | Thomas Müller | 2013-09-12 | 1 | -20/+1 |
| | * | adding icons for shared folders and external folders | Thomas Müller | 2013-09-12 | 1 | -0/+8 |
| * | | Merge pull request #4735 from owncloud/multiple_mimetypes_rawlist | Thomas Tanghus | 2013-09-11 | 2 | -12/+53 |
| |\ \ | |||||
| | * | | Clean up rawlist.php and fix non-array request | kondou | 2013-09-12 | 1 | -20/+30 |
| | * | | Split some lines, use ===, avoid unnecessary operation | kondou | 2013-09-11 | 1 | -5/+7 |
| | * | | Use shorter array-conversion | kondou | 2013-09-06 | 1 | -3/+1 |
| | * | | Use usort() instead of uasort() to not maintain keys | kondou | 2013-09-06 | 1 | -1/+1 |
| | * | | Sort files by name, not by mimetype | kondou | 2013-09-05 | 1 | -0/+9 |
| | * | | Only use mimetype_list and clean up a bit | kondou | 2013-09-05 | 2 | -19/+22 |
| | * | | Make it possible to pass rawlist.php an JSON array, to filter by more than on... | kondou | 2013-09-05 | 2 | -9/+28 |
| * | | | Merge pull request #4784 from owncloud/ocdialog_option_setter | Thomas Tanghus | 2013-09-11 | 1 | -6/+10 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | Fix double destroy on escape. | Thomas Tanghus | 2013-09-11 | 1 | -1/+2 |
| | * | | Remove console logging | Thomas Tanghus | 2013-09-10 | 1 | -1/+0 |
| | * | | Fix setting ocdialog options after initialization. | Thomas Tanghus | 2013-09-10 | 1 | -5/+9 |
| * | | | Merge pull request #4798 from owncloud/fixing-variable-typos-master | VicDeo | 2013-09-11 | 1 | -3/+3 |
| |\ \ \ | |||||
| | * | | | no further comment - which dev did not test this BEFORE submitting the pull r... | Thomas Müller | 2013-09-11 | 1 | -3/+3 |
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-11 | 25 | -138/+178 |
| * | | | | Merge pull request #4788 from owncloud/fixin-irods-session-master | Bart Visscher | 2013-09-11 | 1 | -9/+10 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | 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 |
| * | | | | Merge pull request #4472 from owncloud/remove-disconnect | Andreas Fischer | 2013-09-10 | 1 | -12/+0 |
| |\ \ \ \ | |||||
| | * | | | | Remove disconnect function from OC_DB | Bart Visscher | 2013-08-16 | 1 | -12/+0 |
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-10 | 54 | -363/+438 |
| * | | | | | Merge pull request #4787 from owncloud/fixing-php-end-tags-irods-master | Thomas Müller | 2013-09-10 | 62 | -115/+0 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | 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 | 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 | Vincent Petry | 2013-09-08 | 1 | -1/+6 |
| * | | | | | Merge pull request #4757 from owncloud/deleteAll-alias | Thomas Müller | 2013-09-09 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | change View->deleteAll to an alias of View->rmdir since rmdir works recursive | Robin Appelman | 2013-09-07 | 1 | -1/+1 |
| * | | | | | | Merge pull request #4772 from owncloud/preview_improvements | Thomas Müller | 2013-09-09 | 1 | -4/+4 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | use avconv instead of ffmpeg | Georg Ehrke | 2013-09-05 | 1 | -4/+4 |
| * | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-08 | 23 | -107/+150 |
| * | | | | | | | Merge pull request #4761 from owncloud/fix_language_selection-kondou | Christopher | 2013-09-08 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Fix language selection; Fix #4756 | kondou | 2013-09-07 | 1 | -1/+1 |
| |/ / / / / / / | |||||
| * | / / / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-07 | 347 | -2189/+10627 |
| | |/ / / / / | |/| | | | | | |||||
| * | | | | | | remove some more debug output | Bjoern Schiessle | 2013-09-06 | 1 | -2/+0 |
| * | | | | | | remove some error_logs | Bjoern Schiessle | 2013-09-06 | 1 | -1/+0 |
| * | | | | | | remove error logs | Bjoern Schiessle | 2013-09-06 | 1 | -2/+2 |
| * | | | | | | coding style fixes | Bjoern Schiessle | 2013-09-06 | 1 | -1/+2 |
| * | | | | | | if the files doesn't exist yet we start with the parent to search for shares | Bjoern Schiessle | 2013-09-06 | 1 | -4/+12 |