Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Cover more cases | kondou | 2013-08-01 | 1 | -17/+17 |
| | | | | | Use file_get_contents() and base64_encode(file_get_contents()), to load from data and base64, to cover more cases | ||||
* | Add OC_Image Unit Test | kondou | 2013-08-01 | 4 | -0/+220 |
| | | | | | data() somehow does not return, what file_get_contents() returns, so I skipped related tests. | ||||
* | Some styling to user list | Victor Dubiniuk | 2013-08-01 | 1 | -0/+2 |
| | |||||
* | Merge pull request #4221 from owncloud/fix-3698 | Jörn Friedrich Dreyer | 2013-08-01 | 2 | -19/+24 |
|\ | | | | | Fix calculating size for empty folders | ||||
| * | Add test for calculating size of newly empty folder | Michael Gapczynski | 2013-07-29 | 1 | -0/+5 |
| | | |||||
| * | Use query to calculate folder size | Michael Gapczynski | 2013-07-29 | 1 | -10/+13 |
| | | |||||
| * | Fix calculating size for empty folders | Michael Gapczynski | 2013-07-28 | 1 | -19/+16 |
| | | |||||
* | | Merge pull request #4270 from owncloud/fix_4253 | Björn Schießle | 2013-08-01 | 3 | -13/+34 |
|\ \ | | | | | | | cancel sharing if some users doesn't have a working encryption set-up. | ||||
| * | | fix test and make warning translatable | Bjoern Schiessle | 2013-08-01 | 2 | -3/+9 |
| | | | |||||
| * | | cancel sharing if some users doesn't have a working encryption set-up. | Bjoern Schiessle | 2013-08-01 | 2 | -11/+26 |
| | | | |||||
* | | | Merge pull request #4265 from berendt/OC_Files_Storage_AmazonS3_phpdoc | Jörn Friedrich Dreyer | 2013-08-01 | 1 | -0/+15 |
|\ \ \ | | | | | | | | | added @var tags | ||||
| * | | | added @var tags | Christian Berendt | 2013-08-01 | 1 | -0/+15 |
| | | | | |||||
* | | | | Merge pull request #4266 from berendt/OC_Files_Storage_AmazonS3_logging | Jörn Friedrich Dreyer | 2013-08-01 | 1 | -0/+14 |
|\ \ \ \ | |_|/ / |/| | | | write all catched exception messages to the log | ||||
| * | | | write all catched exception messages to the log | Christian Berendt | 2013-08-01 | 1 | -0/+14 |
| |/ / | |||||
* | | | Merge pull request #4155 from owncloud/mdb2schemareader-booleans | Morris Jobke | 2013-08-01 | 5 | -69/+308 |
|\ \ \ | | | | | | | | | Fix boolean support for xml schema definitions | ||||
| * | | | add tests for MDB2SchemaReader | Robin Appelman | 2013-07-29 | 2 | -0/+157 |
| | | | | |||||
| * | | | make MDB2Schema reader non static | Robin Appelman | 2013-07-29 | 2 | -72/+143 |
| | | | | |||||
| * | | | add function to get config object from OC_Config | Robin Appelman | 2013-07-29 | 1 | -0/+4 |
| | | | | |||||
| * | | | use === | Robin Appelman | 2013-07-22 | 1 | -1/+1 |
| | | | | |||||
| * | | | add support for the <primary/> element within field definitions | Robin Appelman | 2013-07-22 | 1 | -0/+4 |
| | | | | |||||
| * | | | db: cast default values for boolean fields to booleans | Robin Appelman | 2013-07-22 | 1 | -0/+3 |
| | | | | |||||
* | | | | Merge pull request #4208 from owncloud/scanner-php53 | Morris Jobke | 2013-08-01 | 1 | -6/+7 |
|\ \ \ \ | | | | | | | | | | | Fix scanner hooks throwing errors | ||||
| * | | | | remove unneeded 'use' | Robin Appelman | 2013-07-29 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | dont need to explicitly pass by reference | Robin Appelman | 2013-07-29 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | fix scanner hooks, cant use inside closures in php 5.3 | Robin Appelman | 2013-07-26 | 1 | -5/+7 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-01 | 68 | -209/+325 |
| | | | | | |||||
* | | | | | Merge pull request #4259 from owncloud/search_result_scrollbar | Morris Jobke | 2013-07-31 | 1 | -56/+57 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Search result scrollbar | ||||
| * | | | | update css properties with px based values | Jörn Friedrich Dreyer | 2013-07-31 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | add overflow-y scroll and clean up indents | Jörn Friedrich Dreyer | 2013-07-31 | 1 | -56/+57 |
|/ / / / | |||||
* | | | | Merge pull request #3982 from owncloud/test_lastinsertid | Morris Jobke | 2013-07-31 | 2 | -3/+17 |
|\ \ \ \ | | | | | | | | | | | test lastinsertid | ||||
| * | | | | check type, assertgreaterthan | Jörn Friedrich Dreyer | 2013-07-29 | 1 | -4/+6 |
| | | | | | |||||
| * | | | | always return int | Jörn Friedrich Dreyer | 2013-07-29 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | test lastinsertid | Jörn Friedrich Dreyer | 2013-07-29 | 1 | -1/+13 |
| | |_|/ | |/| | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-31 | 378 | -2991/+4903 |
| | | | | |||||
* | | | | Merge pull request #4246 from owncloud/speedup-autotest-master | Andreas Fischer | 2013-07-31 | 1 | -5/+11 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use tmpfs at /dev/shm to speedup unit test execution * owncloud/speedup-autotest-master: use tmpfs at /dev/shm to speedup unit test execution | ||||
| * | | | | use tmpfs at /dev/shm to speedup unit test execution | Thomas Müller | 2013-07-30 | 1 | -5/+11 |
| | | | | | |||||
* | | | | | Merge pull request #4225 from owncloud/better-404 | Thomas Müller | 2013-07-30 | 4 | -6/+40 |
|\ \ \ \ \ | | | | | | | | | | | | | More verbose 404, closes #3225 | ||||
| * | | | | | Use default cursor for list items | Victor Dubiniuk | 2013-07-30 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Rewording | Victor Dubiniuk | 2013-07-29 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Move styles from core to app | Victor Dubiniuk | 2013-07-29 | 3 | -12/+13 |
| | | | | | | |||||
| * | | | | | Allow apps to have own 404 content, closes #3225 | Victor Dubiniuk | 2013-07-29 | 4 | -6/+39 |
| | | | | | | |||||
* | | | | | | Merge pull request #4238 from owncloud/fix_4235 | Morris Jobke | 2013-07-30 | 1 | -0/+14 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | added missing isEmpty ajax file | ||||
| * | | | | | | added missing isEmpty ajax file | Bjoern Schiessle | 2013-07-30 | 1 | -0/+14 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #4227 from owncloud/fixing-testGetById-master | Thomas Müller | 2013-07-30 | 3 | -9/+33 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | implement a platform independent version of basename | ||||
| * | | | | | | adding test case with no / | Thomas Müller | 2013-07-30 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into fixing-testGetById-master | Thomas Müller | 2013-07-30 | 1909 | -28481/+105517 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | adding unit tests for OC_Util::basename | Thomas Müller | 2013-07-29 | 2 | -8/+25 |
| | | | | | | | | |||||
| * | | | | | | | implement a platform independent version of basename | Thomas Mueller | 2013-07-29 | 2 | -1/+7 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #4237 from owncloud/fixing-4026-master | Jörn Friedrich Dreyer | 2013-07-30 | 2 | -9/+24 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | Allow public upload together with password protection | ||||
| * | | | | | | | fixes #4026 | Thomas Müller | 2013-07-30 | 2 | -9/+24 |
| | | | | | | | |