Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
|/ / / | |||||
* | | | make some storage tests explain what went wrong | Jörn Friedrich Dreyer | 2014-10-08 | 1 | -6/+6 |
| | | | |||||
* | | | Add flock to config | Lukas Reschke | 2014-09-30 | 1 | -40/+92 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a file lock to the config in hope that this prevents race conditions as reported in https://github.com/owncloud/core/issues/11070 Testplan: - [ ] Delete config.php and make it read-only => Error is thrown that it is not writeable - [ ] Installation still works - [ ] Changing config settings works (i.e. using the SMTP config switches in the administration menu) - [ ] Your PC didn't blow up - [ ] Installing the news app and the "Disable AppCode checker" app did not destroy your installation Only skip the main config Otherwise read only additional configs might not be processed Test on tmpdir | ||||
* | | | Merge pull request #10107 from owncloud/sharing_group_shares | Lukas Reschke | 2014-09-29 | 2 | -17/+102 |
|\ \ \ | | | | | | | | | [sharing] group shares | ||||
| * | | | fix unit tests | Bjoern Schiessle | 2014-09-24 | 2 | -5/+22 |
| | | | | |||||
| * | | | unit tests for grouping of shares pointing to the same source | Bjoern Schiessle | 2014-09-22 | 1 | -12/+80 |
| | | | | |||||
* | | | | Adding test helper to test private methods | Clark Tomlinson | 2014-09-26 | 1 | -0/+28 |
| | | | | |||||
* | | | | Merge pull request #11285 from owncloud/dav-permissions-create | Thomas Müller | 2014-09-26 | 1 | -0/+55 |
|\ \ \ \ | | | | | | | | | | | Fix dav permissions for folders | ||||
| * | | | | Fix dav permissions for folders without create permissions | Robin Appelman | 2014-09-25 | 1 | -0/+55 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #10934 from owncloud/datadir-write-setup | Vincent Petry | 2014-09-25 | 1 | -19/+72 |
|\ \ \ \ | |/ / / |/| | | | Don't complain about non-writable datadirs before we're installed | ||||
| * | | | Don't complain about non-writable datadirs before we're installed | Robin Appelman | 2014-09-18 | 1 | -0/+37 |
| | | | | |||||
| * | | | Inject config into checkserver and cleanup tests | Robin Appelman | 2014-09-18 | 1 | -19/+35 |
| | | | | |||||
* | | | | Merge pull request #11222 from owncloud/store-users-timezone-master | Thomas Müller | 2014-09-23 | 1 | -0/+24 |
|\ \ \ \ | | | | | | | | | | | send browsers timezone back tp the server on login | ||||
| * | | | | enhance formatDate function to accept an optional argument containing the ↵ | Thomas Müller | 2014-09-22 | 1 | -0/+24 |
| | | | | | | | | | | | | | | | | | | | | time zone | ||||
* | | | | | Merge pull request #11234 from owncloud/fix-icon-classes | Jan-Christoph Borchardt | 2014-09-23 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix icon classes, disappeared delete icon | ||||
| * | | | | | correct delete-icon to icon-delete, fix #11128 | Jan-Christoph Borchardt | 2014-09-22 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #11241 from owncloud/use-lower-case | Thomas Müller | 2014-09-23 | 1 | -1/+4 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Use only lower-case letters | ||||
| * | | | | | | Use only lower-case letters | Lukas Reschke | 2014-09-22 | 1 | -1/+4 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/11239 | ||||
* | | | | | | Merge pull request #11032 from owncloud/harden-redirect | Lukas Reschke | 2014-09-23 | 1 | -0/+88 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Do only follow HTTP and HTTPS redirects | ||||
| * | | | | | | Do only follow HTTP and HTTPS redirects | Lukas Reschke | 2014-09-22 | 1 | -0/+88 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We do not want to follow redirects to other protocols since they might allow an adversary to bypass network restrictions. (i.e. a redirect to ftp:// might be used to access files of a FTP server which might be in a secure zone and not be reachable from the net but from the ownCloud server) Get final redirect manually using get_headers() Migrate to HTTPHelper class and add unit tests | ||||
* | | | | | | Merge pull request #11227 from owncloud/fix-windows-path | Thomas Müller | 2014-09-23 | 4 | -7/+10 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | fixing directory seperators | ||||
| * | | | | | | ignoring writedata test in windows. | Clark Tomlinson | 2014-09-22 | 1 | -0/+3 |
| | | | | | | |