Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4712 from owncloud/fileapi-foreward | Thomas Müller | 2013-09-13 | 21 | -2/+3696 |
|\ | | | | | Provide an implementation of the fileapi for oc6 build on top of the old api | ||||
| * | - giving the user a new id for each test run in order to prevent reuse of ↵ | Thomas Müller | 2013-09-13 | 1 | -1/+2 |
| | | | | | | | | | | | | e.g. permissions data in the database - setting the current user id because \OC\FilesView relies on \OC_User::getUser() | ||||
| * | cleanup public storage interface a bit | Robin Appelman | 2013-09-12 | 1 | -46/+0 |
| | | |||||
| * | Merge branch 'master' into fileapi-foreward | Robin Appelman | 2013-09-12 | 687 | -5744/+14825 |
| |\ | |||||
| * | | adjust test cases to namespace changes | Robin Appelman | 2013-09-10 | 5 | -26/+26 |
| | | | |||||
| * | | add storage backend interface to public namespace | Robin Appelman | 2013-09-10 | 3 | -2/+345 |
| | | | |||||
| * | | improve phpdoc for the public files interface | Robin Appelman | 2013-09-10 | 4 | -51/+105 |
| | | | |||||
| * | | move filesystem expceptions to global namespace | Robin Appelman | 2013-09-10 | 10 | -57/+99 |
| | | | |||||
| * | | move public files api to a clearer namespace | Robin Appelman | 2013-09-10 | 3 | -13/+13 |
| | | | |||||
| * | | update phpdoc for public fileapi | Robin Appelman | 2013-09-06 | 2 | -10/+10 |
| | | | |||||
| * | | extract interfaces from fileapi for public namespace | Robin Appelman | 2013-09-06 | 6 | -3/+259 |
| | | | |||||
| * | | use === | Robin Appelman | 2013-09-06 | 1 | -1/+1 |
| | | | |||||
| * | | Provide an implementation of the fileapi for oc6 build on top of the old api | Robin Appelman | 2013-09-01 | 13 | -1/+3045 |
| | | | |||||
* | | | Merge pull request #4840 from owncloud/adding-tb-master | Thomas Müller | 2013-09-13 | 2 | -33/+41 |
|\ \ \ | | | | | | | | | adding TB and GB to OC_Helper::humanFileSize | ||||
| * | | | remove unused OC_L10N | Thomas Müller | 2013-09-13 | 1 | -1/+0 |
| | | | | |||||
| * | | | adding TB and GB to OC_Helper::humanFileSize | Thomas Müller | 2013-09-13 | 2 | -32/+41 |
|/ / / | |||||
* | | | Allow numeric group names | ringmaster | 2013-09-13 | 1 | -3/+3 |
| | | | |||||
* | | | Merge pull request #4719 from owncloud/port_4701_master | Thomas Müller | 2013-09-12 | 20 | -183/+227 |
|\ \ \ | |_|/ |/| | | Always check variable type before using readdir to avoid surprises | ||||
| * | | more is_resource checks before readdir | Arthur Schiwon | 2013-09-05 | 6 | -85/+94 |
| | | | |||||
| * | | Always check variable type before using readdir to avoid surprises | Arthur Schiwon | 2013-09-04 | 14 | -98/+133 |
| | | | |||||
* | | | Merge pull request #4816 from owncloud/fixing-723-master | Jan-Christoph Borchardt | 2013-09-12 | 7 | -22/+56 |
|\ \ \ | | | | | | | | | Fixing 723 master | ||||
| * | | | adding calls to \OCA\files\lib\Helper::determineIcon($i) in files, trashbin ↵ | Thomas Müller | 2013-09-12 | 4 | -0/+18 |
| | | | | | | | | | | | | | | | | and sharing | ||||
| * | | | 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 |
|\ \ \ \ | | | | | | | | | | | Make it possible to pass rawlist.php an JSON array, to filter by more than one mimetype | ||||
| * | | | | 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 ↵ | kondou | 2013-09-05 | 2 | -9/+28 |
| | | | | | | | | | | | | | | | | | | | | one mimetype | ||||
* | | | | | Merge pull request #4784 from owncloud/ocdialog_option_setter | Thomas Tanghus | 2013-09-11 | 1 | -6/+10 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Fix setting ocdialog options after initialization. | ||||
| * | | | | 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 p... | ||||
| * | | | | | no further comment - which dev did not test this BEFORE submitting the pull ↵ | Thomas Müller | 2013-09-11 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | request? which reviewer did not test the pull request? | ||||
* | | | | | | [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 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | 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 |
| | | | | | | |||||
* | | | | | | Merge pull request #4472 from owncloud/remove-disconnect | Andreas Fischer | 2013-09-10 | 1 | -12/+0 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove disconnect function from OC_DB * owncloud/remove-disconnect: Remove disconnect function from OC_DB | ||||
| * | | | | | | 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 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Fixing php end tags irods master |