Arthur Schiwon
dbebf6bb5e
add comment to clearify when a skip in the foreach happens
2014-04-09 12:25:48 +02:00
Jörn Friedrich Dreyer
9b0f289143
remove obsolete code
2014-04-09 12:09:28 +02:00
Arthur Schiwon
ee3368d2ad
replace hardcoded limit of 400 with user controlled ldapPagingSize value
2014-04-09 11:38:51 +02:00
Arthur Schiwon
2e5adadad7
Put inner loop into own method, let's see whether it makes scrutinizer happier
2014-04-09 11:31:56 +02:00
Arthur Schiwon
bdc418d1f9
var count is assigned in the inner loop so it must be checked inside there to be properly used as part of the exit condition of the outer loop
2014-04-09 11:31:56 +02:00
Arthur Schiwon
43402c56dd
initialize variable
2014-04-09 11:31:56 +02:00
Arthur Schiwon
40f9875f11
LDAP: fix user report i.e. count for LDAP servers with really many users
2014-04-09 11:31:56 +02:00
Arthur Schiwon
8bb27551bd
LDAP: make sure cache key for paged result cookie matches when limit or offset is null or 0
2014-04-09 11:31:56 +02:00
Joas Schilling
fbb9e11a7e
Merge pull request #8122 from owncloud/issue/8048
...
Always define sendmail_is_available in settings/admin.php
2014-04-09 11:14:24 +02:00
Joas Schilling
e79a027e77
Always define sendmail_is_available
...
Fix #8048
2014-04-09 10:18:46 +02:00
Jenkins for ownCloud
796f719548
[tx-robot] updated from transifex
2014-04-09 01:56:49 -04:00
Thomas Müller
1a09d64a77
Merge pull request #8117 from owncloud/fix-hard-coded-uman-str
...
Make hardcoded exception messages translatable
2014-04-08 22:45:19 +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
c1345d3a2d
Merge pull request #8111 from owncloud/trash-disablesharing
...
Disable sharing in trashbin app
2014-04-08 21:00:44 +02:00
Volkan Gezer
a4f42676ea
Make hardcoded exception messages translatable
2014-04-08 20:07:25 +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
Vincent Petry
35ab6fe5a9
Disable sharing in trashbin app
2014-04-08 17:13:59 +02:00
Thomas Müller
618914282a
Merge pull request #8110 from owncloud/fix-failing-config-unit-test
...
class Test_Config is already declared
2014-04-08 16:26:35 +02:00
Thomas Müller
a4fc92b05b
class Test_Config is already declared
2014-04-08 14:15:33 +02:00
Arthur Schiwon
2407321625
add tests for LDAP
2014-04-08 12:57:06 +02:00
Arthur Schiwon
142fc5f3af
fix return value when a search string was passed to return integer instead of array
2014-04-08 12:53:59 +02:00
Arthur Schiwon
9597f41904
add group tests
2014-04-08 12:32:30 +02:00
Arthur Schiwon
5f8d9b3a4e
ask implementsAction instead of checking method_exists for easier testing
2014-04-08 12:31:11 +02:00
Arthur Schiwon
96cb75f5cf
implement countUsersInGroup in LDAP group backend
2014-04-08 12:04:38 +02:00
Arthur Schiwon
698297feb3
add optional countUsersInGroup method to group backends
2014-04-08 12:04:38 +02:00
Thomas Müller
411a810ebe
Merge pull request #8032 from owncloud/fs-backend-registration
...
Files External: allow dynamic backend registration
2014-04-08 11:27:02 +02:00
Jenkins for ownCloud
4ad4b9768c
[tx-robot] updated from transifex
2014-04-08 01:57:51 -04:00
Thomas Müller
9360dbf8a4
Merge pull request #8102 from owncloud/fix-appconfig-master
...
Fix appconfig master
2014-04-08 07:20:37 +02:00
Thomas Müller
68b7822cf5
js style fixes according to our jshintrc rules
2014-04-07 23:45:35 +02:00
Thomas Müller
7dd0074655
fixing mkdir code to respect external file systems as well
2014-04-07 23:17:35 +02:00
Thomas Müller
d15a4719d2
fix folder upload in js
2014-04-07 23:04:08 +02:00
Thomas Müller
971a311fee
adding parentId to file info array
2014-04-07 23:03:19 +02:00
Thomas Müller
6d373e97c3
remove unused exit()
2014-04-07 23:02:49 +02:00
Thomas Müller
3587c88fe9
Merge branch 'master' of https://github.com/lukepolo/core-1 into lukepolo-master
...
Conflicts:
apps/files/js/file-upload.js
2014-04-07 22:28:16 +02:00
Jörn Friedrich Dreyer
be9bc2c727
Merge pull request #8089 from bantu/autotest-checkout-pathspec
...
Use git checkout on directory as some files may not be in git resulting ...
2014-04-07 21:10:11 +02:00
Thomas Müller
c1fd300048
using array_key_exists() instead of isset() - required because in case the value is null isset is returning false
2014-04-07 21:05:48 +02:00
Thomas Müller
85e7921b14
fixing undefined exception classes
2014-04-07 20:57:08 +02:00
Thomas Müller
240d1ae6b9
unit test testSetAppValueIfSetToNull() added
2014-04-07 20:56:43 +02:00
Thomas Müller
c86bda0325
Merge pull request #8065 from owncloud/avatar-highdpi
...
use high resolution avatars on highdpi screens
2014-04-07 20:36:15 +02:00
Thomas Müller
3ac009c2b4
unit tests for dynamic backend registration
2014-04-07 20:18:57 +02:00
Jörn Friedrich Dreyer
3fde1b4342
Merge pull request #8091 from owncloud/jshint-globals-oc-t-n
...
adding ownCloud globals to jshintrc: OC, t, n
2014-04-07 20:06:28 +02:00
Thomas Müller
4253d63f9f
ignore underscore.js in scrutinizer.yml
2014-04-07 17:11:30 +02:00
Thomas Müller
78e5410199
Merge branch 'master' into jshint-globals-oc-t-n
...
Conflicts:
.jshintrc
2014-04-07 17:10:45 +02:00
Thomas Müller
1e559f7239
Merge pull request #8088 from owncloud/fix-personal.js
...
reduce code duplication, fix parse error, prevent page reload on hitting...
2014-04-07 16:59:32 +02:00
Fabian Henze
1245ff8f31
Add unit tests for OC_Helper::phpFileSize function
2014-04-07 15:31:34 +02:00
icewind1991
d3eee01190
Merge pull request #7599 from owncloud/public-pathinfo
...
Allow using pathinfo based public.php paths
2014-04-07 14:53:44 +02:00
Thomas Müller
d7bc23e16d
adding ownCloud globals to jshintrc: OC, t, n
2014-04-07 14:50:32 +02:00
Thomas Müller
0fe32eee13
Merge pull request #8083 from owncloud/fix-link-to-sync
...
Remove wrong whitespace from URL and use HTTPS
2014-04-07 14:38:47 +02:00
Thomas Müller
21a54ba50f
Merge pull request #8086 from owncloud/fix_copy_conflict_translations_in_js
...
Fix copy conflict dialog translation
2014-04-07 14:38:00 +02:00
Andreas Fischer
de07f25bc2
Use git checkout on directory as some files may not be in git resulting in, e.g.:
...
error: pathspec 'tests/data/lorem-copy.txt' did not match any file(s) known to git.
error: pathspec 'tests/data/testimage-copy.png' did not match any file(s) known to git.
2014-04-07 14:06:20 +02:00