Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #11936 from owncloud/bower-jquery | Lukas Reschke | 2014-11-05 | 1 | -6/+6 |
|\ | | | | | Bower jquery | ||||
| * | migrate jQuery to bower | Morris Jobke | 2014-11-04 | 1 | -6/+6 |
| | | |||||
* | | fix typo in content type | Bernhard Posselt | 2014-11-05 | 1 | -1/+1 |
|/ | |||||
* | replace moment.js with bower version | Morris Jobke | 2014-11-03 | 1 | -0/+7 |
| | | | | * fix JS unit tests | ||||
* | remove unnecessary require calls - the ownCloud class loader is supposed to ↵ | Thomas Müller | 2014-10-30 | 6 | -18/+12 |
| | | | | take care of this | ||||
* | Merge pull request #11821 from owncloud/generic-response | Morris Jobke | 2014-10-30 | 4 | -24/+185 |
|\ | | | | | Add a generic data response | ||||
| * | add dataresponse | Bernhard Posselt | 2014-10-29 | 4 | -24/+185 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix docstrings adjust copyright date another copyright date update another header update implement third headers argument, fix indention, fix docstrings fix docstrings | ||||
* | | Merge pull request #11409 from owncloud/watcher-reuse | Vincent Petry | 2014-10-29 | 1 | -2/+3 |
|\ \ | | | | | | | Pass the cached data to the filesystem watcher | ||||
| * | | Better reuse of cache data for getFolderContents | Robin Appelman | 2014-10-24 | 1 | -2/+3 |
| | | | |||||
* | | | adding console command to generate javascript translation files based on ↵ | Thomas Müller | 2014-10-29 | 7 | -18/+21 |
| |/ |/| | | | | | | | | | existing php translation files read server side translations from json files | ||||
* | | use Composer autoloader not OC for non-Composer 3rdparty (#9643) | Adam Williamson | 2014-10-28 | 1 | -15/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Composer's autoloader is rather better than the OwnCloud autoloader's handling of non-OC classes. Plus we can rely on upstream Composer to maintain it and not worry about it ourselves. With this change, we drop the bits of OwnCloud's autoloader that handled non-OC classes, and register the classes that were being handled by that code with Composer's autoloader instead. As these dependencies are converted to actually being managed by Composer, the explicit registrations can be dropped as they won't be needed any more. Since OwnCloud's autoloader isn't going to handle non-OC classes any more, we no longer need to test to make sure it does it right. drop unneeded registerPrefix() and registerClass() from autoloader Now we're not handling anything but OC's own classes, these are unnecessary. error out if composer autoloader is not found (thanks bantu) We're never going to be able to work without the autoloader, if it's not there we should just throw our hands up and surrender. | ||||
* | | Merge pull request #11799 from owncloud/no-stable-etags-on-windows | Lukas Reschke | 2014-10-27 | 1 | -0/+8 |
|\ \ | | | | | | | On Windows platform we have no stable etag generation - yet | ||||
| * | | On Windows platform we have no stable etag generation - yet | Thomas Müller | 2014-10-27 | 1 | -0/+8 |
| | | | |||||
* | | | Merge pull request #11786 from owncloud/MakeSupportedDBsConfigurable | Lukas Reschke | 2014-10-27 | 1 | -0/+103 |
|\ \ \ | |/ / |/| | | Make supported DBs configurable within config.php | ||||
| * | | Make supported DBs configurable within config.php | Lukas Reschke | 2014-10-27 | 1 | -0/+103 |
| | | | | | | | | | | | | | | | | | | This commit will make the supported DBs for installation configurable within config.php. By default the following databases are tested: "sqlite", "mysql", "pgsql". The reason behind this is that there might be instances where we want to prevent SQLite to be used by mistake. To test this play around with the new configuration parameter "supportedDatabases". | ||||
* | | | Merge pull request #11763 from owncloud/stable-etags | Robin Appelman | 2014-10-27 | 1 | -21/+38 |
|\ \ \ | | | | | | | | | Generate stable etags for local files | ||||
| * | | | Generate stable etags for local files | Robin Appelman | 2014-10-24 | 1 | -21/+38 |
| | |/ | |/| | |||||
* | | | Merge pull request #11709 from owncloud/temp-handling | Thomas Müller | 2014-10-24 | 1 | -0/+143 |
|\ \ \ | |_|/ |/| | | Cleanup handling of temporary files | ||||
| * | | Add \OC\TempManager to handle creating and cleaning temporary files | Robin Appelman | 2014-10-24 | 1 | -0/+143 |
| |/ | |||||
* | | Merge pull request #11735 from owncloud/mssql-migrations-master | Clark Tomlinson | 2014-10-24 | 3 | -8/+27 |
|\ \ | |/ |/| | disable database migration unit tests for MSSQL | ||||
| * | disable database migration unit tests for MSSQL | Thomas Müller | 2014-10-23 | 3 | -8/+27 |
| | | |||||
* | | Merge pull request #11549 from owncloud/add-more-localizations-master | Thomas Müller | 2014-10-23 | 2 | -8/+58 |
|\ \ | |/ |/| | implement localizations based on punic | ||||
| * | fixing expected values for formatDate() unit tests | Thomas Müller | 2014-10-21 | 1 | -3/+3 |
| | | |||||
| * | adding unit tests for en_GB and en-GB - just to verify | Thomas Müller | 2014-10-20 | 1 | -0/+8 |
| | | |||||
| * | implement localizations based on punic | Thomas Müller | 2014-10-20 | 1 | -5/+47 |
| | | |||||
* | | Merge pull request #11259 from owncloud/fix-windows-max-depth-test | Thomas Müller | 2014-10-23 | 1 | -6/+19 |
|\ \ | | | | | | | fixing windows max depth test | ||||
| * | | fixing windows max depth test | Clark Tomlinson | 2014-09-30 | 1 | -6/+19 |
| | | | |||||
* | | | Merge pull request #10985 from owncloud/db-cleanup | Thomas Müller | 2014-10-23 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Cleanup database handling | ||||
| * | | | Fix tags unit test | Robin Appelman | 2014-10-22 | 1 | -1/+1 |
| | | | | |||||
* | | | | introduce SessionMiddleWare to control session handling via an annotation | Thomas Müller | 2014-10-22 | 1 | -0/+89 |
|/ / / | |||||
* | | | Add proper setup and teardown | Vincent Petry | 2014-10-20 | 1 | -0/+17 |
| | | | | | | | | | | | | Properly restore REQUEST_URI and SCRIPT_NAME after test runs | ||||
* | | | Add "$_SERVER['REQUEST_URI']" to fix the unit tests | Lukas Reschke | 2014-10-20 | 1 | -1/+8 |
| | | | | | | | | | | | | Let's hope that works | ||||
* | | | Add unit tests for convertToRelativePath | Lukas Reschke | 2014-10-20 | 1 | -0/+44 |
| |/ |/| | |||||
* | | adjust group manager tests | Arthur Schiwon | 2014-10-17 | 1 | -15/+9 |
| | | |||||
* | | Merge pull request #9104 from macjohnny/macjohnny-drastic-ldap-speedup | blizzz | 2014-10-17 | 1 | -10/+10 |
|\ \ | | | | | | | drastic ldap speedup (update) | ||||
| * | | adapted tests for a groupId indexed group array | macjohnny | 2014-06-24 | 1 | -10/+10 |
| | | | |||||
* | | | Fix unit test | Lukas Reschke | 2014-10-16 | 1 | -3/+3 |
| | | | | | | | | | Regression introduced with https://github.com/owncloud/core/pull/11615 | ||||
* | | | Merge pull request #11383 from ockham/share-tags2 | Lukas Reschke | 2014-10-16 | 2 | -5/+62 |
|\ \ \ | | | | | | | | | Share tags | ||||
| * | | | In Tags::rename($from, $to), check if there already is a tag named $to. | Bernhard Reiter | 2014-10-14 | 1 | -2/+2 |
| | | | | |||||
| * | | | Add option to include tags for shared items. | Bernhard Reiter | 2014-10-14 | 2 | -1/+26 |
| | | | | |||||
| * | | | Implement Tag and TagMapper classes. | Bernhard Reiter | 2014-10-14 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | Subclassed from \OCP\AppFramework\Db\Entity and Mapper, respectively. This will allow us to also deal with shared tags. | ||||
| * | | | Test addMultiple() with $sync=true. | Bernhard Reiter | 2014-10-14 | 1 | -1/+30 |
| | | | | |||||
| * | | | Test Tags::getFavorites(). | Bernhard Reiter | 2014-10-14 | 1 | -0/+2 |
| | | | | |||||
* | | | | Merge pull request #11595 from owncloud/make_get_display_name_more_robust | blizzz | 2014-10-16 | 1 | -0/+46 |
|\ \ \ \ | | | | | | | | | | | strip whitespace from the beginning and end of the display name | ||||
| * | | | | strip whitespace from the beginning and end of the display name to avoid ↵ | Bjoern Schiessle | 2014-10-15 | 1 | -0/+46 |
| | | | | | | | | | | | | | | | | | | | | empty display names | ||||
* | | | | | Merge pull request #11570 from owncloud/backport-11408-master | Lukas Reschke | 2014-10-15 | 2 | -0/+197 |
|\ \ \ \ \ | | | | | | | | | | | | | Backport 11408 master | ||||
| * | | | | | Refactor MailSettings controller | Lukas Reschke | 2014-10-14 | 2 | -0/+197 |
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Do not store the password (fixes https://github.com/owncloud/core/issues/11385) - Refactor to AppFramework - Add unit tests Conflicts: settings/admin/controller.php | ||||
* | | | | | Merge pull request #11528 from owncloud/use-raw-url | Lukas Reschke | 2014-10-15 | 2 | -2/+6 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Use `rawurlencode` since this seems to be expected by cURL | ||||
| * | | | | Use `rawurlencode` since this seems to be expected by cURL | Lukas Reschke | 2014-10-14 | 2 | -2/+6 |
| |/ / / | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/pull/11501#issuecomment-58794405 | ||||
* / / / | Add unit test | Robin Appelman | 2014-10-13 | 1 | -33/+63 |
|/ / / |