Andreas Fischer
df849bb69a
HHVM Workaround: Do not use Exception from Stream.
...
Works around https://github.com/facebook/hhvm/issues/2436#issuecomment-69351373
2015-01-09 17:01:17 +01:00
Robin McCorkell
631d6571fd
Merge pull request #13181 from owncloud/filecache-preventleadingslash
...
Trim leading or trailing slashes in file cache paths
2015-01-09 13:54:17 +00:00
Thomas Müller
1f1643b35f
Merge pull request #12995 from owncloud/tbelau666-master
...
Use Doctrines filter by table name
2015-01-09 14:17:14 +01:00
Morris Jobke
6a5f12beca
Merge pull request #12988 from owncloud/logfile_download
...
Logfile download
2015-01-09 00:33:22 +01:00
Vincent Petry
aa821ecc00
Trim leading or trailing slashes in file cache paths
2015-01-08 19:43:02 +01:00
Lukas Reschke
7fbb7f4dc4
Add version to .htaccess
...
Currently if a user does not replace the .htaccess file with the new update this can lead to serious problems in case Apache is used as webserver.
This commit adds the version to the .htaccess file and the update routine fails in case not the newest version is specified in there. This obviously means that every release has to update the version specified in .htaccess as well. But I see no better solution for it.
Conflicts:
lib/private/updater.php
2015-01-08 12:49:02 +01:00
Georg Ehrke
f579f2bd94
add Download logfile button to admin settings
...
add logSettingsController
add download logfile button
move getEntries to LogSettingsController
move set log level to logsettingscontroller.php
add warning if logfile is bigger than 100MB
add unit test for set log level
fix typecasting, add new line at EoF
show log and logfile download only if log_type is set to owncloud
add unit test for getFilenameForDownload
2015-01-07 14:55:53 +01:00
Lukas Reschke
3e324f87d0
Use proper test name
2015-01-05 09:54:14 +01:00
Lukas Reschke
7b3f736300
Use proper namespace
2015-01-05 09:54:14 +01:00
Lukas Reschke
0ed00bca43
Use namespace
2015-01-05 09:54:14 +01:00
Lukas Reschke
556c9b6f46
Write unit-tests and use DI
2015-01-05 09:54:12 +01:00
Tom Needham
dc85c20b18
Add provisioning_api app
...
enable unit tests for provisioning api
fix admin docu key
2014-12-24 22:15:20 +01:00
Thomas Müller
40330bf492
Merge pull request #12830 from owncloud/intelligent-container
...
Intelligent container
2014-12-23 15:36:55 +01:00
Morris Jobke
6fd1a9563e
add proper prefix for migration tests
2014-12-23 11:05:53 +01:00
Bernhard Posselt
f195123765
Intelligent container
...
* resolves dependencies by type hint or variable name
* simpler route.php
* implementation of https://github.com/owncloud/core/issues/12829
Generates and injects parameters automatically. You can now build full classes like
$c->query('MyClassName')
without having to register it as a service. The resolved object's instance will be saved by using registerService. If a constructor parameter is not type hinted, the parameter name will be taken.
Therefore the following two implementations are identical:
class Class1 { function __construct(MyClassName $class)
class Class1 { function __construct($MyClassName)
This makes it possible to also inject primitive values such as strings, arrays etc.
In addition if the query could not be resolved, a `QueryException` is now thrown
Routes can now be returned as an array from `routes.php` and an `appinfo/application.php` is optional
Old commit messages:
make it possible to return the routes instead of having to intialize the application
try to get the controller by convention
add first implementation of automatic resolve
add another test just to be sure
store the resolved object
more tests
add phpdoc to public app.php method
use the same variable for the public app.php method
deprecate old methods and add services for public interfaces
deprecated getServer method
disallow private api injection for apps other than core or settings (settings should be an app goddamnit :D)
register userid because its such an often used variable
fix indention and leading slash
use test namespace
add deprecation reasons, remove private api usage checks and remove deprecation from getServer()
add additional public interfaces
add public interface for rootfolder
fix syntax error
remove deprecation from methods where no alternative is there yet
remove deprecated from method which has no alternative
add timezone public service for #12881
add another deprecation hint
move deprecation into separate branch
remove dead comment
first try to get the namespace from the info.xml, if it does not exist, just uppercase the first letter
also trim the namespace name
add an interface for timefactory
move timefactory to public and add icontrollermethodreflector
keep core interface
fix copyright date in headers
2014-12-23 09:50:42 +01:00
Andreas Fischer
4569953e5c
Clean up test table in Connection Test to prevent unnecessary failures.
2014-12-23 01:01:58 +01:00
Thomas Müller
fe6f4a1404
Merge pull request #11810 from owncloud/hhvm-autotest
...
Adding autotest-hhvm.sh [WIP]
2014-12-22 14:12:03 +01:00
Andreas Fischer
91e03f5845
Properly call parent::tearDown() in MDB2SchemaManager::tearDown().
...
The early return introduced by 04c982a96e
prevents parent::tearDown() being called on Oracle.
2014-12-20 15:30:35 +01:00
Bjoern Schiessle
24993280ed
Next step in server-to-server sharing next generation, see #12285
...
Beside some small improvements and bug fixes this will probably the final state for OC8.
To test this you need to set up two ownCloud instances. Let's say:
URL: myPC/firstOwnCloud user: user1
URL: myPC/secondOwnCloud user: user2
Now user1 can share a file with user2 by entering the username and the URL to the second ownCloud to the share-drop-down, in this case "user2@myPC/secondOwnCloud".
The next time user2 login he will get a notification that he received a server-to-server share with the option to accept/decline it. If he accept it the share will be mounted. In both cases a event will be send back to user1 and add a notification to the activity stream that the share was accepted/declined.
If user1 decides to unshare the file again from user2 the share will automatically be removed from the second ownCloud server and user2 will see a notification in his activity stream that user1@myPC/firstOwnCloud has unshared the file/folder from him.
2014-12-19 15:20:24 +01:00
Thomas Müller
2d64797320
Merge pull request #12956 from owncloud/jenkins-user-backend-names
...
[jenkins only] introduce names for user backends - IUserBackend
2014-12-19 13:15:50 +01:00
Morris Jobke
6da33e1ea7
introduce names for user backends - IUserBackend
...
* LDAP with multiple servers also proved backendName
2014-12-19 10:17:17 +01:00
Thomas Müller
995f01fa2a
Merge pull request #12921 from owncloud/user-mail-user-management
...
Mail address of users is now changable in the user management
2014-12-19 09:51:18 +01:00
Morris Jobke
39d6ddd38a
Merge pull request #12865 from owncloud/files-tags-webdav
...
Returns tags through WebDAV
2014-12-19 09:33:28 +01:00
Andreas Fischer
48d6724a6f
HHVM sets stream meta datum wrapper_type to 'File' instead of 'user-space'.
2014-12-19 00:58:37 +01:00
Morris Jobke
114a6464e8
Merge pull request #12748 from owncloud/redis_cache
...
Add Redis cache implementation, prefer over memcached, tests & config sample doc
2014-12-19 00:26:25 +01:00
Morris Jobke
75e8b39826
Merge pull request #12879 from owncloud/mountconfig
...
Add mount specific options
2014-12-18 23:38:14 +01:00
Morris Jobke
5913af8a72
Mail address of users is now changable in the user management
...
* introduced new route settings/users/{id}/mailAddress
* kept old responses
* better error messages
* dropped lostpassword.php from settings/ajax
* cleaned up the UserList.add() and hand in user object instead of
each attribute as another parameter
* check for change permission of mail address
* proper response messages
2014-12-18 22:43:09 +01:00
Thomas Müller
5327b80430
Merge pull request #12870 from owncloud/send-mail-new-user
...
Send mail for new users
2014-12-18 22:32:37 +01:00
Thomas Müller
0132a619e7
Merge pull request #12168 from owncloud/docker-webdav
...
Setup a docker container that holds a webdav instance to test files_exte...
2014-12-17 22:12:01 +01:00
Morris Jobke
7c1b9aedd5
Setup a docker container that holds a webdav instance to test files_external
...
document docker parameter and use random host port
fix typo
copy autotest.sh to autotest-external.sh
adds ability to add start* and stop* scripts in env in external tests
run files_external WebDAV tests against ownCloud instance
introduce executor number to be able to shut down the correct docker container
fetch docker images in advance - this also fetches latest versions of the docker images
add second argument to autotest-external.sh which can specify a single test to run
print out the explicit test run
change naming schema of files_external setup scripts
2014-12-17 21:50:35 +01:00
Bernhard Posselt
6779bf113d
add isAdmin and isInGroup methods for the group manager
2014-12-17 17:41:57 +01:00
Bernhard Posselt
0f535e3866
fix tests
2014-12-17 17:40:52 +01:00
Bernhard Posselt
0939c3147e
use two tests instead of one
2014-12-17 17:40:52 +01:00
Bernhard Posselt
236632702c
add a isLoggedIn method to the usersession and deprecate the isLoggedIn method on the api
2014-12-17 17:40:52 +01:00
Vincent Petry
0b3f0716fc
Returns and update tags through WebDAV PROPFIND and PROPPATCH
...
Added oc:tags and oc:favorites in PROPFIND response.
It is possible to update them with PROPPATCH.
These properties are optional which means they need to be requested
explicitly
2014-12-17 16:50:35 +01:00
Robin Appelman
fd85424742
Add getMountPoint to FileInfo
2014-12-17 14:03:50 +01:00
Morris Jobke
04e172c2ce
add unit tests for new user create mail
2014-12-16 17:54:30 +01:00
Joas Schilling
26100a6dfb
Move timezone logic out of server.php
2014-12-16 16:16:22 +01:00
Morris Jobke
eb97bb5617
Merge pull request #12846 from owncloud/fix-searchbytags-test
...
Sort results to make sure assert work on consistent order
2014-12-15 13:23:59 +01:00
Bernhard Posselt
be45366013
Merge pull request #12625 from owncloud/app-dependencies-libs-and-commands
...
adding dependencies for command line tools and php libraries
2014-12-15 12:34:46 +01:00
Vincent Petry
5007289422
Sort results to make sure assert work on consistent order
2014-12-15 11:32:32 +01:00
Morris Jobke
efb495b09f
Merge pull request #12726 from owncloud/add-filter-for-backend-to-rest-index
...
Add filter for backend to rest index
2014-12-13 08:50:15 +01:00
Lukas Reschke
d5b26e682c
Use array key instead of value
2014-12-12 16:42:25 +01:00
Vincent Petry
c7ce3b84f0
Merge pull request #12806 from owncloud/display-backend-in-usermgnt
...
Show user backend in user management
2014-12-12 16:23:39 +01:00
Vincent Petry
4b57892c4e
Merge pull request #12778 from owncloud/searchbytags2
...
Added searchByTags to view, storage and cache
2014-12-12 14:27:19 +01:00
Morris Jobke
04aaa72810
Show user backend in user management
...
* add switch to settings to show user backend
* user classes for headers and rows to unify the show/hide statement
* add user backend to response of user create request
* proper markup in settings area
2014-12-12 14:19:29 +01:00
Thomas Müller
79dfff2b4a
adding unit tests for PlatformRepository::normalizeVersion()
2014-12-12 13:33:22 +01:00
Joas Schilling
4f92e4a233
Merge pull request #12808 from owncloud/add-special-parameterlist-to-manager
...
Add special parameterlist to manager
2014-12-12 13:03:26 +01:00
Lukas Reschke
26b0a89874
Add test for user without backend
2014-12-12 12:39:31 +01:00
Thomas Müller
dcb88e395b
rework api of DependencyAnalyzer
2014-12-12 12:34:53 +01:00
Vincent Petry
15ecb28d50
Make $userId mandatory for searchByTags
...
$userId is now a mandatory parameter for searchByTags.
Also fixed some places in the code where the argument was missing (Node
API and View)
2014-12-12 11:18:35 +01:00
Vincent Petry
25dde7e93b
Added searchByTags to view, storage and cache
2014-12-11 17:38:50 +01:00
Thomas Müller
f1d1714113
fix unit tests
2014-12-11 16:22:30 +01:00
Thomas Müller
6566dc83e7
single dependencies will not be represented as an array + fix unit tests
2014-12-11 15:37:45 +01:00
Joas Schilling
e3dfddb48a
Add test for getSpecialParameterList()
2014-12-11 15:01:45 +01:00
Morris Jobke
8fd90e04b6
Merge pull request #12781 from owncloud/jenkins-curl-open-basedir
...
[Jenkins only] curl open basedir
2014-12-11 14:15:24 +01:00
Joas Schilling
17d68e0638
Merge pull request #12780 from owncloud/make-datetimeformattertest-reliable
...
Use a fixed timestamp so we dont switch days/years with the getTimestampAgo
2014-12-11 14:11:07 +01:00
Joas Schilling
affeea8c72
Use a fixed timestamp so we dont switch days/years with the getTimestampAgo
2014-12-11 13:22:05 +01:00
Joas Schilling
cbad5c998b
Correctly fallback to english, if the plural case is not translated
2014-12-11 12:42:21 +01:00
Vincent Petry
745d8706b9
Add user parameter to tag manager
2014-12-11 12:22:28 +01:00
Thomas Müller
5a03e0a5cf
adding dependency to owncloud version - with fallback to requiremin and requiremax
2014-12-11 12:02:12 +01:00
Thomas Müller
ee46548f57
adding dependencies for supported platforms
2014-12-11 12:02:12 +01:00
Thomas Müller
770f987659
adding supported libraries - including min and max version
2014-12-11 12:02:11 +01:00
Thomas Müller
08f1db4451
adding dependencies for command line tools
2014-12-11 12:02:11 +01:00
Lukas Reschke
9ea205dc3d
Check if open_basedir is set
...
The file:// protocol does not work with curl when an open_basedir is set.
This fixes https://github.com/owncloud/core/issues/12016
2014-12-11 00:09:55 +01:00
Thomas Müller
6143232da6
Merge pull request #12746 from owncloud/skip-longpath-test-again
...
skip testLongPath()
2014-12-10 17:22:04 +01:00
Vincent Petry
5101bc54fa
Add login/logout to TestCase base class
2014-12-10 16:11:27 +01:00
Robin Appelman
3898fbc0d2
Merge pull request #12750 from owncloud/cache-numericstorageidfix
...
Fix numeric storage id for cache wrapper
2014-12-10 15:03:41 +01:00
Joas Schilling
fd2599cfc2
Merge pull request #12485 from owncloud/jenkins-12383
...
New DateTimeFormatter class for dates in other timezones and languages
2014-12-10 14:48:59 +01:00
Vincent Petry
ebba54d490
Fix numeric storage id for cache wrapper
2014-12-10 13:05:31 +01:00
Jörn Friedrich Dreyer
363e9667ec
Add Redis cache implementation, prefer over memcached, tests & config sample
2014-12-10 12:24:20 +01:00
Thomas Müller
d648b548eb
skip testLongPath()
2014-12-10 12:20:30 +01:00
Lukas Reschke
5dc6406b70
Add filter for 'backend' to user REST route
...
This adds a "backend" type filter to the index REST route which is a pre-requisite for https://github.com/owncloud/core/issues/12620
For example when calling `index.php/settings/users/users?offset=0&limit=10&gid=&pattern=&backend=OC_User_Database` only users within the backend `OC_User_Database` would be shown. (requires sending a CSRF token as well)
Depends upon https://github.com/owncloud/core/pull/12711
2014-12-10 12:07:34 +01:00
Joas Schilling
4d232e536e
Deprecate Util::formatDate()
...
Make DateTimeFormatter a service and adjust tests that have been inaccurate
2014-12-10 11:58:56 +01:00
Lukas Reschke
5398bbdc00
Merge pull request #12711 from owncloud/add-backend-to-rest-index
...
Expose backend type via REST API
2014-12-10 11:56:45 +01:00
Thomas Müller
7028c7150d
Merge pull request #12664 from owncloud/fix-12164
...
Use httphelper and cache response even when it is empty
2014-12-10 05:42:08 +01:00
Victor Dubiniuk
adab0ca98a
Remove leftover
2014-12-10 02:21:10 +03:00
Victor Dubiniuk
c9fd3c9d29
Inject config
2014-12-10 01:13:38 +03:00
Morris Jobke
263e008d7b
Merge pull request #12695 from owncloud/db-drop-table
...
Add dropTable to IDBConnection
2014-12-09 18:40:56 +01:00
Robin Appelman
b66c0a1631
add unit tests for tableExists and dropTable
2014-12-09 17:26:53 +01:00
Joas Schilling
681caf882a
Add sometests and copy tests from Util::formatDate to new class
2014-12-09 16:10:24 +01:00
Joas Schilling
f53f25eafe
Merge pull request #12409 from owncloud/tags-getTagsForObjectIds
...
Add getTagsForObjects in ITags
2014-12-09 13:27:38 +01:00
Lukas Reschke
7a290a3d6b
Make class compatible
2014-12-09 12:25:22 +01:00
Lukas Reschke
4c13918bd8
Expose backend type via REST API
...
This change will expose the user backend via the REST API which is a pre-requisite for https://github.com/owncloud/core/issues/12620 .
For example:
````json
[{"name":"9707A09E-CA9A-4ABE-A66A-3F632F16C409","displayname":"Document Conversion User Account","groups":[],"subadmin":[],"quota":"default","storageLocation":"\/Users\/lreschke\/Programming\/core\/data\/9707A09E-CA9A-4ABE-A66A-3F632F16C409","lastLogin":0,"backend":"OCA\\user_ldap\\USER_LDAP"},{"name":"ED86733E-745C-4E4D-90CB-278A9737DB3C","displayname":"Hacker","groups":[],"subadmin":[],"quota":"default","storageLocation":"\/Users\/lreschke\/Programming\/core\/data\/ED86733E-745C-4E4D-90CB-278A9737DB3C","lastLogin":0,"backend":"OCA\\user_ldap\\USER_LDAP"},{"name":"71CDF45B-E125-450D-983C-D9192F36EC88","displayname":"admin","groups":[],"subadmin":[],"quota":"default","storageLocation":"\/Users\/lreschke\/Programming\/core\/data\/71CDF45B-E125-450D-983C-D9192F36EC88","lastLogin":0,"backend":"OCA\\user_ldap\\USER_LDAP"},{"name":"admin","displayname":"admin","groups":["admin"],"subadmin":[],"quota":"default","storageLocation":"\/Users\/lreschke\/Programming\/core\/data\/admin","lastLogin":"1418057287","backend":"OC_User_Database"},{"name":"test","displayname":"test","groups":[],"subadmin":[],"quota":"default","storageLocation":"\/Users\/lreschke\/Programming\/core\/data\/test","lastLogin":0,"backend":"OC_User_Database"}]
```
2014-12-09 12:04:19 +01:00
Thomas Müller
5609d421cd
Merge pull request #12672 from LEDfan/cm-per-unit
...
Fix Contactsmanager permission + unit test
2014-12-09 10:57:22 +01:00
Thomas Müller
c36bac3abd
Merge pull request #12406 from owncloud/drop-getApps-getUsers
...
Config cleanup - OC_Preferences refactoring
2014-12-09 09:36:38 +01:00
Lukas Reschke
25a87d4058
Merge pull request #12577 from owncloud/public-mount-api
...
Add a public api for apps to add mounts
2014-12-08 22:57:33 +01:00
Morris Jobke
9a7362dd0d
drop unused isDebugMode and setDebugMode of OC_Config
2014-12-08 22:42:44 +01:00
Morris Jobke
0d4f0ab871
reduce OC_Preferences, OC_Config and \OCP\Config usage
...
* files_encryption
* files_versions
* files_trashbin
* tests
* status.php
* core
* server container
2014-12-08 22:42:37 +01:00
Morris Jobke
2d5fc9c1a6
Workaround to fix the too early init dilemma
...
* this needs to be properly fixed by a proper organisation of the base.php
* introduced fixDIInit() in AllConfig that moves the injection
of DatabaseConnection to a later point in time
* problems mostly because of the autoconfig setup
2014-12-08 22:33:36 +01:00
Morris Jobke
af91ee97c9
introduce preCondition for setUserValue to provide atomic check-and-update
2014-12-08 22:33:36 +01:00
Morris Jobke
f0b10324ca
Refactoring of OC_Preferences to AllConfig
...
* keep old static methods - mapped to new ones and deprecated
* removed deleteApp, getUsers, getApps because they are unused
* make AllConfig unit tests more robust against not cleaned up environments
2014-12-08 22:33:29 +01:00
Morris Jobke
a9e411e076
migrate \OC\AllConfig to \OCP\IConfig
2014-12-08 22:29:43 +01:00
Morris Jobke
50c2a819a0
Extract interaction with config.php into SystemConfig
...
* introduce SystemConfig to avoid DI circle (used by database connection which is itself needed by AllConfig that itself contains the methods to access the config.php which then would need the database connection - did you get it? ;))
* use DI container and use that method in legacy code paths (for easier refactoring later)
* create and use getSystemConfig instead of query() in DI container
2014-12-08 22:29:42 +01:00
Vincent Petry
cae600722e
Add getTagsForObjects in ITags
...
Returns the list of tags that are set on the given object ids.
2014-12-08 22:02:00 +01:00
Victor Dubiniuk
81d5712419
Fix tests. Add two more test cases
2014-12-08 22:16:47 +03:00
Lukas Reschke
c23957811d
React on other statuscodes than 200
2014-12-08 16:35:13 +01:00
Lukas Reschke
8b3e389062
Add statuscodes
2014-12-08 15:32:59 +01:00
LEDfan
3d11e091d9
Mock interface
2014-12-08 13:18:00 +01:00
Lukas Reschke
fe7d9a7ca0
Add REST route for user & group management
...
First step of a somewhat testable user management. - I know, the JSON returns are in an ugly format but the JS expects it that way. So let's keep it that way until we have time to fix the JS in the future.
2014-12-08 12:11:01 +01:00
LEDfan
c05ff09651
Use PHPUnit mocks
2014-12-07 14:10:41 +01:00
LEDfan
88ad095cc7
Add unit test for contactsmanager
2014-12-07 08:39:15 +01:00
Victor Dubiniuk
2a3f5ccae3
Test OC\Updater::check
2014-12-06 20:17:59 +03:00
Morris Jobke
4ec1da3014
Merge pull request #12583 from owncloud/trim-port
...
Trim port from domain
2014-12-05 11:27:20 +01:00
Joas Schilling
e81c2a49d1
Merge pull request #12622 from owncloud/disable-for-all
...
Disable when no sendmail is available
2014-12-05 10:10:43 +01:00
Morris Jobke
b6975143ff
Merge pull request #12619 from owncloud/use-also-original-hea
...
Merge headers
2014-12-04 16:59:42 +01:00
Robin Appelman
f4701d7721
Add public api for mount configurations
2014-12-04 16:47:27 +01:00
Morris Jobke
f3213571bb
Merge pull request #12616 from owncloud/node-fileinfo
...
make \OC\Files\Node\Node implement the FileInfo interface
2014-12-04 16:34:30 +01:00
Lukas Reschke
e1e8031798
Disable when no sendmail is available
2014-12-04 16:22:44 +01:00
Morris Jobke
a0488453ac
Merge pull request #12596 from owncloud/remove-travis-traces
...
Remove last traces of travis integration
2014-12-04 16:04:15 +01:00
Lukas Reschke
d2e8358da2
Fix unit test
2014-12-04 15:54:32 +01:00
Robin Appelman
672495a1a3
make \OC\Files\Node\Node implement the FileInfo interface
2014-12-04 13:27:08 +01:00
Lukas Reschke
81541c56b6
Add test for IPv6 without port
2014-12-04 12:16:33 +01:00
Thomas Müller
b55ac514ac
no nested xml tags on dependencies
2014-12-04 11:40:33 +01:00
Thomas Müller
086ec3de15
adding command dependency
2014-12-04 11:40:33 +01:00
Thomas Müller
b028a6afac
adjust dependency analyzer to use attributes properly
2014-12-04 11:40:33 +01:00
Thomas Müller
c80ec91f28
switch to different parsing implementation to get xml attributes properly handled
2014-12-04 11:40:33 +01:00
Thomas Müller
ba52c996cf
adding supported databases
2014-12-04 11:40:33 +01:00
Thomas Müller
b469e9f6fb
introduce dependency analyzer to take care of app dependencies
...
some more unit tests on xml info parser
2014-12-04 11:40:33 +01:00
Thomas Müller
f74d568bda
adding new dependency for php version in apps info.xml
2014-12-04 11:40:33 +01:00
Morris Jobke
bf1b62a34a
PHP < 5.4 is not supported anymore - see #12606
2014-12-04 11:05:45 +01:00
Morris Jobke
2c5e4b3d3f
Remove last traces of travis integration
2014-12-04 10:09:13 +01:00
Lukas Reschke
69f5f6649e
Trim port from domain
...
Depending on the used environment the port might be appended to the host header resulting in an inaccessible instance when initially setting up on a system with a different HTTP or HTTPS port. (for example test:500)
To test this setup ownCloud under a different port with and without this patch. (heads-up: localhost is always white-listed, so use a different domain)
2014-12-03 19:59:50 +01:00
Thomas Müller
3d9c72d2d9
Merge pull request #12544 from owncloud/fix-windows-unittests
...
Replace uniqid calls with $this->getUniqueID so tests pass again on windows
2014-12-03 17:49:10 +01:00
Morris Jobke
e014a18b4a
drop files_external tests from autotest - they will be executed with autotest-external.sh which is coming
2014-12-03 16:38:25 +01:00
Joas Schilling
ea4c25609d
Replace uniqid calls with $this->getUniqueID so tests pass again on windows
2014-12-03 12:10:55 +01:00
Lukas Reschke
f0e6876f2e
Merge pull request #12488 from owncloud/activity_group_multiple_conditions
...
activitymanager: concatenate queries with 'or'
2014-11-28 17:35:05 +01:00
Bjoern Schiessle
bf2c9be066
concatenate queries with 'or'
2014-11-28 14:46:27 +01:00
Joas Schilling
9cfae2ed44
Skip lostcontroller sending email test on windows
2014-11-28 11:38:22 +01:00
Morris Jobke
b188710af3
Merge pull request #12472 from owncloud/modifyCookies
...
Add functions to modify cookies to response class
2014-11-28 10:16:22 +01:00
Morris Jobke
7a9af8c40c
Merge pull request #12443 from owncloud/issue/6101-all-classes-autoloadable
...
Issue/6101 Make all interfaces/classes autoloadable
2014-11-28 09:40:27 +01:00
Joas Schilling
dfde04291e
Move share interfaces to own files so they can be autoloaded
2014-11-27 17:47:19 +01:00
Robin Appelman
33b64868d7
Add storage and cache wrappers to apply a permissions mask to a storage
2014-11-27 15:25:57 +01:00
Robin Appelman
abb6e89c5d
Add storage and cache wrappers to jail a storage to a subfolder
2014-11-27 15:25:53 +01:00
Lukas Reschke
048139074d
Add functions to modify cookies to response class
...
Currently there is no AppFramework way to modify cookies, which makes it unusable for quite some use-cases or results in untestable code.
This PR adds some basic functionalities to add and invalidate cookies.
Usage:
```php
$response = new TemplateResponse(...);
$response->addCookie('foo', 'bar');
$response->invalidateCookie('foo');
$response->addCookie('bar', 'foo', new \DateTime('2015-01-01 00:00'));
```
Existing cookies can be accessed with the AppFramework using `$this->request->getCookie($name)`.
2014-11-27 14:19:00 +01:00
Joas Schilling
e1f3abf7a5
Correctly namespace and autoload DatabaseException
2014-11-27 11:10:04 +01:00
Morris Jobke
60e4aa120f
Merge pull request #12350 from mprokop/link_expiration
...
fix calculation of expiration date if there is a default expiration date...
2014-11-26 10:19:12 +01:00
Morris Jobke
c5fa8f1bdc
Merge pull request #12421 from owncloud/issue/6101-remove-namespace-permission-constants
...
Issue/6101 remove namespace permission constants
2014-11-26 08:31:23 +01:00
Morris Jobke
e9696a8c9a
Merge pull request #12420 from owncloud/sqlite-wal-2
...
adding new config parameter for sqlite to specify the journal mode
2014-11-26 00:47:22 +01:00
Thomas Müller
5d4b7e0e2b
fix failing unit test for the temp manager - concurrently executed unit tests influence each other
2014-11-25 22:16:48 +01:00
Joas Schilling
2c39aec8cb
Replace deprecated constant with new class constant
2014-11-25 16:30:21 +01:00
Thomas Müller
a6c088a1ef
adding new config parameter for sqlite to specify the journal mode
2014-11-25 16:29:06 +01:00
Thomas Müller
5ce34fbaf6
handle invalid xml file
2014-11-25 11:53:28 +01:00
Thomas Müller
d4f107d4dd
simplify xml parser code
2014-11-25 11:53:28 +01:00
Thomas Müller
c503ecd544
Introduce app info xml parser including basic unit test - necessary for #10777
2014-11-25 11:53:28 +01:00
Lukas Reschke
eb1dcb87c1
Merge pull request #12380 from owncloud/remove-oc-migrate
...
Remove OC_Migrate
2014-11-25 00:25:37 +01:00
Thomas Müller
ddacd7f900
Merge pull request #12294 from owncloud/route-postfix
...
Add route postfix to allow url versioning when only the http method changed
2014-11-24 16:32:54 +01:00
Morris Jobke
8782b2237c
Merge pull request #12084 from owncloud/sharing_fix_shared_with_info
...
sharing: make sure that we only find the shares from a given owner
2014-11-24 11:44:43 +01:00
Lukas Reschke
216d617938
Remove OC_Migrate
...
This is unused legacy code. Let it die with ~~~honor~~ fire.
Fixes https://github.com/owncloud/core/issues/12346
2014-11-24 10:53:45 +01:00
Morris Jobke
fe46393115
Merge pull request #12348 from owncloud/rename-to-avoid-complaining-ci
...
Rename providers to not begin with test
2014-11-22 16:41:29 +01:00
Morris Jobke
2cc3edb10d
Merge pull request #12328 from owncloud/remove-testcleanuplistener
...
Remove testcleanuplistener
2014-11-22 10:05:47 +01:00
Bjoern Schiessle
a7ebfe87c9
also check for the correct owner if it was submitted
2014-11-21 16:17:37 +01:00
Miguel Prokop
397f14ed86
Consolidate if statement, and update unit test
2014-11-21 13:31:56 +01:00
Lukas Reschke
5f6f54e785
Rename providers to not begin with test
...
Fixes https://github.com/owncloud/core/issues/12347
2014-11-21 10:54:41 +01:00
Morris Jobke
75d37b69f6
fix unit tests of mdb2scheamreader
2014-11-20 22:35:37 +01:00
Morris Jobke
593ef76e36
Revert "drop OC_Preferences::getUsers and getApps"
...
This reverts commit 09fd34eed9
.
2014-11-20 22:02:26 +01:00
Morris Jobke
09fd34eed9
drop OC_Preferences::getUsers and getApps
2014-11-20 17:56:05 +01:00
Joas Schilling
b842059285
Remove testcleanuplistener.php
2014-11-20 15:26:27 +01:00
Joas Schilling
84d358a761
Clean up the test data in tearDownAfterClass()
...
The result of the listener should then be empty and can be removed
2014-11-20 15:26:26 +01:00
Morris Jobke
46e6104795
Merge pull request #12297 from owncloud/issue/10991-all-testcase
...
Issue/10991 all testcase
2014-11-20 14:53:18 +01:00
Vincent Petry
6a08fca363
Merge pull request #12253 from owncloud/port-12154
...
Port 12154
2014-11-20 12:47:27 +01:00
Joas Schilling
6202ca33ba
Make remaining files extend the test base
2014-11-19 14:53:59 +01:00
Joas Schilling
cb3a598cdb
Make root tests extend the \Test\TestCase
2014-11-19 14:53:51 +01:00
Joas Schilling
76ebd3a050
Make apps/ extend the \Test\TestCase and fix overwritten methods
2014-11-19 14:52:09 +01:00
Joas Schilling
bb540722cd
Use base class to reset the file mapper
2014-11-19 14:52:07 +01:00
Lukas Reschke
1c8f9564a4
Merge pull request #11696 from owncloud/addWarningToEncryptionLostPassword
...
Warn for password reset when files_encryption is enabled
2014-11-19 13:05:02 +01:00
Bernhard Posselt
4e90c44301
add postfix
...
add postfix
2014-11-19 12:01:42 +01:00
Lukas Reschke
d0a30b0e55
Ignore port for trusted domains
...
This lead to a lot of confusion in the past and did not really offer any value. Let's remove the port check therefore. (it's anyways not really a part of the domain)
Fixes https://github.com/owncloud/core/issues/12150 and https://github.com/owncloud/core/issues/12123 and also a problem reported by @DeepDiver1975.
Conflicts:
lib/private/request.php
2014-11-18 12:36:03 +01:00
Bjoern Schiessle
01c50d242b
use the new base class for unit tests
2014-11-18 11:46:28 +01:00
Bjoern Schiessle
5192641447
make sure that we don't find the wrong shares if a user and a group have the same ID
2014-11-18 11:03:08 +01:00
Lukas Reschke
8071657cd5
Merge pull request #12234 from owncloud/normalizepath-absolute-tests
...
Add tests for normalizePath() with absolute paths on windows
2014-11-18 10:24:46 +01:00
Lukas Reschke
767b08c669
Use correct route instead
...
THX @schiesbn
(I should setup a mail server on my local system...)
2014-11-17 17:50:19 +01:00
Lukas Reschke
60ae2894aa
Fix scrutinizer issues
2014-11-17 17:50:19 +01:00
Lukas Reschke
1b50d4f7ce
Warn for password reset when files_encryption is enabled
...
This patch wil warn the user of the consequences when resetting the password and requires checking a checkbox (as we had in the past) to reset a password.
Furthermore I updated the code to use our new classes and added some unit tests for it 👯
Fixes https://github.com/owncloud/core/issues/11438
2014-11-17 17:50:19 +01:00
Joas Schilling
ccc1001138
Add tests for absolute paths on windows
2014-11-17 16:59:11 +01:00
Joas Schilling
806284f06c
Refactor tests to use a dataProvider method
2014-11-17 16:52:45 +01:00
Morris Jobke
146cb920c9
Merge pull request #12218 from owncloud/issue/10991-fixes
...
Issue/10991 Make unit tests pass on windows
2014-11-17 16:44:45 +01:00
Robin Appelman
36528c6ef6
Merge pull request #12031 from owncloud/app-manager
...
Add \OC\App\Manager to handle enabling/disabling apps
2014-11-17 15:49:15 +01:00
Joas Schilling
6625d5c88f
Correctly restore previous root mount point after testing
2014-11-17 10:48:19 +01:00
Joas Schilling
289a27778e
Correctly refresh the apps list after removing the mock
2014-11-17 10:48:17 +01:00
Joas Schilling
53318c4bb5
Fix Files\Storage\Home::testRoot()
2014-11-17 10:48:16 +01:00
Joas Schilling
39ae569c5c
Correctly close handle of directory when listing certificates
2014-11-17 10:48:14 +01:00
Joas Schilling
a3a064fe96
Skip some more tests on Windows which just can not work at all
2014-11-17 10:48:06 +01:00
Lukas Reschke
cd5925036a
Check if app is enabled for user
...
Fixes https://github.com/owncloud/core/issues/12188 for AppFramework apps
2014-11-15 11:13:55 +01:00
Lukas Reschke
3fa892aecc
Fail...
2014-11-14 13:42:13 +01:00
Lukas Reschke
1358f3f17b
Mark skipped until #12085 is merged
...
See https://github.com/owncloud/core/pull/12175#issuecomment-63054620
2014-11-14 13:19:02 +01:00
Jan-Christoph Borchardt
d5796bbaf9
Merge pull request #12128 from owncloud/drop-formfactor
...
Drop form_factor that is appended to JS, CSS and template filenames
2014-11-12 16:23:19 +01:00
Morris Jobke
952abdc51a
Drop form_factor that is appended to JS, CSS and template filenames
2014-11-12 13:07:23 +01:00
Morris Jobke
710241f056
Merge pull request #12093 from AdamWill/storage-test-touch
...
storage test: use new file for testTouchCreateFile()
2014-11-12 10:59:41 +01:00
Thomas Müller
4c1244f50c
Merge pull request #11917 from owncloud/fix-11909
...
Add checkbox to enforce SSL for subdomains
2014-11-11 20:37:50 +01:00
Adam Williamson
e0ae87051f
storage test: use new file for testTouchCreateFile()
...
this test would never succeed, because the previous test -
testFOpen() - creates the file 'foo', but testTouchCreateFile()
starts out by asserting it doesn't exist. Change the test to
use a file called 'touch' instead (which does not previously
exist).
2014-11-10 17:49:35 -08:00
Robin Appelman
43eb375ace
Add \OC\App\Manager to handle enabling/disabling apps
2014-11-10 13:52:52 +01:00
Joas Schilling
a9c2e5a08e
Windows does not support CHMOD, therefor we can not test not writable folders
2014-11-10 11:05:17 +01:00
Robin Appelman
d26a427f92
Also propagate etag changes when the watcher finds a changed file
2014-11-07 12:56:09 +01:00
Joas Schilling
f2282e4251
Test LargeFileHelperGetFileSize also with ascii only characters
...
And skip the UTF8 names on Windows as they are not supported
2014-11-06 17:36:36 +01:00
Joas Schilling
216ef617db
Do not use uniqid in Group and User tests as it is not unique on windows
2014-11-06 17:36:35 +01:00
Joas Schilling
62047f86f5
Testcase base class
2014-11-06 17:36:34 +01:00
Lukas Reschke
24ca2d858f
Add OCP\Security\IHasher
...
Public interface for hashing which also works with legacy ownCloud hashes and supports updating the legacy hash via a passed reference.
Follow-up of https://github.com/owncloud/core/pull/10219#issuecomment-61624662
Requires https://github.com/owncloud/3rdparty/pull/136
2014-11-06 15:16:14 +01:00
Lukas Reschke
f73d653036
Merge pull request #11972 from owncloud/usermanager-remove-delete
...
Remove confusingly names \OC\User\Manager::delete and fix the automatic ...
2014-11-06 13:52:25 +01:00
Lukas Reschke
4659b0e6a0
Merge pull request #11936 from owncloud/bower-jquery
...
Bower jquery
2014-11-05 16:43:24 +01:00
Robin Appelman
1eefc21329
Remove confusingly names \OC\User\Manager::delete and fix the automatic cache cleanup instead
2014-11-05 15:45:58 +01:00
Bernhard Posselt
91a23bfa9c
fix typo in content type
2014-11-05 12:04:56 +01:00
Morris Jobke
74d375d8ea
migrate jQuery to bower
2014-11-04 14:28:29 +01:00
Morris Jobke
1a405e56f5
replace moment.js with bower version
...
* fix JS unit tests
2014-11-03 20:54:50 +01:00
Lukas Reschke
e73ccbd4ca
Migrate "setsecurity.php" to the AppFramework
...
Add switch to enforce SSL for subdomains
Add unit tests
Add test for boolean values
Camel-case
Fix ugly JS
2014-11-03 16:53:03 +01:00
Thomas Müller
f776bcd4a0
remove unnecessary require calls - the ownCloud class loader is supposed to take care of this
2014-10-30 17:20:40 +01:00
Morris Jobke
e2001c6d31
Merge pull request #11821 from owncloud/generic-response
...
Add a generic data response
2014-10-30 14:05:25 +01:00
Vincent Petry
106b9eb55c
Merge pull request #11409 from owncloud/watcher-reuse
...
Pass the cached data to the filesystem watcher
2014-10-29 16:38:16 +01:00
Thomas Müller
2f19de11e4
adding console command to generate javascript translation files based on existing php translation files
...
read server side translations from json files
2014-10-29 10:09:12 +01:00
Bernhard Posselt
0696099bad
add dataresponse
...
fix docstrings
adjust copyright date
another copyright date update
another header update
implement third headers argument, fix indention, fix docstrings
fix docstrings
2014-10-29 09:43:47 +01:00
Adam Williamson
0e3f2055d2
use Composer autoloader not OC for non-Composer 3rdparty ( #9643 )
...
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.
2014-10-28 11:32:20 +01:00
Lukas Reschke
7466ff09bb
Merge pull request #11799 from owncloud/no-stable-etags-on-windows
...
On Windows platform we have no stable etag generation - yet
2014-10-27 22:33:14 +01:00
Lukas Reschke
d6380a5395
Merge pull request #11786 from owncloud/MakeSupportedDBsConfigurable
...
Make supported DBs configurable within config.php
2014-10-27 22:24:16 +01:00
Lukas Reschke
233c49f4b9
Make supported DBs configurable within config.php
...
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".
2014-10-27 21:39:34 +01:00
Thomas Müller
d0ce600eec
On Windows platform we have no stable etag generation - yet
2014-10-27 20:48:47 +01:00
Robin Appelman
8de287f2ef
Merge pull request #11763 from owncloud/stable-etags
...
Generate stable etags for local files
2014-10-27 15:30:30 +01:00
Thomas Müller
9fa5483111
Merge pull request #11709 from owncloud/temp-handling
...
Cleanup handling of temporary files
2014-10-24 19:29:05 +02:00
Robin Appelman
283c10f010
Generate stable etags for local files
2014-10-24 16:47:58 +02:00
Clark Tomlinson
25a4b5a935
Merge pull request #11735 from owncloud/mssql-migrations-master
...
disable database migration unit tests for MSSQL
2014-10-24 09:16:43 -04:00
Robin Appelman
16cfca6a5f
Better reuse of cache data for getFolderContents
2014-10-24 12:33:54 +02:00
Robin Appelman
83c74b80ad
Add \OC\TempManager to handle creating and cleaning temporary files
2014-10-24 12:18:46 +02:00
Thomas Müller
e26a16afea
Merge pull request #11549 from owncloud/add-more-localizations-master
...
implement localizations based on punic
2014-10-23 16:09:47 +02:00
Thomas Müller
5aab98c4bf
disable database migration unit tests for MSSQL
2014-10-23 14:35:44 +02:00
Thomas Müller
770f643e5c
Merge pull request #11259 from owncloud/fix-windows-max-depth-test
...
fixing windows max depth test
2014-10-23 14:34:39 +02:00
Thomas Müller
6c1871da06
Merge pull request #10985 from owncloud/db-cleanup
...
Cleanup database handling
2014-10-23 13:48:33 +02:00
Thomas Müller
02c5933af8
introduce SessionMiddleWare to control session handling via an annotation
2014-10-22 12:44:19 +02:00
Robin Appelman
0dcb832039
Fix tags unit test
2014-10-22 12:29:53 +02:00
Thomas Müller
69db442c49
fixing expected values for formatDate() unit tests
2014-10-21 16:05:35 +02:00
Vincent Petry
51976b2729
Add proper setup and teardown
...
Properly restore REQUEST_URI and SCRIPT_NAME after test runs
2014-10-20 17:11:08 +02:00
Lukas Reschke
4ce3c25c5c
Add "$_SERVER['REQUEST_URI']" to fix the unit tests
...
Let's hope that works
2014-10-20 15:09:44 +02:00
Lukas Reschke
8f8abdbaee
Add unit tests for convertToRelativePath
2014-10-20 15:09:43 +02:00
Thomas Müller
a359fe7e6a
adding unit tests for en_GB and en-GB - just to verify
2014-10-20 15:04:42 +02:00
Thomas Müller
c8e8945efb
implement localizations based on punic
2014-10-20 15:04:42 +02:00
Arthur Schiwon
7ff7a49f3d
adjust group manager tests
2014-10-17 20:53:09 +02:00
blizzz
688a141586
Merge pull request #9104 from macjohnny/macjohnny-drastic-ldap-speedup
...
drastic ldap speedup (update)
2014-10-17 12:07:27 +02:00
Lukas Reschke
8502354382
Fix unit test
...
Regression introduced with https://github.com/owncloud/core/pull/11615
2014-10-16 15:41:45 +02:00
Lukas Reschke
5f3ddf5c80
Merge pull request #11383 from ockham/share-tags2
...
Share tags
2014-10-16 15:36:04 +02:00
blizzz
756f64d728
Merge pull request #11595 from owncloud/make_get_display_name_more_robust
...
strip whitespace from the beginning and end of the display name
2014-10-16 11:33:12 +02:00
Lukas Reschke
f48c973876
Merge pull request #11570 from owncloud/backport-11408-master
...
Backport 11408 master
2014-10-15 21:21:45 +02:00
Lukas Reschke
f82b996f57
Merge pull request #11528 from owncloud/use-raw-url
...
Use `rawurlencode` since this seems to be expected by cURL
2014-10-15 19:58:27 +02:00
Bjoern Schiessle
239bff5766
strip whitespace from the beginning and end of the display name to avoid empty display names
2014-10-15 14:54:35 +02:00
Lukas Reschke
13b1b45ee4
Refactor MailSettings controller
...
- Do not store the password (fixes https://github.com/owncloud/core/issues/11385 )
- Refactor to AppFramework
- Add unit tests
Conflicts:
settings/admin/controller.php
2014-10-14 15:38:34 +02:00
Lukas Reschke
1b3feb710d
Use `rawurlencode` since this seems to be expected by cURL
...
Fixes https://github.com/owncloud/core/pull/11501#issuecomment-58794405
2014-10-14 13:16:23 +02:00
Bernhard Reiter
226d7233e1
In Tags::rename($from, $to), check if there already is a tag named $to.
2014-10-14 00:06:07 +02:00
Bernhard Reiter
7e9baafc53
Add option to include tags for shared items.
2014-10-14 00:06:07 +02:00
Bernhard Reiter
5471189fe6
Implement Tag and TagMapper classes.
...
Subclassed from \OCP\AppFramework\Db\Entity and Mapper,
respectively. This will allow us to also deal with shared tags.
2014-10-14 00:06:07 +02:00
Bernhard Reiter
3e5d725502
Test addMultiple() with $sync=true.
2014-10-14 00:06:07 +02:00
Bernhard Reiter
a67803fb5d
Test Tags::getFavorites().
2014-10-14 00:06:07 +02:00
Robin Appelman
7dd4314fea
Add unit test
2014-10-13 16:31:26 +02:00
Jörn Friedrich Dreyer
27bb968ffa
make some storage tests explain what went wrong
2014-10-08 18:49:52 +02:00
Clark Tomlinson
6de8531ace
fixing windows max depth test
2014-09-30 16:04:49 -04:00
Lukas Reschke
68cf6681e5
Add flock to config
...
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
2014-09-30 15:53:27 +02:00
Lukas Reschke
8c8e5c168e
Merge pull request #10107 from owncloud/sharing_group_shares
...
[sharing] group shares
2014-09-29 20:26:41 +02:00
Clark Tomlinson
2b209d27d0
Adding test helper to test private methods
2014-09-26 10:23:41 -04:00
Thomas Müller
e5a111b80e
Merge pull request #11285 from owncloud/dav-permissions-create
...
Fix dav permissions for folders
2014-09-26 09:21:32 +02:00
Vincent Petry
9fc23e1967
Merge pull request #10934 from owncloud/datadir-write-setup
...
Don't complain about non-writable datadirs before we're installed
2014-09-25 14:32:32 +02:00
Robin Appelman
10c350b895
Fix dav permissions for folders without create permissions
2014-09-25 14:01:19 +02:00
Bjoern Schiessle
72319bbc98
fix unit tests
2014-09-24 14:02:02 +02:00
Thomas Müller
c587a4aaa2
Merge pull request #11222 from owncloud/store-users-timezone-master
...
send browsers timezone back tp the server on login
2014-09-23 13:45:21 +02:00
Jan-Christoph Borchardt
a062db4fd0
Merge pull request #11234 from owncloud/fix-icon-classes
...
Fix icon classes, disappeared delete icon
2014-09-23 12:39:06 +02:00
Thomas Müller
42fe0b9e08
Merge pull request #11241 from owncloud/use-lower-case
...
Use only lower-case letters
2014-09-23 12:16:58 +02:00
Lukas Reschke
5d977f97b0
Merge pull request #11032 from owncloud/harden-redirect
...
Do only follow HTTP and HTTPS redirects
2014-09-23 11:34:44 +02:00
Thomas Müller
37a5bff155
Merge pull request #11227 from owncloud/fix-windows-path
...
fixing directory seperators
2014-09-23 07:38:23 +02:00
Morris Jobke
f970c81b1e
Merge pull request #11215 from owncloud/dav-throwwhendeletefailed
...
WebDAV now throws 403 when deletion did not work
2014-09-23 00:49:30 +02:00
Morris Jobke
051ed93e24
Merge pull request #11211 from owncloud/previewProviderSwitch
...
Add a configuration switch for enabled preview mimetypes
2014-09-23 00:45:59 +02:00
Lukas Reschke
1565d82b81
Use only lower-case letters
...
Fixes https://github.com/owncloud/core/issues/11239
2014-09-22 21:29:03 +02:00
Clark Tomlinson
59a5df6a4b
ignoring writedata test in windows.
2014-09-22 14:13:30 -04:00
Lukas Reschke
6eeb905871
Do only follow HTTP and HTTPS redirects
...
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
2014-09-22 20:02:32 +02:00
Clark Tomlinson
7b6aa3cd3d
fixing cache routes
2014-09-22 13:38:46 -04:00
Jan-Christoph Borchardt
91d9d45c6c
correct delete-icon to icon-delete, fix #11128
2014-09-22 18:17:33 +02:00
Bjoern Schiessle
9105e17307
unit tests for grouping of shares pointing to the same source
2014-09-22 17:54:47 +02:00
Lukas Reschke
cede9fd7ef
Remove unneeded unit tests
2014-09-22 16:50:08 +02:00
Morris Jobke
9e8d2907e2
Merge pull request #11204 from owncloud/fix_oc_stream_seek
...
Fix oc stream seek
2014-09-22 16:25:07 +02:00
Thomas Müller
814114ab8e
enhance formatDate function to accept an optional argument containing the time zone
2014-09-22 15:03:28 +02:00
Vincent Petry
470c25eff4
WebDAV now throws 403 when deletion did not work
...
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.
2014-09-22 13:15:17 +02:00
blizzz
b8a1340538
Merge pull request #9225 from voxsim/fix_displayNamesInGroup
...
fix in displayNamesInGroup
2014-09-22 12:13:15 +02:00
Jörn Friedrich Dreyer
ef6db5e9d7
add seek and tell to streamwrapper test
2014-09-21 22:47:40 +02:00
Lukas Reschke
079ad18bce
Merge pull request #11142 from owncloud/fix-windows
...
Resolves cache tests failing if the directory length is longer than 64
2014-09-19 13:02:22 +02:00
Vincent Petry
f0186d99d2
Merge pull request #11163 from owncloud/check-for-updates-between-major-versions
...
Prevent updates between multiple major versions
2014-09-19 12:20:22 +02:00
Robin Appelman
33f7af9207
Merge pull request #10958 from owncloud/db-ilike
...
Introduce cross-db ILIKE
2014-09-19 12:07:56 +02:00
Lukas Reschke
a71af58535
Prevent updates between multiple major versions
...
Ref https://github.com/owncloud/core/issues/11078
2014-09-18 17:56:06 +02:00
Robin Appelman
a85f0ae2da
Fix ILIKE without wildcards for oracle
2014-09-18 15:09:57 +02:00
Robin Appelman
23dd7cb51d
Don't complain about non-writable datadirs before we're installed
2014-09-18 13:33:13 +02:00
Robin Appelman
6fa3280c2a
Inject config into checkserver and cleanup tests
2014-09-18 13:33:13 +02:00
Lukas Reschke
d07d5915c9
Remove unused and overflowing function
...
Resolves https://github.com/owncloud/core/issues/10991 failure 4
2014-09-18 10:21:28 +02:00
Clark Tomlinson
55d56f2f0f
Resolves cache tests failing if the directory length is longer than 64
2014-09-17 16:24:43 -04:00
Morris Jobke
b644e8a5e7
Merge pull request #10932 from owncloud/issue/10926
...
Add a method to get the absolute url for a route
2014-09-17 13:05:26 +02:00
Robin Appelman
95815c0b57
add test case for ILIKE with wildcard
2014-09-16 21:03:03 +02:00
Lukas Reschke
d2743e6ad6
Merge pull request #7254 from owncloud/core-sortalgo
...
Fixed JS sort comparator to be consistent between JS and PHP
2014-09-16 17:29:03 +02:00
Thomas Müller
ca35d86c5a
adding ILIKE to AdapterSQLSrv
2014-09-16 15:44:21 +02:00
Robin Appelman
1771bfc2f2
Introduce cross-db ILIKE
2014-09-16 15:32:34 +02:00
Morris Jobke
245a0e2ad8
Merge pull request #10362 from owncloud/preserve_transparency_on_fileload
...
Preserve transparency when loading from a file
2014-09-16 08:33:56 +02:00
voxsim
1366133d2b
add more logic in displayNamesInGroup for big user bases
2014-09-15 18:37:54 +02:00
Vincent Petry
0d9f24a0ef
Add timeout to user and group deletion notification
...
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.
2014-09-15 14:04:44 +02:00
Thomas Müller
cfa2eb7d32
content size checks are not valid for LOCK
2014-09-12 22:02:42 +02:00
kondou
18ef7bf1ed
Preserve transparency when loading from a file
...
Fix #7148 - again :)
2014-09-10 23:49:21 +02:00
Robin Appelman
0878f722db
Fix contructor in test
2014-09-10 17:59:32 +02:00
Robin McCorkell
b754a8261a
Load apps in test situations
2014-09-10 17:28:25 +02:00
Thomas Müller
007802121c
requesttoken has now a length of 30 chars
2014-09-10 15:35:21 +02:00
Lukas Reschke
01e1157a54
Merge pull request #10844 from owncloud/acceptance-enableapps
...
Added acceptance tests for enabling apps
2014-09-09 23:44:06 +02:00
Bernhard Posselt
ba698a4942
Merge pull request #10972 from ppaysant/routes-defaults
...
Allow default values for route parameters.
2014-09-09 23:40:46 +02:00
Lukas Reschke
c3d90b96c8
Merge pull request #10922 from owncloud/explicit-scan-transactions
...
Use bigger transactions when doing explicit file system scans
2014-09-09 23:32:32 +02:00
Patrick Paysant
cb5416b798
Allow default values for route parameters.
2014-09-09 23:00:29 +02:00
Lukas Reschke
353155b516
Merge pull request #7323 from owncloud/Jonny007-MKD-master
...
Update adapter.php
2014-09-09 11:31:50 +02:00
Jörn Friedrich Dreyer
ed2414fd0d
Merge pull request #10886 from owncloud/keep_fileid_on_move_in_objectstore
...
Keep fileid on move in objectstore, fixes #10848
2014-09-09 10:25:10 +02:00
Lukas Reschke
c79c894dbb
Merge pull request #10755 from owncloud/shorter_sharing_links
...
Shorter sharing links
2014-09-08 17:26:20 +02:00
Lukas Reschke
3ad9489634
Add unit test
...
This unit test is shitty but at least it works...
2014-09-08 17:12:44 +02:00
Jörn Friedrich Dreyer
5943b7ac0d
w͢͢͝h͡o͢͡ ̸͢k̵͟n̴͘ǫw̸̛s͘ ̀́w͘͢ḩ̵a҉̡͢t ̧̕h́o̵r͏̵rors̡ ̶͡͠lį̶e͟͟ ̶͝in͢ ͏t̕h̷̡͟e ͟͟d̛a͜r̕͡k̢̨ ͡h̴e͏a̷̢̡rt́͏ ̴̷͠ò̵̶f̸ u̧͘ní̛͜c͢͏o̷͏d̸͢e̡͝
2014-09-08 15:26:41 +02:00
Robin Appelman
644755df66
Use bigger transactions when doing explicit file system scans
2014-09-08 14:15:41 +02:00
Jörn Friedrich Dreyer
c362c78d76
make objectstore tests check fileid on rename
2014-09-08 12:53:52 +02:00
Robin Appelman
58a1540587
remove unstable test
2014-09-05 11:53:24 +02:00
Robin Appelman
3d92f963f4
Fix unit test
2014-09-05 11:53:23 +02:00
Robin Appelman
65d24c3cd5
Improve unit tests for Cache\Updater
2014-09-05 11:53:23 +02:00
Robin Appelman
850542c5d6
Refactor Cache\Updater to work outside of the users home
2014-09-05 11:53:23 +02:00
kondou
ecc9b42e41
Match \OC_Helper::linkToPublic() to new links and fit unittests
2014-09-04 20:44:50 +02:00
Lukas Reschke
1a7df33233
Merge pull request #10818 from owncloud/enableappforgroupfix
...
Fix upgrade process when apps enabled for specific groups
2014-09-04 13:56:41 +02:00
Vincent Petry
d261ca616b
Merge pull request #10244 from owncloud/utf8-folder-test
...
add utf8 folder test
2014-09-04 13:42:17 +02:00
Vincent Petry
56eedca2c3
Added acceptance tests for enabling apps
...
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.
2014-09-03 16:32:55 +02:00
Lukas Reschke
373d1c5e9f
Merge pull request #10642 from owncloud/securityutils
...
Add some security utilities
2014-09-03 15:28:42 +02:00
Lukas Reschke
a54af89d8a
Add test for the second argument
2014-09-03 14:13:12 +02:00
Lukas Reschke
1ccbaae846
Refactor tests a little bit
2014-09-03 13:51:44 +02:00
Lukas Reschke
77c0adb520
Merge branch 'securityutils' of https://github.com/owncloud/core into securityutils
2014-09-03 11:04:49 +02:00
Lukas Reschke
50b430ee7c
Add char consts, hash the specified password for the HMAC
2014-09-03 11:03:27 +02:00
Vincent Petry
4a93a6e060
Added unit tests for cache of enabled apps
2014-09-03 11:01:59 +02:00
Vincent Petry
9d5f18c02f
Added test for needUpgrade for core
2014-09-02 17:28:05 +02:00
Vincent Petry
e05b95636b
Fix upgrade process when apps enabled for specific groups
...
Fix issue where the currently logged user was causing side-effects when
upgrading.
Now setting incognito mode (no user) on update to make sure the whole
apps list is taken into account with getEnabledApps() or isEnabled().
2014-09-02 17:16:14 +02:00
Vincent Petry
47c3a5c3b1
Fixed readme for acceptance tests
2014-09-01 22:57:54 +02:00
felixboehm
9020a375a7
Merge pull request #10733 from owncloud/acceptance_tests
...
ownCloud acceptance tests
2014-09-01 19:38:23 +02:00
Lukas Reschke
ae3425d2da
Merge branch 'master' into securityutils
...
Conflicts:
lib/private/util.php
2014-08-31 15:21:09 +02:00
Robin Appelman
3a85767182
5.3 syntax...
2014-08-31 13:16:28 +02:00
Robin Appelman
bfa0c4b78a
Explicitly set the timezones
2014-08-31 11:06:18 +02:00
Lukas Reschke
4bc9980f4b
Add test for expired certificate
...
Will only work after tomorrow
2014-08-31 10:47:50 +02:00
Lukas Reschke
4efe6f6240
Add unit tests and fix rootcerts creation bug
2014-08-31 10:47:50 +02:00
Felix Böhm
a3639a5c02
further documentation
2014-08-29 20:53:58 +02:00
Felix Böhm
c39dfad25a
fix login suite
2014-08-29 19:56:54 +02:00
Felix Böhm
41c5327fca
bump version of protractor in package.json
2014-08-29 19:56:54 +02:00
felixboehm
9023480a41
Update readme.md
2014-08-29 17:20:28 +02:00
Morris Jobke
d9202b711f
fix typo
2014-08-29 16:40:10 +02:00
Felix Böhm
b0e0893a1a
gitignore for node modules
2014-08-29 12:36:23 +02:00
Felix Böhm
50ae19cc5c
add bunch of acceptance tests
2014-08-29 12:26:30 +02:00
Jörn Friedrich Dreyer
f551917a3c
kill OC::$session
...
maintain deprecated \OC::$session when getting or setting the session via the server container or UserSession
restore order os OC::$session and OC::$CLI
remove unneded initialization of dummy session
write back session when $useCustomSession is true
log warning when deprecated app is used
2014-08-29 10:22:21 +02:00
voxsim
a49610e18a
change logic in displayNamesInGroup and add some unit tests
2014-08-28 13:51:48 +02:00
Clark Tomlinson
cb0da1178b
Merge pull request #10653 from owncloud/x-forwarded-for
...
Add support for getting the real client IP behind proxies
2014-08-27 10:32:34 -04:00
Oliver Gasser
47a2e31c93
Make Entity properties ```protected``` as in docs
...
Entity properties are marked as ```protected``` to correctly reflect the
documentation.
See also owncloud/documentation@644f2eedac
2014-08-27 13:31:51 +02:00
Björn Schießle
c35d60f6d8
Merge pull request #9915 from suraia/unsharefromself-source
...
Allow specifying the item source in unshareFromSelf().
2014-08-27 10:31:35 +02:00
Lukas Reschke
3329e0f2b2
Use DI
2014-08-27 00:49:53 +02:00
Lukas Reschke
d26a9c3c58
Add some security utilities
...
This adds some security utilities to core including:
- A library for basic crypto operations (e.g. to encrypt passwords)
- A better library for cryptographic actions which allows you to specify the charset
- A library for secure string comparisions
Remove .htaccess
Remove .htaccess
Fix typo
Add public API
Use timing constant comparision
Remove CBC constant
Adjust code
Remove confusing $this
2014-08-27 00:18:04 +02:00
Lukas Reschke
7acdd018a1
Add support for getting the real client IP behind proxies
...
Fixes https://github.com/owncloud/core/issues/10624
Fix copy paste fail
Add unittest for comma separated headers
Revert 3rdparty
2014-08-27 00:05:04 +02:00
Joas Schilling
6a7be8a36a
Use a data provider instead of calling the function manually everytime
2014-08-25 15:06:09 +02:00
Joas Schilling
51c9b3c62d
Add a test to break the slugifyPath() with folder and file afterwards
2014-08-25 14:38:33 +02:00
Michael Kuhn
0a77a5ec19
Add unit tests for new unshareFromSelf() functionality.
2014-08-23 12:05:19 +02:00
Thomas Müller
0e8916b147
Merge pull request #7539 from owncloud/repair-legacystorageid
...
Added repair script to upgrade the legacy home storage ids
2014-08-22 14:22:39 +02:00
Morris Jobke
bcb3d03f6c
Fix windows tests skipping
...
* add call to setUp from inherited test class
2014-08-21 08:50:39 +02:00
Lukas Reschke
92c80dd946
Merge pull request #10518 from owncloud/fix_storage_const_autoload
...
Fix storage const autoload
2014-08-20 23:23:42 +02:00
Vincent Petry
04c982a96e
Fix unit test messing up the transaction on Oracle
...
Since the unit test is skipped anyway for Oracle, the dropTable() call
should be skipped as well to avoid having a leftover transaction and
cause further transactions to be nested and break the next test suites
requiring transactions.
2014-08-20 23:14:06 +02:00
Vincent Petry
068f9d10f1
Added repair step for legacy storages
2014-08-20 23:14:05 +02:00
Jörn Friedrich Dreyer
6c593c6adf
Merge pull request #10423 from owncloud/urlencode_s3_copyobject_copysource
...
urlencode s3 copyObject() copysource
2014-08-20 15:48:51 +02:00
Morris Jobke
b3b3354809
move to public namespace
2014-08-19 14:05:08 +02:00
Lukas Reschke
98fc56831d
Merge pull request #9275 from NormalRa/master
...
Add .apk mimetype.
2014-08-15 14:41:53 +02:00
Jörn Friedrich Dreyer
76c1095c25
add unit test for #8325
2014-08-14 17:18:46 +02:00
Normal Ra
8e11455f27
Add APK mimetype tests.
2014-08-13 13:38:16 +02:00
Bjoern Schiessle
1e0e870e18
don't clean up the test environment if a data provider was finished
2014-08-13 11:41:11 +02:00
Thomas Müller
fc46fbd154
Merge pull request #10333 from owncloud/tar-55
...
Fix Tar support for php >=5.5
2014-08-13 11:10:18 +02:00
Robin Appelman
174805f5e3
Merge pull request #9762 from owncloud/owner-public
...
Return the proper owner for home storages
2014-08-12 14:29:17 +02:00
Robin Appelman
482bca1713
Fix Tar support for php >=5.5
2014-08-11 16:56:36 +02:00
Vincent Petry
f2001a48a4
Fixed sort algo for additional cases
2014-08-11 13:28:53 +02:00
Vincent Petry
173059f6d0
Fixed file list sorting
...
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()
2014-08-11 13:28:53 +02:00
Jörn Friedrich Dreyer
6930ec2bcc
add utf8 folder test
2014-08-07 17:12:48 +02:00
Robin Appelman
f1091280de
Merge pull request #10184 from owncloud/getbyid-node
...
Fix Folder::getById
2014-08-07 13:40:17 +02:00
Robin Appelman
1deb6aadd3
return null instead of throwing an exception
2014-08-06 12:06:41 +02:00
Morris Jobke
e717833b07
mark tests as skipped - TODO travis
...
* swift causes some timeouts and test failures
2014-08-05 18:35:47 +02:00
Robin Appelman
bf8f910a32
Fix Folder::getById
2014-08-05 16:58:10 +02:00
Morris Jobke
676fa459d7
Minor fixes
...
* instanceof \OC\Files\View
* fix misplaced paranthesis
* remove misplaced character in comment
2014-08-05 16:53:28 +02:00
Robin Appelman
8d0e162daf
Don't rely on the sorting the database gives us for tests
2014-08-05 16:53:28 +02:00
Morris Jobke
38e309b0fe
Merge pull request #9970 from owncloud/sharing_set_expire_date
...
Sharing set expire date
2014-07-30 14:37:16 +02:00
Morris Jobke
06d118d06c
Merge pull request #10032 from owncloud/kill-swift-tests
...
only if the environment variable RUN_OBJECTSTORE_TESTS is set the object...
2014-07-30 13:47:03 +02:00
Thomas Müller
54d5d03271
Merge pull request #9888 from owncloud/mysql-tinyint-master
...
migration test for sqlite - adding type mapping for 'tinyint unsigned'
2014-07-30 11:48:10 +02:00
Thomas Müller
1a7d80acd7
only if the environment variable RUN_OBJECTSTORE_TESTS is set the object store unit test will be executed
2014-07-29 21:51:21 +02:00
Björn Schießle
a36c4402f5
Merge pull request #9988 from owncloud/sharing_remove_share_permission
...
remove share permission if user is excluded from sharing
2014-07-29 14:05:13 +02:00
Bjoern Schiessle
67e302885c
remove share permission if user is excluded from sharing
2014-07-29 10:08:08 +02:00
Thomas Müller
58472a2660
migration test for sqlite - adding type mapping for 'tinyint unsigned'
2014-07-29 09:18:37 +02:00
Thomas Müller
09ebe1cfa6
function declaration did not match
2014-07-29 00:34:02 +02:00
Bjoern Schiessle
1bba266417
add unit test
2014-07-28 22:45:03 +02:00
Björn Schießle
c53b56e313
Merge pull request #9798 from owncloud/ocs_share_api_add_expire_date
...
[share api] add OCS api call to set expire date for link shares
2014-07-28 17:28:32 +02:00
Thomas Müller
a3411e3719
Merge pull request #9641 from owncloud/localuser-addressbook
...
ownCloud users are exported as address book
2014-07-28 12:18:56 +02:00
Bjoern Schiessle
ecc1f92bb6
add OCS api call to set expire date for link shares
2014-07-25 13:38:18 +02:00
Thomas Müller
176ecbd311
ownCloud users are exported as address book
2014-07-24 17:35:02 +02:00
Thomas Müller
65c824a2c0
Adding test which breaks because bit and/or enum datatypes are used
2014-07-24 12:10:05 +02:00
Robin Appelman
a8532aa2f0
Add test for homestorage getOwner
2014-07-22 16:30:25 +02:00
Andreas Fischer
8cd1f7464e
Merge pull request #9672 from owncloud/mysql-affectedrows
...
Make MySQL affected row count consistent with other DBMSes
* owncloud/mysql-affectedrows:
Added test of OCS privatedata to trigger key duplication
Document why we have to check with defined() first.
Make MySQL return "number of found rows" instead of number of "affected rows".
2014-07-20 21:29:16 +02:00
Thomas Müller
9ee8c60b5f
kill unused require of MapperTestUtility.php
2014-07-17 16:35:00 +02:00
Vincent Petry
8231f1ef8c
Added test of OCS privatedata to trigger key duplication
2014-07-17 13:18:49 +02:00
Thomas Müller
d430e743b3
fixing namespace of MapperTestUtility
...
and rename file to be lowercase
2014-07-17 11:22:27 +02:00
Andreas Fischer
e26612244a
Make MySQL return "number of found rows" instead of number of "affected rows".
2014-07-16 14:35:47 +02:00
Vincent Petry
b2c06354e8
Reenable proxies if a test failed to restore it
2014-07-15 23:05:01 +02:00
Thomas Müller
6c93bcc814
Merge pull request #9621 from owncloud/fix_logger_implementation
...
fix logger implementation
2014-07-15 16:05:15 +02:00
Jörn Friedrich Dreyer
4a855be814
fix logger implementation and test
2014-07-15 10:10:16 +02:00
Arthur Schiwon
ab2c7e06a4
remove dead code
...
do not filter groups. but update the user count according to the filter
improve phpdoc
improve metadata runtime cache
add metadata tests
2014-07-14 21:26:37 +02:00
Morris Jobke
9ee1c7ff71
Merge pull request #9228 from owncloud/remove-routing-singular-issues
...
Routing: Dont strip the s from the resource id to prevent possible weird behavior with irregular english plural nouns
2014-07-14 17:10:07 +02:00
Arthur Schiwon
4e8d52d5d8
test class is already in preferences.php
2014-07-09 10:49:40 +02:00
Thomas Müller
44ffc7a914
De-double class name
2014-07-09 09:36:36 +02:00
Thomas Müller
10978a80c2
Merge pull request #9507 from owncloud/fix-9302-master
...
Upload abortion is now detected within the OC_Connector_Sabre_File::put...
2014-07-08 17:39:34 +02:00
Thomas Müller
65d9d6ad01
Merge pull request #9412 from owncloud/public-api-activity
...
Public api activity
2014-07-08 16:37:18 +02:00
Arthur Schiwon
3338a0f236
port of #9500
...
don't trigger update from checkPassword, it is already called by userExists, this is enough.
do not write to database when the value is the same
add test cases. also split test classes in a file each, looks like only the first class is being executed
also appconfig shall not write to database if the value is unchanged
2014-07-08 16:32:01 +02:00
Robin Appelman
76c709d7de
Add repair step to set MySQL collation to utf8_bin
...
Set default collation of mysql connection to utf8_bin
Set utf_bin as default collation for new tables
2014-07-08 15:12:07 +02:00
Thomas Müller
ea269f0067
Upload abortion is now detected within the OC_Connector_Sabre_File::put()
...
OC_Connector_Sabre_AbortedUploadDetectionPlugin is pointless
Adding unit test testUploadAbort()
2014-07-08 11:09:59 +02:00
Thomas Müller
8363f3c635
Adding new interface \OCP\Activity\IExtentsion
...
Adding method getNotificationTypes()
Adding method filterNotificationTypes()
Adding method getDefaultTypes()
Adding method translate() and getTypeIcon()
Adding method getGroupParameter()
Adding method getNavigation()
Adding method getNavigation()
Adding method isFilterValid() and getQueryForFilter()
Adding unit tests for \OC\ActivityManager
2014-07-08 09:04:37 +02:00
Thomas Müller
b091b15f0b
MySQL: adding repair step to convert MyIsam tables to InnoDB
2014-07-07 12:32:24 +02:00
Jörn Friedrich Dreyer
aeeae5f1b2
Merge pull request #8308 from owncloud/case_insensitive_search_oracle
...
use case insensitive linguistic sort and compare when connecting to oracle
2014-07-04 15:51:57 +02:00
Jörn Friedrich Dreyer
b5545b81c6
make search case insensitive on postgres and oracle
2014-07-03 19:01:00 +02:00
Volkan Gezer
805a7cf485
Merge pull request #9338 from owncloud/fix-redirect-for-appframework
...
Redirect after session expiry to the previous loaded page
2014-07-02 11:39:41 +02:00
Morris Jobke
d31e532780
fix redirect URL unit test
2014-07-02 01:06:58 +02:00
Vincent Petry
94c3bac9ed
Merge pull request #9327 from owncloud/migrator-postgreskeywordtest
...
Added migrator test for reserved keyword
2014-07-01 20:40:18 +02:00
Vincent Petry
3d921ed3c3
Merge pull request #9334 from owncloud/defaultappfix
...
Default app fix
2014-07-01 20:39:13 +02:00
Jörn Friedrich Dreyer
b20018928d
add unit test
2014-07-01 18:03:32 +02:00
Vincent Petry
7c17452028
Added unit test for default app URL
2014-07-01 16:55:29 +02:00
blizzz
616f9b1e03
Merge pull request #9156 from owncloud/solve-8959
...
search term for users and groups may occur anywhere in the name or displ...
2014-07-01 14:37:09 +02:00
Vincent Petry
e4f068961e
Added test for reserved keywords
2014-07-01 12:55:36 +02:00
Vincent Petry
b752aff51d
Fix migrator tests to use the correct migrator instances
2014-07-01 12:54:35 +02:00
Vincent Petry
fd8b5680dd
Merge pull request #8383 from owncloud/object_storage
...
Object storage
2014-06-27 16:53:03 +02:00
Jan-Christoph Borchardt
b975f0e718
Merge pull request #9174 from owncloud/breadcrumbfix
...
Breadcrumb width calculation fix
2014-06-27 13:51:18 +02:00
Jörn Friedrich Dreyer
ab93f1949d
update hasUpdated description, overwrtie testStat for objectstore test
2014-06-27 12:14:31 +02:00
Vincent Petry
4b5bf606cb
Merge pull request #9215 from owncloud/officemimetypesupdatefix
...
Office mime types update fix
2014-06-27 11:23:19 +02:00
Vincent Petry
7ee90ddd59
Add missing quotes for Oracle
2014-06-26 19:25:37 +02:00
Vincent Petry
67d0a3c15e
Fixed mime type repair step
2014-06-26 16:40:12 +02:00
Bernhard Posselt
2662c4c61b
use id instead of resourceId
2014-06-26 14:20:35 +02:00
Bernhard Posselt
5496ca234b
dont strip the s from the resource
2014-06-26 14:02:20 +02:00
Vincent Petry
b749292c18
Added test case for when target mime types already exist
2014-06-25 19:49:18 +02:00
Vincent Petry
b1e778d5fd
Moved office mimetype update to a repair step
2014-06-25 19:49:18 +02:00
icewind1991
16396e2e33
Merge pull request #9123 from owncloud/webdav-move-permissions
...
Fix permissions check when moving a file to a different directory over webdav
2014-06-25 15:09:58 +02:00
Arthur Schiwon
f3ecf819ec
extend Dummy user and group implementation to pass tests
2014-06-25 13:13:53 +02:00
Arthur Schiwon
553c2ad33a
clean up created groups after testing, and correct parameter order
2014-06-24 21:56:08 +02:00
Vincent Petry
a7e7e86df0
Test runner now loads CSS and hides testArea
...
- serve CSS and font files properly to make sure that measurements are
correct for the tests that need them (breadcrumb)
- added opacity to testArea to make sure nothing is visible during
testing
2014-06-24 16:32:18 +02:00
macjohnny
de53bee9b3
adapted tests for a groupId indexed group array
2014-06-24 16:27:38 +02:00
Arthur Schiwon
5dab762006
add tests
2014-06-23 18:33:13 +02:00
Vincent Petry
0ab66d9b48
Added unit test for the helper's rmdirr
2014-06-23 16:48:25 +02:00
Jörn Friedrich Dreyer
28c1a95575
use common storage test
2014-06-23 16:29:01 +02:00
Robin Appelman
24f15fca64
Fix unit tests
2014-06-20 15:40:38 +02:00
Morris Jobke
ed10f56994
Merge pull request #9071 from owncloud/extstorage-list-unittests
...
Added JS unit tests for ext storage
2014-06-19 01:21:21 +02:00
Björn Schießle
edbc6b5db1
Merge pull request #9068 from owncloud/trashbin_unittests_master
...
fix trash bin expire operation and add unit tests
2014-06-18 15:32:16 +02:00
Jörn Friedrich Dreyer
5cae863408
change architecture from inheritance to composition
2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
5722e31d1a
add autocreate config option for containers, implement autocreate and delete of containers, use generated container names for tests
2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
7493ff0624
fix unit test by always initializing the root of the storage in the constructor
2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
c18836c8ae
add initial swift test with trystack
2014-06-18 12:53:20 +02:00
Bjoern Schiessle
b486f48fbc
fix trash bin expire operation and add unit tests
2014-06-17 22:36:30 +02:00
Vincent Petry
58c204abb4
Added JS unit tests for ext storage
...
Added JS unit tests for the external storage file list extension.
2014-06-17 18:29:07 +02:00
icewind1991
8d1cf79152
Merge pull request #8399 from owncloud/server-server-sharing
...
Add server<->server sharing
2014-06-17 17:40:05 +02:00
Vincent Petry
cce58368ad
Merge pull request #9065 from owncloud/migrator-keepprimaryindexname
...
Do not rename primary key index when renaming table
2014-06-17 16:43:33 +02:00
Vincent Petry
ffdc1c2fcf
Added unit test for checkMigrate with primary key + autoinc
...
Added unit test to make sure that checkMigrate() works when adding a
primary key and autoincrement column to a table schema.
2014-06-17 15:23:18 +02:00
Robin Appelman
07fdeba50b
Fix moving movablemount over webdav
2014-06-17 14:10:11 +02:00
Georg Ehrke
15c215cd03
Merge pull request #8808 from owncloud/update_shipped_apps_from_appstore
...
Make shipped apps updatable via appstore
2014-06-16 15:54:50 +02:00
Vincent Petry
a48bcceb23
Merge pull request #8917 from owncloud/repair-routine-base
...
Add support for repair step classes
2014-06-16 11:13:10 +02:00
Georg Ehrke
0890ce4f91
Update preseed-config.php
2014-06-13 00:07:43 +02:00
Vincent Petry
b595c982d0
Merge pull request #8968 from owncloud/scanner-parent-repair
...
Repair broken parent link in the scanner
2014-06-12 17:40:44 +02:00
Vincent Petry
ca690c4d02
Added RepairStep interface and default repair step lists
...
The updater is using "before update" repair steps and "regular" repair
steps.
The "regular" repair steps are also used by the CLI tool.
Currently no steps exist but can be added later in the static methods in
the \OC\Repair class.
Added unit test to test messaging, error and exception cases.
2014-06-12 17:38:26 +02:00
Vincent Petry
8e463926a0
Merge pull request #9004 from owncloud/cleanup-storages
...
Added check and cleanup for storage/filecache
2014-06-12 14:50:18 +02:00
Vincent Petry
19c73a8464
Added check and cleanup for storage/filecache
...
Some tests don't clean up the file cache and sometimes entries are
reused by mistake in subsequent test suites.
This cleans up the file cache and storage after every test suite and
also shows an annoying warning.
2014-06-12 13:45:39 +02:00
Vincent Petry
3e1576011f
Merge pull request #8980 from owncloud/better-accept-header
...
handle http accept headers more gracefully
2014-06-12 13:28:03 +02:00
Vincent Petry
67413e3ada
Use assertNotSame when checking etags
...
Sometimes etags contain a "e" character which makes PHP believe it's a
number and make the tests fail
2014-06-11 17:28:18 +02:00
Bernhard Posselt
93169eca1e
also handle lowercase headers
2014-06-11 01:20:09 +02:00
Bernhard Posselt
1002281dae
handle http accept headers more gracefully
2014-06-11 00:54:25 +02:00
Robin Appelman
21cfd1014a
Repair broken parent link in the scanner
2014-06-10 15:26:18 +02:00
Morris Jobke
e769ef9bbb
Merge pull request #8916 from owncloud/rmdirr-test-cleanup-fix
...
Added hacky fix for long path cleanup routine
2014-06-08 20:46:00 +02:00
Björn Schießle
3da47db33c
Merge pull request #8927 from owncloud/expire_only_link_shares
...
only expire link shares
2014-06-06 19:24:15 +02:00
Bjoern Schiessle
f15d7dfec0
only expire link shares
2014-06-06 15:47:37 +02:00
Thomas Müller
fe8bae31dc
adding PK to table encryption
...
adding auto increment/PK to table files_trash
adding PK to table ldap_user_mapping and ldap_group_members
adding PK to table ldap_group_mapping
truncate permissions table to allow smooth creation of primary key
adding unit test for creating an auto increment column on a table which already contains data
remove unneeded table files_trashsizes
fix unit test
no need to truncate *PREFIX*permissions
On Oracle adding auto increment columns is not working out of the box - Oracle migrations are to be done manually
2014-06-06 13:33:56 +02:00
Vincent Petry
6e2358c3a6
Added hacky fix for long path cleanup routine
2014-06-06 10:41:49 +02:00
Thomas Müller
3a7b30795c
Merge pull request #8783 from owncloud/remove-serializers
...
Remove controller serializers
2014-06-06 10:33:16 +02:00
Thomas Müller
ad4ec414c9
use system function to recursive remove the directory used by temporary storage
2014-06-06 09:29:31 +02:00
Georg Ehrke
0fe8f77c17
Merge branch 'master' into update_shipped_apps_from_appstore
...
Conflicts:
lib/private/app.php
settings/templates/apps.php
2014-06-05 22:54:27 +02:00
Thomas Müller
70e0ae0637
Merge pull request #8483 from owncloud/encryption_use_oc_preferences
...
[encryption] use oc preferences
2014-06-05 18:54:25 +02:00
Bernhard Posselt
587a8df566
remove controller serializers
2014-06-05 18:00:36 +02:00
Vincent Petry
1c59808517
Merge pull request #8865 from owncloud/improve_share_settings
...
Improve share settings
2014-06-05 17:23:42 +02:00
Bjoern Schiessle
2d83424a29
allow to set pre-condition for setValue
2014-06-05 16:54:03 +02:00
Thomas Müller
4b650a20a4
Merge pull request #8893 from owncloud/feature/get-users-by-preference
...
Add method to get users by their preference
2014-06-05 16:52:00 +02:00
Thomas Müller
6aab50f8aa
fix unit tests
2014-06-05 16:32:12 +02:00
Bjoern Schiessle
6578f00b4b
unify share settings
2014-06-05 15:49:34 +02:00
Joas Schilling
d493c0c9ac
Sort the result before comparing
2014-06-05 15:21:53 +02:00
Thomas Müller
e1beb8c6c3
Merge pull request #8889 from owncloud/mtime-reuse
...
Don't update the mtime if the storage mtime hasn't changed
2014-06-05 13:18:18 +02:00
Joas Schilling
879237f32a
Add method to get users by their preference
2014-06-05 11:50:43 +02:00
Robin Appelman
9dab6ec2ec
Fix uit tests
2014-06-05 11:31:55 +02:00
icewind1991
bd373d9621
Merge pull request #7878 from owncloud/quota-extstorageswitch
...
Added switch to count external storage data in quota
2014-06-05 11:23:32 +02:00
Thomas Müller
ff3ded6cb2
Merge pull request #8852 from owncloud/kill-permissions-master
...
Kill permissions table
2014-06-05 10:05:05 +02:00
Thomas Müller
da3974bcb2
- drop permissions table and related code
...
- the file/folder's permission is now stored in the file cache
- BackGroundWatcher has been removed - this has meanwhile be replaced by occ files:scan which can be executed in a cron jobs
- increase version to trigger database migration
2014-06-05 08:22:01 +02:00
Thomas Müller
c044ff99ce
Merge pull request #8724 from owncloud/update-sabre-2.0
...
Update SabreDAV to 1.8.10
2014-06-04 23:05:34 +02:00
Georg Ehrke
00b7f365bc
remove not needed unlink in installer test
2014-06-04 17:18:20 +02:00
Morris Jobke
ca43fba513
Merge pull request #8791 from owncloud/share-overview-sharewithstatus
...
Update share action text to display owner/recipients
2014-06-04 17:04:30 +02:00
Georg Ehrke
724d027f19
add unit test
2014-06-04 16:29:41 +02:00
Vincent Petry
da889ff029
Added experimental switch to count external storage data in quota
...
This includes all mountpoints except the Shared one in
the used space calculation.
Added unit tests for ext storage inclusion in quota calculation
2014-06-04 16:08:59 +02:00
Vincent Petry
b5f0a17918
Merge pull request #8822 from owncloud/cache-change-propagator
...
[WIP] Improved propagation of cache changes
2014-06-04 13:03:14 +02:00
Thomas Müller
76e04027bc
Upgrade SabreDAV to 1.8.10
...
Updating SabreDAV namespaces
2014-06-04 12:22:23 +02:00
Robin Appelman
3bcdad62fb
Fix unit tests
2014-06-04 10:01:50 +02:00
ringmaster
0e85618c42
Can't use assertInstanceOf on wrapped storage; use assertTrue(instanceOfStorage() instead.
2014-06-04 07:55:46 +02:00
Bjoern Schiessle
2b30fb4862
fix unit test after adding the additional parameter to addStorageWrapper()
2014-06-04 07:55:46 +02:00
Robin Appelman
f297bf14f9
Fix unit tests
2014-06-03 11:55:18 +02:00
Robin Appelman
4d7045e701
Fix unit tests
2014-06-03 11:18:17 +02:00
Robin Appelman
b4cee3d4e9
skip tests for oracle
2014-06-03 11:18:17 +02:00
Robin Appelman
adeac7aa39
Check sqlite migration on a copy of the database file
2014-06-03 11:17:21 +02:00
Robin Appelman
35550e8d9a
Fix migrator for postgres
2014-06-03 11:17:21 +02:00
Robin Appelman
5243562f45
skip migration tests for sqlite
2014-06-03 11:17:21 +02:00
Robin Appelman
0035147be9
Create unique names for temporary indexes
2014-06-03 11:17:21 +02:00
Robin Appelman
9c6a93a87c
Add a mechanism to try the database migration on a copy of the tables before running it on the "real" data
2014-06-03 11:17:21 +02:00
Vincent Petry
d677e3860d
Added unit tests for share.js and share icon
2014-06-02 15:59:06 +02:00
Robin Appelman
e002ff6065
propagate changes in the scanner
2014-06-02 15:24:08 +02:00
Robin Appelman
a31f089266
Add a change propagator class to handle propagating etag and mtime changes
2014-06-02 14:39:12 +02:00
Thomas Müller
999f6216dc
- fix dropTable() and introduce tableExists()
...
- kill replaceDB() - this function is unused and it's implementation obviously wrong
- add method annotation OC_DB_StatementWrapper::fetchAll
- remove duplicate code in Test_DBSchema and reuse OC_DB::tableExists
- remove unused variables
2014-05-30 23:34:42 +02:00
Thomas Müller
31ad1cbdd8
Merge pull request #5365 from owncloud/filesize-improvements-32bit
...
Add LargeFileHelper / Add CURL filesize workaround / Fix some 32-bit filesize issues
2014-05-30 16:13:48 +02:00
icewind1991
2ba5701b1a
Merge pull request #8778 from owncloud/storage-instanceof
...
Add storage->instanceOfStorage() to handle instanceof with storage wrappers
2014-05-30 14:58:59 +02:00
Vincent Petry
1d9129eac3
Sharing overview fixes and unit tests
...
- Fixed renaming and fileActionsReady event
- Added unit tests for shares list
- Fixed public page with defer
- Fixed file actions in sharing overview
- Fixed sharing counterpart list (10 entries max)
- Fixed file path attribute to be used in download action
- Fix sharing list headers
- OC.Share icons now operate on fileList instance
- Fix OC.Share.updateIcon when more than one list in DOM
2014-05-30 10:06:29 +02:00
Lukas Reschke
45d93cc6ec
Merge pull request #8759 from owncloud/fix-phpunit
...
fix 8757, get rid of service locator antipattern
2014-05-29 21:35:47 +02:00
Andreas Fischer
129d8099b9
Typo: getFileSizeViaDOM -> getFileSizeViaCOM
2014-05-29 16:26:02 +02:00
Andreas Fischer
ea246d058e
Use "file size" instead of "filesize", then also apply camel case.
2014-05-29 16:26:02 +02:00
Andreas Fischer
0417e52134
Increase file size limit from 2 GiB to 4 GiB when workarounds are unavailable.
2014-05-29 16:26:02 +02:00
Andreas Fischer
2c36a4b07a
Add helper method for turning int|float into base-10 unsigned integer string.
2014-05-29 16:26:01 +02:00
Andreas Fischer
82e17155bf
Rename: LargeFileHelper -> LargeFileHelperGetFilesize
2014-05-29 16:26:01 +02:00
Andreas Fischer
68cc0ba2e1
Unit Tests for LargeFileHelper.
2014-05-29 16:26:01 +02:00
Robin Appelman
8c5521fdfc
Add $storage->instanceOfStorage to handle instanceof for storage wrappers
2014-05-29 13:45:50 +02:00
icewind1991
c0f02be50a
Merge pull request #3908 from owncloud/storage-folder-copy-rename
...
Recursive copy and remove for local storage backends
2014-05-29 13:29:24 +02:00
Thomas Müller
3ef9570d02
Merge pull request #8547 from owncloud/path-length-master
...
Handling long paths properly in \OC\Files\View
2014-05-29 00:08:29 +02:00
Lukas Reschke
1af293dc13
Merge pull request #8754 from owncloud/3rdparty-upgraded-phpmailer
...
upgraded phpmailer into v5.2.8 via composer
2014-05-28 22:42:45 +02:00
Lukas Reschke
ce9d5df6df
Merge pull request #8681 from owncloud/logintimestamp
...
Record login timestamp per user. Required for new user managament.
2014-05-28 19:06:47 +02:00
Robin Appelman
1302602173
fix illegal usage of unlink in test case
2014-05-28 18:16:23 +02:00
Robin Appelman
03ba497a8c
add recursive copy to local storage backend
2014-05-28 18:16:23 +02:00
Robin Appelman
38c1da0976
fix recursive rename for local storage backend
2014-05-28 18:16:23 +02:00
Robin Appelman
c99e254178
aditional test cases for copy and rename
2014-05-28 18:16:23 +02:00
Thomas Müller
a2e4bc8d33
# This is a combination of 2 commits.
...
# The first commit's message is:
adding tests for long paths
increment path field in database up to 4000 (maximum for Oracle - otherwise we could use php's 4096)
increment version to trigger database migration
adding unit test for too long path
# This is the 2nd commit message:
fix too long path
2014-05-28 15:30:44 +02:00
Bernhard Posselt
d5e48a4806
fix assertions
2014-05-28 15:23:57 +02:00
Thomas Müller
ed8e0f0a92
updating unit test expectations
2014-05-28 13:47:27 +02:00
Bernhard Posselt
5e9ea2b365
fix 8757, get rid of service locator antipattern
2014-05-28 02:15:16 +02:00
Vincent Petry
d43a7c5f6e
Added requiremin/requiremax fields for apps
...
Apps can now specify a minimum and maximum version of ownCloud in which
they are supported.
2014-05-27 11:54:12 +02:00
Arthur Schiwon
2e85d5a852
increase scrutinizer happyiness by removing minor/informational issues
2014-05-23 11:20:46 +02:00
Arthur Schiwon
86880acee9
clean up here is superflous, will already be removed by user session
2014-05-23 10:16:18 +02:00
Arthur Schiwon
60274d1729
test hooks also on login
2014-05-23 00:59:26 +02:00
Arthur Schiwon
bf1f5f2af3
also test whether hooks work
2014-05-23 00:54:17 +02:00
Arthur Schiwon
c46fada6b3
unit tests for loginWithCookie()
2014-05-23 00:18:07 +02:00
Björn Schießle
050df76830
Merge pull request #8599 from owncloud/sharing_disable_for_groups
...
allow admin to disable sharing for specific groups of users
2014-05-22 08:19:27 -04:00
Bjoern Schiessle
12338e0ef0
allow admin to disable sharing for specific groups of users
2014-05-22 10:43:44 +02:00
Joas Schilling
d621a6fe5e
Clean the database after the test
2014-05-21 16:00:21 +02:00
Joas Schilling
66f94273c6
Add a lot of users for testing
2014-05-21 13:17:29 +02:00
Joas Schilling
457a4aa425
Add test case for getValueForUsers()
2014-05-21 11:36:01 +02:00
Morris Jobke
dc36d30953
Remove all occurences of @brief and @returns from PHPDoc
...
* test case added to avoid adding them later
2014-05-19 17:50:53 +02:00
Morris Jobke
804020bb6d
Merge pull request #7363 from owncloud/optimize-startup-queries
...
Optimize some queries that are always executed when loading base.php
2014-05-19 01:21:37 +02:00
Vincent Petry
9d38e3602b
Namespacing for FileList, FileActions and trashbin app
...
- FileList is now an instantiable class
- FileActions is now in namespace
- added App class for trashbin app
- moved trashbin overrides into classes extending FileList
- replaced many static calls with "this." or "self." to make the classes
reusable/extendable
- new URL parameter "view" to specify which view is shown, for example
"files" or "trashbin"
- added OC.Util.History utility class in core for handling history
- moved URL handling/routing to OCA.Files.App
- popstate will correctly update the current view and notify the view of
the URL change so it can update the current dir
- added JS unitt tests for the trashbin app
- fixed public app to work with the new namespaces
2014-05-15 17:51:04 +02:00
Bernhard Posselt
9e36c33104
use fetch method instead of fetchRow because fetchRow is only an owncloud internal alias that exists purely for compability
2014-05-14 01:09:48 +02:00
Thomas Müller
5fb94bf76f
Merge pull request #8542 from owncloud/phpdoc-improvements
...
PHPDoc Improvements
2014-05-13 23:23:11 +02:00
Lukas Reschke
b0381cfe12
Add tests for other types that PHP might cast
...
Addition to https://github.com/owncloud/core/pull/8572
2014-05-13 22:01:11 +02:00
Robin McCorkell
875a8acedf
Fix Scrutinizer errors about missing user backend
2014-05-13 19:08:14 +01:00
Thomas Müller
f5bc680f9c
Merge pull request #8572 from owncloud/core-getabsolutepathwithzero
...
Fixed getAbsolutePath case when path is "0"
2014-05-13 17:41:18 +02:00
Vincent Petry
bab8c1f8e5
Fixed getAbsolutePath case when path is "0"
...
Make sure to correctly check for string emptiness when the passed path
is "0".
2014-05-13 17:38:46 +02:00
Bernhard Posselt
a152e320f6
make it possible to omit parameters and use the default parameters from the controller method
2014-05-13 10:40:49 +02:00
Thomas Müller
1d18fd4e6d
Merge pull request #8482 from owncloud/public-logger
...
Make logger available in the container
2014-05-12 16:40:58 +02:00
Thomas Müller
93dbb39e77
adding unit test for message interpolation
2014-05-12 14:17:36 +02:00
Morris Jobke
2054837d01
Merge pull request #8541 from owncloud/hardenIsSubDirectory
...
Harden issubdirectory()
2014-05-12 01:42:25 +02:00
Morris Jobke
6499995474
Merge pull request #8477 from owncloud/better-controllers
...
Better appframework controllers
2014-05-12 01:07:49 +02:00
Morris Jobke
7a6ff56b13
Merge pull request #8274 from owncloud/appframework-db
...
Port database layer from appframework to core
2014-05-12 00:12:19 +02:00
Bernhard Posselt
63f2f16b85
use new controllermethodreflector for corsmiddleware
2014-05-11 17:55:59 +02:00
Bernhard Posselt
1d45239c65
adjust license headers to new mail address
2014-05-11 17:54:08 +02:00
Bernhard Posselt
cb666c18d6
rename formatter to responder, formatResponse to buildResponse
2014-05-11 17:54:08 +02:00
Bernhard Posselt
d8da79cab0
add test for not failing when adding more comments after type parameters, do not limit x-www-form-urlencoded to POST
2014-05-11 17:54:08 +02:00
Bernhard Posselt
80648da431
implement most of the basic stuff that was suggested in #8290
2014-05-11 17:54:08 +02:00
Bernhard Posselt
a252f59cd4
Merge pull request #8504 from owncloud/cors-middleware
...
Add cors middleware
2014-05-11 16:54:34 +02:00
Lukas Reschke
fd5b2d11d6
Rename issubdirectory to isSubDirectory
2014-05-11 15:50:59 +02:00
Bernhard Posselt
9a4d204b55
add cors middleware
...
remove methodannotationreader namespace
fix namespace for server container
fix tests
fail if with cors credentials header is set to true, implement a reusable preflighted cors method in the controller baseclass, make corsmiddleware private and register it for every request
remove uneeded local in cors middleware registratio
dont uppercase cors to easily use it from routes
fix indention
comment fixes
explicitely set allow credentials header to false
dont depend on better controllers PR, fix that stuff later
split cors methods to be in a seperate controller for exposing apis
remove protected definitions from apicontroller since controller has it
2014-05-09 23:34:41 +02:00
Lukas Reschke
1083085e6e
Merge pull request #7546 from owncloud/no_freaking_tag_dupes
...
Tags cleanup
2014-05-09 22:10:45 +02:00
Bart Visscher
f569c721a6
Merge branch 'master' into optimize-startup-queries
...
Conflicts:
apps/files_sharing/lib/sharedstorage.php
tests/lib/group/manager.php
removed hasFilesSharedWith from lib/public/share.php and
sharedstorage.php to fix merge
2014-05-07 17:54:38 +02:00
Vincent Petry
75d81eefc1
Merge pull request #8223 from owncloud/fix_linkToPublic
...
Fix linkToPublic and linkToAbsolute.
2014-05-07 14:40:59 +02:00
Thomas Müller
45f8d2d3ff
Merge pull request #8456 from owncloud/extstorage-unittestssuite
...
Added ext storage app in autotest unit test run
2014-05-05 19:48:35 +02:00
Vincent Petry
0c8ae6eb66
Added ext storage app in autotest unit test run
...
To make sure that the dynamic mount config and config classes from
external storages are tested, these are now added into the autotest.sh
test run by enabling the app.
2014-05-05 15:03:10 +02:00
Vincent Petry
1a454f61ed
Merge pull request #8386 from owncloud/fix_6946_master
...
Fix 6946 master
2014-05-05 14:08:45 +02:00
Morris Jobke
623161b9a9
Merge pull request #8023 from flyser/master
...
Fix setting the max-upload-size for really large values.
2014-05-03 11:49:38 +02:00
Joas Schilling
ced2a4fcf2
Remove unneccessary statement from test
2014-04-29 10:42:49 +02:00
Joas Schilling
39bf700790
Update tests to test for create and update aswell
2014-04-29 10:34:28 +02:00
Arthur Schiwon
837a02184b
the group manager calls exists check less often, adjust test accordingly
2014-04-28 19:19:37 +02:00
Arthur Schiwon
45e42c25de
Group Database backend must not gather user details itself but ask user
...
backends. This is a port to master from PR #7745
remove OC_GROUP_BACKEND_GET_DISPLAYNAME option for group backends
Conflicts:
lib/private/group/backend.php
LDAP: getDisplayNamesInGroup is not an option for group backends anymore
Conflicts:
apps/user_ldap/group_ldap.php
apps/user_ldap/group_proxy.php
clean up group backends
Conflicts:
lib/private/group/database.php
remove now unnecessary test
implement getDisplayNames in group manager
adjust user manager tests
test for group manager's displayNamesInGroup
trim must not be used in empty in PHP < 5.5
keep the constant to not provoke PHP warnings
Conflicts:
lib/private/group/backend.php
2014-04-28 13:49:56 +02:00
Lukas Reschke
96c06c14d8
Merge pull request #8341 from owncloud/template-tests-output-buffering
...
Improve Template Tests by Removing Manual Output Buffering
2014-04-26 12:29:36 +02:00
Robin Appelman
4109521cce
remove outdated test
2014-04-25 12:24:18 +02:00
Robin Appelman
6c20a014ea
merge master into webdav-injection
2014-04-25 11:47:06 +02:00
Andreas Fischer
916b265cd5
Normalise testcleanuplistener.php indentation and end of file.
2014-04-24 16:42:28 +02:00
Andreas Fischer
f45080e811
Use PHPUnit's expectOutputString() instead of performing output buffering.
2014-04-24 15:45:07 +02:00
Andreas Fischer
88778b569e
Split testP() tests into multiple methods.
2014-04-24 15:36:02 +02:00
Andreas Fischer
0d3ddd9e11
Remove redundant test case for non-HTML string.
2014-04-24 15:34:09 +02:00
Andreas Fischer
e85fe01faf
Make PHPUnit_Framework_TestListener implementations compatible to 4.0.
2014-04-24 15:16:57 +02:00
Andreas Fischer
f9091a8584
Merge pull request #8304 from owncloud/add-xss-tests
...
Add unit tests for arrays and quotationmark
* owncloud/add-xss-tests:
Remove uneeded newline
Fix indentation
Add unit tests for arrays and "
2014-04-24 15:09:36 +02:00
Bjoern Schiessle
6650be9913
add setting to set default expire date
2014-04-24 13:34:31 +02:00
Bernhard Posselt
5199e4508a
dont update entity and dont run an update query if an entity wasnt changed at all
2014-04-23 13:43:17 +02:00
Lukas Reschke
9d3b639ce6
Remove uneeded newline
2014-04-22 20:11:34 +02:00
Lukas Reschke
589c74e176
Fix indentation
2014-04-22 20:10:46 +02:00
Lukas Reschke
f07180639c
Add unit tests for arrays and "
...
OC_Util::sanitizeHTML() also supports array but we actually had no unit test for it. Additionally this commit introduces a test for escaping " into "
2014-04-22 20:09:55 +02:00
Robin Appelman
3821a09689
merge master into webdav-injection
2014-04-22 12:25:49 +02:00
Bernhard Posselt
7e447f4f42
make download and redirectresponse public
2014-04-20 16:12:46 +02:00
Bernhard Posselt
309aa3bcd2
fix phpdoc for entities
2014-04-20 02:55:59 +02:00
Bernhard Posselt
4a7e0561ca
move db into iservercontainer
2014-04-19 19:30:12 +02:00
Bernhard Posselt
0fe4db0992
remove unusued variable
2014-04-19 16:02:15 +02:00
Bernhard Posselt
f4bc5ee863
remove unusued variable
2014-04-19 16:00:19 +02:00
Bernhard Posselt
93237d87ec
fix scrutinizer issues
2014-04-19 15:25:36 +02:00
Bernhard Posselt
f260951825
port database layer from appframework to core
2014-04-19 14:56:16 +02:00
Morris Jobke
5a1a056c6d
Merge pull request #8183 from owncloud/move-security-headers
...
Move security headers
2014-04-16 23:46:20 +02:00
Thomas Tanghus
df9d9ac958
Remove unused var
2014-04-16 14:34:13 +02:00
Thomas Tanghus
dd36d4b894
Add tests for linkTo, linkToPublic, linkToRemote, linkToRemoteBase
2014-04-16 14:32:08 +02:00
Robin Appelman
295b75cca9
merge master into webdav-injection
2014-04-15 20:05:43 +02:00
Robin Appelman
c82adb8c5d
merge master into webdav-injection
2014-04-15 20:03:00 +02:00
Lukas Reschke
ffab31e3ee
Merge pull request #8197 from owncloud/secure_mimetypes
...
White-list known secure mime types. Refs. #8184
2014-04-15 19:50:33 +02:00
Arthur Schiwon
450de0091a
adjust tests accordingly
2014-04-15 17:53:57 +02:00
Lukas Reschke
340089f270
Merge pull request #8059 from owncloud/countUsersInGroup
...
add optional countUsersInGroup method to group backends
2014-04-14 20:45:12 +02:00
Lukas Reschke
9046f7b2f8
Merge pull request #8178 from owncloud/fix-request-parameters
...
Correctly process request parameters other than GET or POST, dont use gl...
2014-04-14 20:42:26 +02:00
Thomas Tanghus
51e47319ef
White-list known secure mime types. Refs. #8184
2014-04-14 17:17:50 +02:00
Thomas Müller
8df19c4379
Merge pull request #8019 from owncloud/thumbnail_fixes
...
Thumbnail fixes
2014-04-14 16:23:03 +02:00
Lukas Reschke
b04d95b116
Remove uneeded usages of nosniff
2014-04-13 12:48:16 +02:00
Bernhard Posselt
62cce982bb
default to GET request when no method is set to fix unittests, also set parsed json parameters on the post attribute
2014-04-12 16:17:49 +02:00
Vincent Petry
e92fe47d2a
Remove annoying karma 404 warnings for images
...
Karma now serves images from core to avoid polluting the logs with a lot
of 404 warnings.
This also makes it easier to read the test errors during development.
2014-04-11 15:25:40 +02:00
Thomas Müller
7325aefbd1
Merge pull request #8112 from owncloud/karma-enableautowatch
...
Enable autowatch for karma
2014-04-10 16:57:28 +02:00
Thomas Müller
26a89e369e
Merge pull request #8137 from owncloud/routeing-requirements
...
add requirements to routing
2014-04-10 16:23:01 +02:00
Vincent Petry
6cc578d1a7
Merge pull request #8018 from owncloud/ocs_result_success_is_100
...
OC_OCS_Result Class, Only accept 100 code as success
2014-04-10 13:03:10 +02:00
Bernhard Posselt
70c88027db
add requirements to routing
2014-04-09 21:57:32 +02:00
Thomas Müller
73ac3d0fcd
Merge pull request #7643 from owncloud/chainable_response
...
Chainable Response in AppFramework
2014-04-08 22:42:43 +02:00
Vincent Petry
bfb1e0867f
Enable autowatch for karma
...
This way unit tests can be run in multiple browsers with the command
line and tests will re-run automatically when files are changed.
2014-04-08 17:21:11 +02:00
Thomas Müller
a4fc92b05b
class Test_Config is already declared
2014-04-08 14:15:33 +02:00
Arthur Schiwon
9597f41904
add group tests
2014-04-08 12:32:30 +02:00
Thomas Müller
240d1ae6b9
unit test testSetAppValueIfSetToNull() added
2014-04-07 20:56:43 +02:00
Fabian Henze
1245ff8f31
Add unit tests for OC_Helper::phpFileSize function
2014-04-07 15:31:34 +02:00
Thomas Müller
ccf1287fbf
adding unit test for cache mechanism
2014-04-04 16:21:50 +02:00
Thomas Müller
f029312e5b
fixing typos/spellings
2014-04-04 11:37:47 +02:00
Thomas Müller
20f26068e7
Merge pull request #7476 from owncloud/type-hinting
...
Type hinting
2014-04-03 20:02:27 +02:00
tomneedham
b00592ade5
Fix test case for api response code
2014-04-03 14:47:55 +00:00
Thomas Müller
a2efdb8722
Merge pull request #7970 from owncloud/webdav-upload-hash
...
Fix uploading files containing a # in the path for webdav
2014-04-03 16:09:44 +02:00
Vincent Petry
4cc70ec39d
Merge pull request #7979 from owncloud/core-fixfilegetcontentsloop
...
Correctly read the full stream in file_get_contents
2014-04-02 10:55:50 +02:00
Thomas Müller
82d1ea240e
Merge pull request #7884 from owncloud/use-idn_to_ascii-if-available
...
idn_to_ascii is only used if available
2014-04-01 22:51:23 +02:00
Vincent Petry
d6ce45fe61
Correctly read the full stream in file_get_contents
...
When using user-defined stream wrappers, PHP will
return a maximum of 8192 bytes even if more was
requested.
This fix uses stream_get_contents to make sure the full stream is read
and not only the first 8 KB.
Added unit test with a bigger test file to cover this case.
2014-04-01 10:07:16 +02:00
Bart Visscher
6b061c236d
Merge branch 'master' into type-hinting
...
Conflicts:
lib/private/image.php
lib/private/l10n.php
lib/private/request.php
lib/private/share/mailnotifications.php
lib/private/template/base.php
2014-03-31 21:38:54 +02:00
Robin Appelman
76c63a5760
Fix uploading files containing a # in the path for webdav
2014-03-31 17:00:32 +02:00
Thomas Müller
70db348475
Merge pull request #7824 from owncloud/hash-parameter-order
...
Fix parameter order for Storage\Local::hash
2014-03-28 13:06:07 +01:00
Vincent Petry
d0012e729a
Merge pull request #7879 from owncloud/sharing_cleanup_public_api
...
sharing api cleanup, first step
2014-03-28 12:23:11 +01:00
Vincent Petry
5068c57845
Merge pull request #7613 from owncloud/fix_urlGenerator2
...
Add \OC::$WEBROOT to URLGenerator::getAbsoluteURL()
2014-03-28 12:12:49 +01:00
Vincent Petry
040f430f0c
Merge pull request #7829 from owncloud/cachefolderlocation
...
Cache folder is now configurable
2014-03-28 12:08:38 +01:00
Vincent Petry
ef2c176eef
Merge pull request #7678 from owncloud/test-bootstrap-fileproxy-cleanup
...
Cleanup the fileproxy proxies on test bootstrap
2014-03-28 11:33:57 +01:00
Robin Appelman
371a924c92
merge master into webdav-injection
2014-03-26 14:26:07 +01:00
Thomas Müller
83b4bcfdbf
idn_to_ascii is only used if available
2014-03-26 11:17:23 +01:00
Thomas Müller
1ae10b9da3
Merge pull request #7420 from owncloud/cachehooks-first
...
Manually triger the filecache update hooks before any other hook
2014-03-25 22:41:09 +01:00
Thomas Müller
bbc2e37259
Merge pull request #7477 from owncloud/foldersize-reuse
...
Allow re-using already known fileinfo when calculating folder sizes
2014-03-25 22:33:24 +01:00
Bjoern Schiessle
bc0292c16d
always return an array
2014-03-25 17:47:24 +01:00
Thomas Müller
531c9564b3
Merge pull request #7861 from owncloud/idn-domains-support-on-emails-master
...
idn have to be converted before being used
2014-03-25 12:38:32 +01:00
Vincent Petry
1e39719926
Added unit tests for external cache folder
2014-03-24 14:32:04 +01:00
Thomas Müller
fb7f3008d3
idn have to be converted before being used
2014-03-24 13:46:31 +01:00
icewind1991
4c8a83e82f
Merge pull request #7714 from owncloud/phpunit-config
...
Allow setting the config dir to use as enviroment variable for phpunit
2014-03-24 13:01:37 +01:00
Robin Appelman
fffe330bbc
Fix parameter order for Storage\Local::hash
2014-03-20 15:32:12 +01:00
Vincent Petry
316a22b463
Merge pull request #7808 from owncloud/quota-usequotaevenwhenfreespaceunknown
...
Still return quota value when free space is unknown
2014-03-20 15:29:14 +01:00
Vincent Petry
36c0f08ec0
Merge pull request #7732 from owncloud/datafolderexistence
...
Added .ocdata file to check for data folder validity
2014-03-20 11:31:28 +01:00
Vincent Petry
66bc0f0848
Still return quota value when free space is unknown
...
Fixed the quota storage wrapper to correctly return the quota value when
the free space is not known (which usually happens when the disk_free_space
function is disabled)
2014-03-19 19:07:11 +01:00
Thomas Müller
153eadd753
Merge branch 'master' into close-session-faster-master
2014-03-17 21:57:48 +01:00
Thomas Müller
6bbbf8536f
introduce reopen() method to be used for unit test execution only - right after a unit test has been executed the session will be reopened
2014-03-17 21:57:10 +01:00
Thomas Müller
756bbe8786
Merge pull request #7649 from owncloud/routing-public
...
Move routing classes to an interface and expose it in the public api
2014-03-17 21:07:05 +01:00
icewind1991
5c72b526a3
Merge pull request #7760 from owncloud/core-roundbytes
...
Correctly round bytes when converted from human readable format
2014-03-17 15:21:57 +01:00
Vincent Petry
145db370d1
Correctly round bytes when converted from human readable format
...
Instead of leave two decimal places which is confusing, round the byte
values correctly to the closest byte.
2014-03-17 12:15:12 +01:00
Thomas Müller
cd038604d3
unit tests for specific image type output added
2014-03-17 08:40:59 +01:00
Thomas Müller
fe05c0c81b
move session reset to endTest() - necessary because we need a valid session in the next unit tests setUp() call
2014-03-14 18:16:20 +01:00
Vincent Petry
3c46dcd7dd
Added .ocdata file to check for data folder validity
...
In environments where the data folder is mount from another partition,
it is important to check that the data folder we see is actually the
real one. If the mount failed for some reasons, this fix will make
ownCloud temporarily unavailable instead of causing unpredictable
behavior.
2014-03-14 15:36:35 +01:00
Thomas Müller
fc697c7298
adding StartSessionListener which initializes the session before each test case execution
2014-03-13 16:19:17 +01:00
Robin Appelman
eabeedb306
Merge branch 'master' into cachehooks-first
2014-03-13 15:22:00 +01:00
Robin Appelman
a8eb7a5092
Allow setting the config dir to use as enviroment variable for phpunit
2014-03-13 13:33:09 +01:00
Bart Visscher
d798169037
Cleanup the fileproxy proxies on test bootstrap
2014-03-11 21:03:29 +01:00
Robin Appelman
d55c7223a9
Merge branch 'master' into foldersize-reuse
...
Conflicts:
lib/private/files/cache/homecache.php
2014-03-11 13:04:20 +01:00
Vincent Petry
c1cb9ee9b0
Merge pull request #7650 from owncloud/quota-totalspace
...
Fixed total space display when data size exceeds quota
2014-03-11 12:40:59 +01:00
Vincent Petry
010eef95c0
Fixed total space display when data size exceeds quota
...
The total space display in the personal page now shows the quota value
instead of used space when used space exceeds the quota (soft quota).
2014-03-10 17:59:14 +01:00
Robin Appelman
8ab7d18a6a
Move the router classes to a namespace and expose it with a public interface
2014-03-10 14:04:58 +01:00
Vincent Petry
26513bc17b
Merge pull request #7624 from owncloud/enc-encryptedusedspacefix
...
[master] Fixed used space to be based on unencrypted size
2014-03-10 09:38:24 +01:00
Thomas Tanghus
8f6ea900f2
Chainable Response in AppFramework
2014-03-09 23:01:16 +01:00
Vincent Petry
48d63a6278
Return unencrypted_size of folder when queried
...
This fixes the "used space" to be based on the unencrypted size, not
encrypted size, to be consistent with how quota/space is handled when
encryption is enabled
2014-03-07 14:59:09 +01:00
Thomas Tanghus
ada8d4e0c9
Fix unit tests
2014-03-07 02:44:34 +01:00
Robin Appelman
84cf40ed82
merge master into webdav-injection
2014-03-06 13:35:06 +01:00
Vincent Petry
c7e204bd36
Added unit tests for serverHost and other related functions
2014-03-06 11:51:17 +01:00
Thomas Tanghus
b54b0b2153
Yet another cleanup
2014-03-05 00:26:06 +01:00
Robin Appelman
5211566205
update test case
2014-03-04 16:36:03 +01:00
Robin Appelman
bb8a7a2230
Remove assert since the root size of the home storage is no longer calculated
2014-03-03 16:48:06 +01:00
Robin Appelman
331fc55e2d
Update unit tests to use the new injection
2014-03-03 14:27:24 +01:00
Bart Visscher
35a8dfb2fa
More PHPDoc fixes, using scrutinizer patches as hints
2014-02-28 13:53:41 +01:00
Thomas Müller
93b8aba3a1
Merge pull request #7439 from owncloud/unit-test-for-7430
...
adding test for migrations on columns using keywords
2014-02-27 21:52:46 +01:00
Bart Visscher
3116bede68
Add unit tests for getUserGroups with addUser and removeUser
2014-02-27 21:04:44 +01:00
Jörn Friedrich Dreyer
2ba6cd4e2b
initialize etags of temporary storage
2014-02-27 12:44:07 +01:00
Jörn Friedrich Dreyer
131c12ad8d
use assertInternalType for typechecking
2014-02-27 09:51:26 +01:00
Jörn Friedrich Dreyer
39f2f564a9
use assertSame and assertNotSame for etag checks
2014-02-27 09:39:34 +01:00
Thomas Müller
230e5e3788
let's name the column 'select' because this is a keyword on all platforms
2014-02-26 20:47:07 +01:00
Thomas Müller
459b5086d5
adding test for migrations on columns using keywords
2014-02-26 20:42:45 +01:00
Robin Appelman
bc49c6be04
Manually triger the filecache update hooks before any other hook
2014-02-26 14:29:13 +01:00
Björn Schießle
6bde602c09
Merge pull request #7292 from owncloud/sharing_tests
...
fix sharing unit tests
2014-02-21 14:24:51 +01:00
Björn Schießle
9f0fc30251
Merge pull request #7337 from owncloud/test_for_6935
...
add unit test for \OC\URLGenerator::getAbsoluteURL
2014-02-21 13:45:49 +01:00
Bjoern Schiessle
cf7ef0d356
fix sharing unit tests
2014-02-21 13:36:00 +01:00
Robin Appelman
2293563488
Remove unit tests which causes the filesystem tests to fail
2014-02-21 10:02:03 +01:00
Bjoern Schiessle
1ae6e9ec21
add unit test for \OC\URLGenerator::getAbsoluteURL to verify #6935
2014-02-20 19:06:42 +01:00
Thomas Müller
ec45a3c0e2
Merge pull request #6962 from owncloud/quota-space-root
...
Allow passing a root folder to get the used space from in the quota wrapper
2014-02-20 16:47:59 +01:00
Lukas Reschke
719f1111b6
Merge pull request #6714 from owncloud/files-newfileinvalidcharsfix
...
Added extra checks for invalid file chars in newfile.php and newfolder.php
2014-02-20 11:53:58 +01:00
Vincent Petry
b2b35cd335
Fixed ext storage webdav path encoding
...
- Some WebDAV servers like lighttpd need paths in URLs to be properly
encoded
- Added error log output when curl connection failed
- Added check for 'resourcetype' in case the WebDAV server doesn't
support/return it
- Fixed touch() to return false if the server doesn't implement
PROPPATCH
- Added optional delay in WebDAV unit tests to use when testing against
lighttpd's WebDAV
2014-02-19 18:34:08 +01:00
Morris Jobke
bcad6e641a
Merge pull request #7274 from owncloud/scrutinizer-patch-1
...
Scrutinizer Auto-Fixes
2014-02-19 11:51:04 +01:00
icewind1991
2d5ab1a5c4
Merge pull request #7260 from owncloud/watcher-policy
...
Allow setting the frequency of which the file watcher checks for updates
2014-02-19 11:17:27 +01:00
Robin Appelman
eea1abae20
add unit tests for watcher policies
2014-02-19 09:52:51 +01:00
Scrutinizer Auto-Fixer
adaee6a5a1
Scrutinizer Auto-Fixes
...
This patch was automatically generated as part of the following inspection:
https://scrutinizer-ci.com/g/owncloud/core/inspections/cdfecc4e-a37e-4233-8025-f0d7252a8720
Enabled analysis tools:
- PHP Analyzer
- JSHint
- PHP Copy/Paste Detector
- PHP PDepend
2014-02-19 09:31:54 +01:00
icewind1991
3cc7228c7c
Merge pull request #7253 from owncloud/preferences-caching
...
Add caching to OC\Preferences
2014-02-18 18:17:58 +01:00
Vincent Petry
bd71a1b7b6
Added file name check in webdav connector
...
- added file name check for the put, rename and setNames() methods which
throw a "Bad Request" whenever invalid characters are used
- replaced \OC\Filesystem usage with $this->getFS() to be able to write
unit tests
2014-02-18 17:54:32 +01:00
Vincent Petry
797e0a614c
Added extra checks for invalid file chars in newfile.php and newfolder.php
...
- added PHP utility function to check for file name validity
- fixes issue where a user can create a file called ".." from the files UI
- added extra checks to make sure newfile.php and newfolder.php also
check for invalid characters
2014-02-18 17:54:32 +01:00
Tom Needham
a573fe7d76
Merge pull request #6650 from owncloud/migration_unit_tests
...
User migration fix, and basic unit test
2014-02-18 17:35:49 +01:00
Lukas Reschke
3b1083f46e
Merge pull request #7176 from owncloud/style
...
Some style fixes
2014-02-18 17:30:26 +01:00