Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | | | |||||
| * | | | | fixing cache routes | Clark Tomlinson | 2014-09-22 | 3 | -7/+7 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #11215 from owncloud/dav-throwwhendeletefailed | Morris Jobke | 2014-09-23 | 2 | -5/+122 |
|\ \ \ \ | | | | | | | | | | | WebDAV now throws 403 when deletion did not work | ||||
| * | | | | WebDAV now throws 403 when deletion did not work | Vincent Petry | 2014-09-22 | 2 | -5/+122 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assume a permission issue whenever a file could not be deleted. This is because some storages are not able to return permissions, so a permission denied situation can only be triggered during direct deletion. | ||||
* | | | | | Merge pull request #11211 from owncloud/previewProviderSwitch | Morris Jobke | 2014-09-23 | 3 | -23/+0 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Add a configuration switch for enabled preview mimetypes | ||||
| * | | | | Remove unneeded unit tests | Lukas Reschke | 2014-09-22 | 3 | -23/+0 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #11204 from owncloud/fix_oc_stream_seek | Morris Jobke | 2014-09-22 | 1 | -0/+10 |
|\ \ \ \ | |/ / / |/| | | | Fix oc stream seek | ||||
| * | | | add seek and tell to streamwrapper test | Jörn Friedrich Dreyer | 2014-09-21 | 1 | -0/+10 |
| |/ / | |||||
* | | | Merge pull request #9225 from voxsim/fix_displayNamesInGroup | blizzz | 2014-09-22 | 1 | -11/+299 |
|\ \ \ | |/ / |/| | | fix in displayNamesInGroup | ||||
| * | | add more logic in displayNamesInGroup for big user bases | voxsim | 2014-09-15 | 1 | -11/+33 |
| | | | |||||
| * | | change logic in displayNamesInGroup and add some unit tests | voxsim | 2014-08-28 | 1 | -11/+277 |
| | | | |||||
* | | | Merge pull request #11142 from owncloud/fix-windows | Lukas Reschke | 2014-09-19 | 1 | -0/+4 |
|\ \ \ | | | | | | | | | Resolves cache tests failing if the directory length is longer than 64 | ||||
| * | | | Resolves cache tests failing if the directory length is longer than 64 | Clark Tomlinson | 2014-09-17 | 1 | -0/+4 |
| | |/ | |/| | |||||
* | | | Merge pull request #11163 from owncloud/check-for-updates-between-major-versions | Vincent Petry | 2014-09-19 | 1 | -0/+34 |
|\ \ \ | | | | | | | | | Prevent updates between multiple major versions | ||||
| * | | | Prevent updates between multiple major versions | Lukas Reschke | 2014-09-18 | 1 | -0/+34 |
| | | | | | | | | | | | | | | | | Ref https://github.com/owncloud/core/issues/11078 | ||||
* | | | | Merge pull request #10958 from owncloud/db-ilike | Robin Appelman | 2014-09-19 | 1 | -0/+55 |
|\ \ \ \ | |/ / / |/| | | | Introduce cross-db ILIKE | ||||
| * | | | Fix ILIKE without wildcards for oracle | Robin Appelman | 2014-09-18 | 1 | -0/+4 |
| | | | | |||||
| * | | | add test case for ILIKE with wildcard | Robin Appelman | 2014-09-16 | 1 | -0/+31 |
| | | | | |||||
| * | | | adding ILIKE to AdapterSQLSrv | Thomas Müller | 2014-09-16 | 1 | -0/+5 |
| | | | | |||||
| * | | | Introduce cross-db ILIKE | Robin Appelman | 2014-09-16 | 1 | -0/+15 |
| | | | | |||||
* | | | | Remove unused and overflowing function | Lukas Reschke | 2014-09-18 | 1 | -5/+0 |
| |/ / |/| | | | | | | | | Resolves https://github.com/owncloud/core/issues/10991 failure 4 | ||||
* | | | Merge pull request #10932 from owncloud/issue/10926 | Morris Jobke | 2014-09-17 | 1 | -0/+19 |
|\ \ \ | | | | | | | | | Add a method to get the absolute url for a route | ||||
| * | | | Add unit test | Lukas Reschke | 2014-09-08 | 1 | -0/+19 |
| | | | | | | | | | | | | | | | | This unit test is shitty but at least it works... | ||||
* | | | | Merge pull request #7254 from owncloud/core-sortalgo | Lukas Reschke | 2014-09-16 | 1 | -0/+182 |
|\ \ \ \ | |_|/ / |/| | | | Fixed JS sort comparator to be consistent between JS and PHP | ||||
| * | | | Fixed sort algo for additional cases | Vincent Petry | 2014-08-11 | 1 | -0/+4 |
| | | | | |||||
| * | | | Fixed file list sorting | Vincent Petry | 2014-08-11 | 1 | -0/+178 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now using a natural sort algorithm that is more consistent between JS and PHP (although not perfect in some corner cases) - added OC.Util.naturalSortComparator that uses the same algo that was used for the user list - changed user list and files list to use OC.Util.naturalSortComparator - removed toLowerCase() and changed the comparator to use String.localeCompare() - added unit tests - added OC_NaturalSort that is used by OCP\Util::naturalSortCompare() | ||||
* | | | | Merge pull request #10362 from owncloud/preserve_transparency_on_fileload | Morris Jobke | 2014-09-16 | 1 | -0/+3 |
|\ \ \ \ | | | | | | | | | | | Preserve transparency when loading from a file | ||||
| * | | | | Preserve transparency when loading from a file | kondou | 2014-09-10 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | Fix #7148 - again :) | ||||
* | | | | | Add timeout to user and group deletion notification | Vincent Petry | 2014-09-15 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added timeout in DeleteHandler to auto-delete after a delay. Fixed issue where OC.Notification.hide() was called twice in a row when deleting multiple entries, causing the second notification to disappear. Fixed issue where "undo" click event handler was registered multiple times when calling setNotifications() twice. Added JS unit tests for the DeleteHandler class. Refix undo users, groups feature Timeout is now cleared in cancel(). Fixed click handler name for "undo" to be able to work with multiple DeleteHandler instances (in our case one for users and one for groups) so that there is no conflict. | ||||
* | | | | | content size checks are not valid for LOCK | Thomas Müller | 2014-09-12 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | Fix contructor in test | Robin Appelman | 2014-09-10 | 1 | -3/+3 |
| | | | | | |||||
* | | | | | Load apps in test situations | Robin McCorkell | 2014-09-10 | 1 | -0/+4 |
|/ / / / | |||||
* | | | | requesttoken has now a length of 30 chars | Thomas Müller | 2014-09-10 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #10844 from owncloud/acceptance-enableapps | Lukas Reschke | 2014-09-09 | 4 | -9/+304 |
|\ \ \ \ | | | | | | | | | | | Added acceptance tests for enabling apps | ||||
| * | | | | Added acceptance tests for enabling apps | Vincent Petry | 2014-09-03 | 4 | -9/+304 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This tests whether a user can see navigation entries after enabling apps. This includes the app's group restriction. This currently expects that a group "group1" exists until we have code to auto-generate groups. This commit also provides a utility function Page.multiselectSetSelection() to make it possible to select entries inside a multiselect. | ||||
* | | | | | Merge pull request #10972 from ppaysant/routes-defaults | Bernhard Posselt | 2014-09-09 | 1 | -4/+22 |
|\ \ \ \ \ | | | | | | | | | | | | | Allow default values for route parameters. |