Thomas Müller
|
687ba053b7
|
Merge branch 'master' into appframework-master
|
2013-09-27 14:25:47 +02:00 |
|
Thomas Müller
|
735608f513
|
Merge pull request #4207 from owncloud/search_shared_files
add initial search in shared files
|
2013-09-27 05:18:12 -07:00 |
Bjoern Schiessle
|
f935a38559
|
add some comments
|
2013-09-27 14:04:28 +02:00 |
|
Bjoern Schiessle
|
5b4f515e7b
|
add test getShareFromId
|
2013-09-27 14:01:04 +02:00 |
|
Thomas Müller
|
79da35b698
|
code cleanup
|
2013-09-27 13:41:23 +02:00 |
|
Bjoern Schiessle
|
03d5ea6cec
|
check not only if the keyfile folder exists but also if it contains keyfiles
|
2013-09-27 13:34:48 +02:00 |
Arthur Schiwon
|
3e1bdd8a04
|
remove outdated (thus failing) and anyway insufficient group tests - for now
|
2013-09-27 13:34:16 +02:00 |
|
Arthur Schiwon
|
05ee6606f1
|
give test file a proper name
|
2013-09-27 13:34:16 +02:00 |
|
Arthur Schiwon
|
2cebd8b92e
|
added user_ldap tests via public api calls
|
2013-09-27 13:34:16 +02:00 |
|
Arthur Schiwon
|
a1aff3e8a1
|
LDAP: don't throw exceptions in the wrapper, errors are handled in the code. nevertheless, log unexpected errors
|
2013-09-27 13:34:16 +02:00 |
|
Arthur Schiwon
|
81cf4a22ef
|
LDAP: coding style
|
2013-09-27 13:34:15 +02:00 |
|
Arthur Schiwon
|
84f522f406
|
LDAP: simple tests for the user backend
|
2013-09-27 13:34:15 +02:00 |
|
Arthur Schiwon
|
bb162b1f94
|
LDAP: get rid of some PHP Warnings
|
2013-09-27 13:34:15 +02:00 |
|
Arthur Schiwon
|
d4f92494a2
|
LDAP: make Access be a dependency to the user and group backend instead of inheriting it.
|
2013-09-27 13:34:15 +02:00 |
|
Arthur Schiwon
|
b9cc2ad660
|
Whitespaces
|
2013-09-27 13:34:15 +02:00 |
|
Arthur Schiwon
|
f04aa1af5d
|
LDAP: don't check var type when you can specify the type in the parameter list
|
2013-09-27 13:34:15 +02:00 |
|
Arthur Schiwon
|
b9cd22cf78
|
LDAP: use wrapper, not direct function call
|
2013-09-27 13:34:15 +02:00 |
|
Arthur Schiwon
|
5090ca3eb4
|
LDAP: add phpdoc
|
2013-09-27 13:34:15 +02:00 |
|
Arthur Schiwon
|
6e850e0bee
|
LDAP: establish wrapper interface to allow proper mocking
|
2013-09-27 13:34:15 +02:00 |
|
Arthur Schiwon
|
52454e39b7
|
LDAP: move is_resource check to ldap wrapper to make it mockable
|
2013-09-27 13:34:15 +02:00 |
|
Arthur Schiwon
|
d34fbf3a86
|
LDAP: move PHP LDAP functions calls to an LDAP Wrapper for better isolation and mock testing
|
2013-09-27 13:34:15 +02:00 |
|
Arthur Schiwon
|
1a020e0696
|
Resolve merge conflict
|
2013-09-27 13:34:15 +02:00 |
Morris Jobke
|
f47ff13abf
|
Merge pull request #5001 from owncloud/fixing-user-external-backends-master
prelogin apps have to be loaded within setupBackend() otherwise required...
|
2013-09-27 02:34:59 -07:00 |
Georg Ehrke
|
4e9296a484
|
rename testTxtBlacklist to txtBlacklist
|
2013-09-27 11:33:37 +02:00 |
|
Georg Ehrke
|
1b13101096
|
move fileView object initialization to testIsTransparent
|
2013-09-27 11:01:47 +02:00 |
|
Georg Ehrke
|
aa8a145ba8
|
use dataProvider for txt blacklist test
|
2013-09-27 09:59:04 +02:00 |
|
Jenkins for ownCloud
|
f31d31844e
|
[tx-robot] updated from transifex
|
2013-09-27 00:02:30 -04:00 |
|
Bjoern Schiessle
|
7e54e8831e
|
set rememberlogin to false for the encryption app
|
2013-09-26 19:34:50 +02:00 |
|
Bjoern Schiessle
|
9bb244cc59
|
check every enabled app if the remember login feature needs to be disabled
|
2013-09-26 19:34:28 +02:00 |
Andreas Fischer
|
1a398fba67
|
phpunit.xml: Port code coverage excludes from autotest to dist.
|
2013-09-26 19:05:47 +02:00 |
|
Bjoern Schiessle
|
62b8c36a40
|
check if encryption app is enabled before trying to calculate file size
|
2013-09-26 16:27:14 +02:00 |
|
Morris Jobke
|
3dd19c7758
|
Merge pull request #4999 from owncloud/run-unit-tests-for-apps-master
run unit tests for apps as well
|
2013-09-26 07:09:32 -07:00 |
|
Thomas Müller
|
f8933eaf92
|
Remove $RUNTIME_NOAPPS - setting to false was not enough
|
2013-09-26 14:03:04 +02:00 |
|
Thomas Müller
|
e515509a81
|
prelogin apps have to be loaded within setupBackend() otherwise required classes cannot be loaded
|
2013-09-26 13:34:47 +02:00 |
|
blizzz
|
b9d582caa2
|
Merge pull request #4990 from owncloud/user_fix_manager
manager checkPassword now returns User object, adjust internal user clas...
|
2013-09-26 04:03:20 -07:00 |
|
Bjoern Schiessle
|
b9d6539d76
|
Merge branch 'master' into ocs_share_api
|
2013-09-26 13:02:39 +02:00 |
Björn Schießle
|
6b1d70f148
|
Merge pull request #4887 from owncloud/sharing_disable_public_upload
check only permission from link-share to decide if public upload is enabled or disabled
|
2013-09-26 03:16:15 -07:00 |
|
Thomas Müller
|
2334f96906
|
Merge pull request #4991 from owncloud/enc_fix_warning
check if key exists before reading it
|
2013-09-26 03:15:14 -07:00 |
|
Thomas Müller
|
d1b5d65622
|
run unit tests for apps as well
|
2013-09-26 12:02:06 +02:00 |
|
Bjoern Schiessle
|
663009f895
|
fix check if app is enabled
|
2013-09-26 11:08:02 +02:00 |
|
Bjoern Schiessle
|
4d2dfa98c0
|
check if key exists before reading it
|
2013-09-26 11:06:58 +02:00 |
|
Thomas Müller
|
b11d8799c1
|
adding unit tests for ObjectTree::move()
|
2013-09-26 10:50:15 +02:00 |
|
Thomas Müller
|
469b309b21
|
Merge pull request #4892 from owncloud/vcategories_public
OC_VCategories => OC\Tags. Public interface and getter in server container
|
2013-09-25 14:24:37 -07:00 |
|
Bjoern Schiessle
|
0b98427536
|
fix check if app is enabled
|
2013-09-25 19:23:07 +02:00 |
|
Arthur Schiwon
|
b5ac672864
|
Missing Test for the previous commit
|
2013-09-25 19:15:27 +02:00 |
|
Morris Jobke
|
70dccd28ef
|
Merge pull request #4987 from owncloud/different_color_placeholder
Make it possible to have a different color than the username for placeholder
|
2013-09-25 10:11:52 -07:00 |
|
Bjoern Schiessle
|
71bbb2ea8b
|
check if key exists before reading it
|
2013-09-25 17:44:05 +02:00 |
|
Thomas Müller
|
46e47be782
|
Merge branch 'master' into move-aborted-upload-detection-into-plugin-master
|
2013-09-25 17:43:25 +02:00 |
|
Thomas Müller
|
826c6bec8f
|
expect unlinkto be called
|
2013-09-25 17:41:16 +02:00 |
|
Thomas Müller
|
3fa5271f10
|
adding unit tests
|
2013-09-25 17:34:28 +02:00 |