38e309b0fe
Merge pull request #9970 from owncloud/sharing_set_expire_date
...
Sharing set expire date
2014-07-30 14:37:16 +02:00
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
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
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
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
67e302885c
remove share permission if user is excluded from sharing
2014-07-29 10:08:08 +02:00
58472a2660
migration test for sqlite - adding type mapping for 'tinyint unsigned'
2014-07-29 09:18:37 +02:00
09ebe1cfa6
function declaration did not match
2014-07-29 00:34:02 +02:00
1bba266417
add unit test
2014-07-28 22:45:03 +02:00
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
a3411e3719
Merge pull request #9641 from owncloud/localuser-addressbook
...
ownCloud users are exported as address book
2014-07-28 12:18:56 +02:00
ecc1f92bb6
add OCS api call to set expire date for link shares
2014-07-25 13:38:18 +02:00
176ecbd311
ownCloud users are exported as address book
2014-07-24 17:35:02 +02:00
65c824a2c0
Adding test which breaks because bit and/or enum datatypes are used
2014-07-24 12:10:05 +02:00
a8532aa2f0
Add test for homestorage getOwner
2014-07-22 16:30:25 +02:00
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
9ee8c60b5f
kill unused require of MapperTestUtility.php
2014-07-17 16:35:00 +02:00
8231f1ef8c
Added test of OCS privatedata to trigger key duplication
2014-07-17 13:18:49 +02:00
d430e743b3
fixing namespace of MapperTestUtility
...
and rename file to be lowercase
2014-07-17 11:22:27 +02:00
e26612244a
Make MySQL return "number of found rows" instead of number of "affected rows".
2014-07-16 14:35:47 +02:00
6c93bcc814
Merge pull request #9621 from owncloud/fix_logger_implementation
...
fix logger implementation
2014-07-15 16:05:15 +02:00
4a855be814
fix logger implementation and test
2014-07-15 10:10:16 +02:00
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
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
4e8d52d5d8
test class is already in preferences.php
2014-07-09 10:49:40 +02:00
44ffc7a914
De-double class name
2014-07-09 09:36:36 +02:00
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
65d9d6ad01
Merge pull request #9412 from owncloud/public-api-activity
...
Public api activity
2014-07-08 16:37:18 +02:00
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
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
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
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
b091b15f0b
MySQL: adding repair step to convert MyIsam tables to InnoDB
2014-07-07 12:32:24 +02:00
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
b5545b81c6
make search case insensitive on postgres and oracle
2014-07-03 19:01:00 +02:00
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
d31e532780
fix redirect URL unit test
2014-07-02 01:06:58 +02:00
94c3bac9ed
Merge pull request #9327 from owncloud/migrator-postgreskeywordtest
...
Added migrator test for reserved keyword
2014-07-01 20:40:18 +02:00
3d921ed3c3
Merge pull request #9334 from owncloud/defaultappfix
...
Default app fix
2014-07-01 20:39:13 +02:00
b20018928d
add unit test
2014-07-01 18:03:32 +02:00
7c17452028
Added unit test for default app URL
2014-07-01 16:55:29 +02:00
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
e4f068961e
Added test for reserved keywords
2014-07-01 12:55:36 +02:00
b752aff51d
Fix migrator tests to use the correct migrator instances
2014-07-01 12:54:35 +02:00
fd8b5680dd
Merge pull request #8383 from owncloud/object_storage
...
Object storage
2014-06-27 16:53:03 +02:00
ab93f1949d
update hasUpdated description, overwrtie testStat for objectstore test
2014-06-27 12:14:31 +02:00
4b5bf606cb
Merge pull request #9215 from owncloud/officemimetypesupdatefix
...
Office mime types update fix
2014-06-27 11:23:19 +02:00
7ee90ddd59
Add missing quotes for Oracle
2014-06-26 19:25:37 +02:00
67d0a3c15e
Fixed mime type repair step
2014-06-26 16:40:12 +02:00
2662c4c61b
use id instead of resourceId
2014-06-26 14:20:35 +02:00
5496ca234b
dont strip the s from the resource
2014-06-26 14:02:20 +02:00
b749292c18
Added test case for when target mime types already exist
2014-06-25 19:49:18 +02:00
b1e778d5fd
Moved office mimetype update to a repair step
2014-06-25 19:49:18 +02:00
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
f3ecf819ec
extend Dummy user and group implementation to pass tests
2014-06-25 13:13:53 +02:00
553c2ad33a
clean up created groups after testing, and correct parameter order
2014-06-24 21:56:08 +02:00
de53bee9b3
adapted tests for a groupId indexed group array
2014-06-24 16:27:38 +02:00
5dab762006
add tests
2014-06-23 18:33:13 +02:00
0ab66d9b48
Added unit test for the helper's rmdirr
2014-06-23 16:48:25 +02:00
28c1a95575
use common storage test
2014-06-23 16:29:01 +02:00
24f15fca64
Fix unit tests
2014-06-20 15:40:38 +02:00
5cae863408
change architecture from inheritance to composition
2014-06-18 12:53:20 +02:00
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
7493ff0624
fix unit test by always initializing the root of the storage in the constructor
2014-06-18 12:53:20 +02:00
c18836c8ae
add initial swift test with trystack
2014-06-18 12:53:20 +02:00
8d1cf79152
Merge pull request #8399 from owncloud/server-server-sharing
...
Add server<->server sharing
2014-06-17 17:40:05 +02:00
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
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
07fdeba50b
Fix moving movablemount over webdav
2014-06-17 14:10:11 +02:00
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
a48bcceb23
Merge pull request #8917 from owncloud/repair-routine-base
...
Add support for repair step classes
2014-06-16 11:13:10 +02:00
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
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
3e1576011f
Merge pull request #8980 from owncloud/better-accept-header
...
handle http accept headers more gracefully
2014-06-12 13:28:03 +02:00
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
93169eca1e
also handle lowercase headers
2014-06-11 01:20:09 +02:00
1002281dae
handle http accept headers more gracefully
2014-06-11 00:54:25 +02:00
21cfd1014a
Repair broken parent link in the scanner
2014-06-10 15:26:18 +02:00
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
3da47db33c
Merge pull request #8927 from owncloud/expire_only_link_shares
...
only expire link shares
2014-06-06 19:24:15 +02:00
f15d7dfec0
only expire link shares
2014-06-06 15:47:37 +02:00
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
6e2358c3a6
Added hacky fix for long path cleanup routine
2014-06-06 10:41:49 +02:00
3a7b30795c
Merge pull request #8783 from owncloud/remove-serializers
...
Remove controller serializers
2014-06-06 10:33:16 +02:00
ad4ec414c9
use system function to recursive remove the directory used by temporary storage
2014-06-06 09:29:31 +02:00
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
70e0ae0637
Merge pull request #8483 from owncloud/encryption_use_oc_preferences
...
[encryption] use oc preferences
2014-06-05 18:54:25 +02:00
587a8df566
remove controller serializers
2014-06-05 18:00:36 +02:00
1c59808517
Merge pull request #8865 from owncloud/improve_share_settings
...
Improve share settings
2014-06-05 17:23:42 +02:00
2d83424a29
allow to set pre-condition for setValue
2014-06-05 16:54:03 +02:00
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
6aab50f8aa
fix unit tests
2014-06-05 16:32:12 +02:00
6578f00b4b
unify share settings
2014-06-05 15:49:34 +02:00
d493c0c9ac
Sort the result before comparing
2014-06-05 15:21:53 +02:00
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
879237f32a
Add method to get users by their preference
2014-06-05 11:50:43 +02:00
9dab6ec2ec
Fix uit tests
2014-06-05 11:31:55 +02:00
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
ff3ded6cb2
Merge pull request #8852 from owncloud/kill-permissions-master
...
Kill permissions table
2014-06-05 10:05:05 +02:00
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
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
00b7f365bc
remove not needed unlink in installer test
2014-06-04 17:18:20 +02:00
724d027f19
add unit test
2014-06-04 16:29:41 +02:00
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
b5f0a17918
Merge pull request #8822 from owncloud/cache-change-propagator
...
[WIP] Improved propagation of cache changes
2014-06-04 13:03:14 +02:00
76e04027bc
Upgrade SabreDAV to 1.8.10
...
Updating SabreDAV namespaces
2014-06-04 12:22:23 +02:00
3bcdad62fb
Fix unit tests
2014-06-04 10:01:50 +02:00
0e85618c42
Can't use assertInstanceOf on wrapped storage; use assertTrue(instanceOfStorage() instead.
2014-06-04 07:55:46 +02:00
2b30fb4862
fix unit test after adding the additional parameter to addStorageWrapper()
2014-06-04 07:55:46 +02:00
f297bf14f9
Fix unit tests
2014-06-03 11:55:18 +02:00
4d7045e701
Fix unit tests
2014-06-03 11:18:17 +02:00
b4cee3d4e9
skip tests for oracle
2014-06-03 11:18:17 +02:00
adeac7aa39
Check sqlite migration on a copy of the database file
2014-06-03 11:17:21 +02:00
35550e8d9a
Fix migrator for postgres
2014-06-03 11:17:21 +02:00
5243562f45
skip migration tests for sqlite
2014-06-03 11:17:21 +02:00
0035147be9
Create unique names for temporary indexes
2014-06-03 11:17:21 +02:00
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
e002ff6065
propagate changes in the scanner
2014-06-02 15:24:08 +02:00
a31f089266
Add a change propagator class to handle propagating etag and mtime changes
2014-06-02 14:39:12 +02:00
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
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
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
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
129d8099b9
Typo: getFileSizeViaDOM -> getFileSizeViaCOM
2014-05-29 16:26:02 +02:00
ea246d058e
Use "file size" instead of "filesize", then also apply camel case.
2014-05-29 16:26:02 +02:00
0417e52134
Increase file size limit from 2 GiB to 4 GiB when workarounds are unavailable.
2014-05-29 16:26:02 +02:00
2c36a4b07a
Add helper method for turning int|float into base-10 unsigned integer string.
2014-05-29 16:26:01 +02:00
82e17155bf
Rename: LargeFileHelper -> LargeFileHelperGetFilesize
2014-05-29 16:26:01 +02:00
68cc0ba2e1
Unit Tests for LargeFileHelper.
2014-05-29 16:26:01 +02:00
8c5521fdfc
Add $storage->instanceOfStorage to handle instanceof for storage wrappers
2014-05-29 13:45:50 +02:00
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
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
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
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
1302602173
fix illegal usage of unlink in test case
2014-05-28 18:16:23 +02:00
03ba497a8c
add recursive copy to local storage backend
2014-05-28 18:16:23 +02:00
38c1da0976
fix recursive rename for local storage backend
2014-05-28 18:16:23 +02:00
c99e254178
aditional test cases for copy and rename
2014-05-28 18:16:23 +02:00
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
d5e48a4806
fix assertions
2014-05-28 15:23:57 +02:00
ed8e0f0a92
updating unit test expectations
2014-05-28 13:47:27 +02:00
5e9ea2b365
fix 8757, get rid of service locator antipattern
2014-05-28 02:15:16 +02:00
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
2e85d5a852
increase scrutinizer happyiness by removing minor/informational issues
2014-05-23 11:20:46 +02:00
86880acee9
clean up here is superflous, will already be removed by user session
2014-05-23 10:16:18 +02:00
60274d1729
test hooks also on login
2014-05-23 00:59:26 +02:00
bf1f5f2af3
also test whether hooks work
2014-05-23 00:54:17 +02:00
c46fada6b3
unit tests for loginWithCookie()
2014-05-23 00:18:07 +02:00
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
12338e0ef0
allow admin to disable sharing for specific groups of users
2014-05-22 10:43:44 +02:00
d621a6fe5e
Clean the database after the test
2014-05-21 16:00:21 +02:00
66f94273c6
Add a lot of users for testing
2014-05-21 13:17:29 +02:00
457a4aa425
Add test case for getValueForUsers()
2014-05-21 11:36:01 +02:00
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
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
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
5fb94bf76f
Merge pull request #8542 from owncloud/phpdoc-improvements
...
PHPDoc Improvements
2014-05-13 23:23:11 +02:00
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
875a8acedf
Fix Scrutinizer errors about missing user backend
2014-05-13 19:08:14 +01:00
f5bc680f9c
Merge pull request #8572 from owncloud/core-getabsolutepathwithzero
...
Fixed getAbsolutePath case when path is "0"
2014-05-13 17:41:18 +02:00
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
a152e320f6
make it possible to omit parameters and use the default parameters from the controller method
2014-05-13 10:40:49 +02:00
1d18fd4e6d
Merge pull request #8482 from owncloud/public-logger
...
Make logger available in the container
2014-05-12 16:40:58 +02:00
93dbb39e77
adding unit test for message interpolation
2014-05-12 14:17:36 +02:00
2054837d01
Merge pull request #8541 from owncloud/hardenIsSubDirectory
...
Harden issubdirectory()
2014-05-12 01:42:25 +02:00
6499995474
Merge pull request #8477 from owncloud/better-controllers
...
Better appframework controllers
2014-05-12 01:07:49 +02:00
7a6ff56b13
Merge pull request #8274 from owncloud/appframework-db
...
Port database layer from appframework to core
2014-05-12 00:12:19 +02:00
63f2f16b85
use new controllermethodreflector for corsmiddleware
2014-05-11 17:55:59 +02:00
1d45239c65
adjust license headers to new mail address
2014-05-11 17:54:08 +02:00
cb666c18d6
rename formatter to responder, formatResponse to buildResponse
2014-05-11 17:54:08 +02:00
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
80648da431
implement most of the basic stuff that was suggested in #8290
2014-05-11 17:54:08 +02:00
a252f59cd4
Merge pull request #8504 from owncloud/cors-middleware
...
Add cors middleware
2014-05-11 16:54:34 +02:00
fd5b2d11d6
Rename issubdirectory to isSubDirectory
2014-05-11 15:50:59 +02:00
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
1083085e6e
Merge pull request #7546 from owncloud/no_freaking_tag_dupes
...
Tags cleanup
2014-05-09 22:10:45 +02:00
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
75d81eefc1
Merge pull request #8223 from owncloud/fix_linkToPublic
...
Fix linkToPublic and linkToAbsolute.
2014-05-07 14:40:59 +02:00
1a454f61ed
Merge pull request #8386 from owncloud/fix_6946_master
...
Fix 6946 master
2014-05-05 14:08:45 +02:00
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
ced2a4fcf2
Remove unneccessary statement from test
2014-04-29 10:42:49 +02:00
39bf700790
Update tests to test for create and update aswell
2014-04-29 10:34:28 +02:00
837a02184b
the group manager calls exists check less often, adjust test accordingly
2014-04-28 19:19:37 +02:00
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
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
4109521cce
remove outdated test
2014-04-25 12:24:18 +02:00
6c20a014ea
merge master into webdav-injection
2014-04-25 11:47:06 +02:00
f45080e811
Use PHPUnit's expectOutputString() instead of performing output buffering.
2014-04-24 15:45:07 +02:00
88778b569e
Split testP() tests into multiple methods.
2014-04-24 15:36:02 +02:00
0d3ddd9e11
Remove redundant test case for non-HTML string.
2014-04-24 15:34:09 +02:00
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
6650be9913
add setting to set default expire date
2014-04-24 13:34:31 +02:00
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
9d3b639ce6
Remove uneeded newline
2014-04-22 20:11:34 +02:00
589c74e176
Fix indentation
2014-04-22 20:10:46 +02:00
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
3821a09689
merge master into webdav-injection
2014-04-22 12:25:49 +02:00
7e447f4f42
make download and redirectresponse public
2014-04-20 16:12:46 +02:00
309aa3bcd2
fix phpdoc for entities
2014-04-20 02:55:59 +02:00
4a7e0561ca
move db into iservercontainer
2014-04-19 19:30:12 +02:00
Morris Jobke
Thomas Müller
Björn Schießle
Robin Appelman
Andreas Fischer
Vincent Petry
Jörn Friedrich Dreyer
Arthur Schiwon
Volkan Gezer
Bernhard Posselt
icewind1991
macjohnny
Georg Ehrke
Joas Schilling
ringmaster
Lukas Reschke
Robin McCorkell
Bernhard Posselt
Bart Visscher