wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
22007 commits 157 branches 562 tags 714 MiB
Commit graph

1539 commits

Author SHA1 Message Date
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 &quot;
 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