1
0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-12-04 15:24:35 +01:00
Commit Graph

3222 Commits

Author SHA1 Message Date
Jenkins for ownCloud
efd0dee726 [tx-robot] updated from transifex 2014-08-05 00:48:11 -04:00
Jenkins for ownCloud
ae55ee16cd [tx-robot] updated from transifex 2014-08-04 00:48:17 -04:00
Jenkins for ownCloud
3b699c5b61 [tx-robot] updated from transifex 2014-08-03 00:48:06 -04:00
Jenkins for ownCloud
152758b854 [tx-robot] updated from transifex 2014-08-02 00:48:10 -04:00
Nicolas Mora
c5dd531771 Merge pull request #507 from makuser/master
Change "vcardcountry" to "c" for HOME ADR
2014-08-01 16:20:16 -04:00
Jenkins for ownCloud
a1661c1370 [tx-robot] updated from transifex 2014-08-01 00:48:11 -04:00
Jenkins for ownCloud
8b0d061aa9 [tx-robot] updated from transifex 2014-07-31 00:48:48 -04:00
Jan-Christoph Borchardt
105c150fab Merge pull request #569 from owncloud/fix-search-master
properly convert the json serialized data to the format as expected by t...
2014-07-30 17:18:05 +02:00
Thomas Müller
55fc3dda63 properly convert the json serialized data to the format as expected by the public contacts search 2014-07-30 17:05:09 +02:00
Jan-Christoph Borchardt
2fed562419 Merge pull request #556 from owncloud/fix-mediaqueries
fix excessive overwrite of mobile sizes defined in core, fix #555
2014-07-30 15:09:38 +02:00
Jan-Christoph Borchardt
c1cd176713 Merge pull request #561 from owncloud/import-label
Change label when there is no contact
2014-07-30 15:08:44 +02:00
Jan-Christoph Borchardt
7075e94ee0 Merge pull request #545 from owncloud/return-photo-on-search-master
return 'PHOTO' attribute on AddressbookProvider::search
2014-07-30 15:05:50 +02:00
Thomas Müller
8311a3ab62 Merge pull request #560 from AdamWill/536
correct selection of current type for multi-type parameters: #536
2014-07-30 11:41:39 +02:00
Thomas Müller
0549c01fe8 Merge pull request #568 from owncloud/adding-php-lint
adding php-lint
2014-07-30 11:33:10 +02:00
Thomas Müller
48aa71dda1 Merge pull request #550 from ockham/importcontroller-use-itags
Use OCP\ITags in lib/controller/importcontroller.php.
2014-07-30 11:12:36 +02:00
Clark Tomlinson
e7755dcc32 Extracting closures into methods to solve php 5.3 issue #546 2014-07-30 11:07:44 +02:00
Bernhard Posselt
7957769c59 fix php 4.3 2014-07-30 11:04:15 +02:00
Thomas Müller
6da6437150 adding php-lint 2014-07-30 10:54:18 +02:00
Jenkins for ownCloud
6d00894103 [tx-robot] updated from transifex 2014-07-30 00:48:07 -04:00
Jenkins for ownCloud
f31fe9b206 [tx-robot] updated from transifex 2014-07-29 00:48:08 -04:00
Jenkins for ownCloud
9198f9b533 [tx-robot] updated from transifex 2014-07-28 00:48:07 -04:00
babelouest
378ab9eb37 Change label when there is no contact 2014-07-27 18:40:25 -04:00
Jenkins for ownCloud
0be96b6f7c [tx-robot] updated from transifex 2014-07-27 00:48:08 -04:00
Adam Williamson
128f8be707 correct selection of current type for multi-type parameters: #536
This check was exactly the wrong way around, so the code to select
the appropriate type wouldn't run when it was actually needed.
2014-07-26 11:20:38 -07:00
Jenkins for ownCloud
2c478850da [tx-robot] updated from transifex 2014-07-26 00:48:09 -04:00
Jenkins for ownCloud
648d0e6baf [tx-robot] updated from transifex 2014-07-25 00:48:08 -04:00
Jan-Christoph Borchardt
5ee271aeef fix excessive overwrite of mobile sizes defined in core, fix #555 2014-07-24 11:53:35 +02:00
Jenkins for ownCloud
b5691321e1 [tx-robot] updated from transifex 2014-07-24 00:48:14 -04:00
Bernhard Reiter
dd2c0f7c14 Use OCP\ITags in lib/controller/importcontroller.php. 2014-07-23 20:43:32 +02:00
Jenkins for ownCloud
7d649b3740 [tx-robot] updated from transifex 2014-07-23 00:48:29 -04:00
Thomas Müller
e8e9d34725 return 'PHOTO' attribute on AddressbookProvider::search 2014-07-22 12:42:59 +02:00
Jenkins for ownCloud
487834f98e [tx-robot] updated from transifex 2014-07-22 00:48:07 -04:00
Jenkins for ownCloud
b3836ef1b2 [tx-robot] updated from transifex 2014-07-21 00:48:07 -04:00
Jenkins for ownCloud
c33fd8c8a6 [tx-robot] updated from transifex 2014-07-20 00:48:09 -04:00
Jenkins for ownCloud
53317d9e8e [tx-robot] updated from transifex 2014-07-19 00:48:11 -04:00
Jenkins for ownCloud
3bedb4fe2b [tx-robot] updated from transifex 2014-07-18 00:48:09 -04:00
Jenkins for ownCloud
824f00f42d [tx-robot] updated from transifex 2014-07-17 00:48:08 -04:00
Jenkins for ownCloud
94048713d1 [tx-robot] updated from transifex 2014-07-16 00:48:10 -04:00
Jenkins for ownCloud
b46b484eb5 [tx-robot] updated from transifex 2014-07-15 00:48:15 -04:00
Jenkins for ownCloud
71c647fdba [tx-robot] updated from transifex 2014-07-14 00:48:08 -04:00
Jenkins for ownCloud
ffb95e3a77 [tx-robot] updated from transifex 2014-07-13 00:48:08 -04:00
Jenkins for ownCloud
56123585ae [tx-robot] updated from transifex 2014-07-12 00:48:10 -04:00
Stéphane
4a68ac3458 Merge pull request #533 from owncloud/fix-532
Fix #532. Adds an intermediate variable to be compatible with php 5.3
2014-07-10 22:06:08 +02:00
Georg Ehrke
b7f6980c83 Merge pull request #529 from owncloud/add_ocsid
Add ocsid
2014-07-10 19:17:29 +02:00
Jenkins for ownCloud
f724d32e4d [tx-robot] updated from transifex 2014-07-10 03:56:43 -04:00
Stephane V
e62dc63947 Fix #532. Adds an intermediate variable to be compatible with php 5.3 2014-07-09 19:18:20 +02:00
Jenkins for ownCloud
2b2642187d [tx-robot] updated from transifex 2014-07-09 00:48:33 -04:00
Jenkins for ownCloud
29d93e571a [tx-robot] updated from transifex 2014-07-08 00:48:07 -04:00
Georg Ehrke
db1595250f increment version number 2014-07-07 17:29:16 +02:00
Georg Ehrke
5f5865a56b add ocsid 2014-07-07 17:28:59 +02:00