Jenkins for ownCloud
ae1b16638a
[tx-robot] updated from transifex
2014-05-22 00:48:08 -04:00
Nicolas Mora
f6804bac15
Merge pull request #499 from owncloud/498
...
fix bug #498
2014-05-21 10:30:50 -04:00
babelouest
fed712b0c9
fixed issue #498 another time
...
seems that the problem was due to the array $this->objects that didn't accept ldap backend ids as key
forced the key to string, seems better now (ldap and local backend tested)
2014-05-20 14:53:04 -04:00
babelouest
bb1733da81
fix bug #498
2014-05-20 14:10:17 -04:00
Jenkins for ownCloud
0b180972dc
[tx-robot] updated from transifex
2014-05-20 00:48:33 -04:00
Jenkins for ownCloud
bf4e066968
[tx-robot] updated from transifex
2014-05-19 00:48:30 -04:00
Jenkins for ownCloud
06539a8423
[tx-robot] updated from transifex
2014-05-18 00:48:28 -04:00
Jenkins for ownCloud
1a08fec656
[tx-robot] updated from transifex
2014-05-17 00:48:30 -04:00
Jenkins for ownCloud
dee2efb5f4
[tx-robot] updated from transifex
2014-05-16 00:48:31 -04:00
Tobia De Koninck
9da7357bb5
Revert change to app.php so the searchProvider from the addressbook is loaded
2014-05-15 19:30:28 +02:00
Jenkins for ownCloud
5eb4923ce5
[tx-robot] updated from transifex
2014-05-15 00:48:30 -04:00
Jenkins for ownCloud
0956df8986
[tx-robot] updated from transifex
2014-05-14 00:48:28 -04:00
Jenkins for ownCloud
58ecc406a5
[tx-robot] updated from transifex
2014-05-13 00:49:24 -04:00
babelouest
62306cc39e
Merge branch 'master' of https://github.com/owncloud/contacts
2014-05-12 13:02:25 -04:00
babelouest
af3df8e95a
fixed undefined connectors
2014-05-12 13:01:34 -04:00
Jenkins for ownCloud
7339323ea4
[tx-robot] updated from transifex
2014-05-12 00:49:51 -04:00
Jenkins for ownCloud
67f726b78e
[tx-robot] updated from transifex
2014-05-11 00:50:10 -04:00
Nicolas Mora
0882b982b3
Merge pull request #460 from owncloud/ldap
...
Ldap Backend read/write
2014-05-10 11:29:05 -04:00
Jenkins for ownCloud
5a5860dbb5
[tx-robot] updated from transifex
2014-05-10 00:50:06 -04:00
babelouest
b2d26811e3
fixed scrutinizer issues
2014-05-09 15:18:44 -04:00
babelouest
c682a3585d
Merge branch 'ldap' of https://github.com/owncloud/contacts into ldap
...
Conflicts:
admin.php
lib/backend/ldap.php
lib/dispatcher.php
2014-05-09 14:54:49 -04:00
babelouest
de4bb76c53
after a painful rebase
2014-05-09 14:30:14 -04:00
babelouest
f890fb5357
to use the connector vcardunassigned
2014-05-09 13:58:52 -04:00
babelouest
93f7ccbc09
tmp
2014-05-09 13:58:11 -04:00
babelouest
7e3da29c87
rebase
2014-05-09 13:55:51 -04:00
babelouest
5e95953799
rebase
2014-05-09 13:54:45 -04:00
babelouest
2e04b55709
fix display bug for add ldap addressbook button
2014-05-09 08:39:54 -04:00
Thomas Tanghus
f699812f69
Move instantiation of ImportManager to PageController
2014-05-09 13:39:17 +02:00
Thomas Tanghus
f9aa396d01
Small readability fix
2014-05-09 11:29:21 +02:00
Tobia De Koninck
3806f0236b
Change displayname of ownCloud username field
2014-05-09 09:50:50 +02:00
Jenkins for ownCloud
eb73753128
[tx-robot] updated from transifex
2014-05-09 00:49:28 -04:00
Thomas Tanghus
5a35e74270
Merge pull request #481 from owncloud/fix_php53_errors
...
Use instead of
2014-05-08 14:37:08 +02:00
Tobia De Koninck
7856fc22ef
more getServer() instead server
2014-05-08 14:26:57 +02:00
Tobia De Koninck
f64ca8af7c
getServer() instead server
2014-05-08 14:25:47 +02:00
Jenkins for ownCloud
19a014ca8e
[tx-robot] updated from transifex
2014-05-08 00:49:28 -04:00
Jenkins for ownCloud
95f3887ce0
[tx-robot] updated from transifex
2014-05-07 00:49:31 -04:00
Tobia De Koninck
415821e2c3
Implement getKey() for the localusers backend provider
2014-05-06 13:50:18 +02:00
Tobia De Koninck
0a035175bb
Use instead of
2014-05-05 17:32:07 +02:00
babelouest
a3166ee452
add admin settings to enable/disable ldap backend
2014-05-05 01:10:01 -04:00
Jenkins for ownCloud
4aaa2d6dfb
[tx-robot] updated from transifex
2014-05-05 00:49:30 -04:00
Jenkins for ownCloud
0b841a5240
[tx-robot] updated from transifex
2014-05-04 00:49:52 -04:00
Jenkins for ownCloud
f32c191336
[tx-robot] updated from transifex
2014-05-03 00:49:32 -04:00
Jenkins for ownCloud
fb66b5f984
[tx-robot] updated from transifex
2014-05-02 00:49:31 -04:00
Jenkins for ownCloud
2ad76ac7bc
[tx-robot] updated from transifex
2014-05-01 00:48:40 -04:00
Jenkins for ownCloud
7df965b2d3
[tx-robot] updated from transifex
2014-04-30 00:49:04 -04:00
Jenkins for ownCloud
7ea9f78b27
[tx-robot] updated from transifex
2014-04-29 00:48:39 -04:00
Jenkins for ownCloud
fcb87627b8
[tx-robot] updated from transifex
2014-04-28 00:48:38 -04:00
Tobia De Koninck
feacd10f1a
fix typo
2014-04-27 16:44:42 +02:00
Tobia De Koninck
594088a258
Add in the localuseradressbookprovider
2014-04-27 16:43:35 +02:00
Jenkins for ownCloud
8e6ad1805d
[tx-robot] updated from transifex
2014-04-27 00:48:37 -04:00