Jan ten Bokkel
be5ae33234
Align import dialog to screen center
2014-08-28 16:24:38 +02:00
Jenkins for ownCloud
a6977a714f
[tx-robot] updated from transifex
2014-08-28 00:48:37 -04:00
Jan ten Bokkel
f1cbc92ec7
Remove unnecessary log message
2014-08-27 13:48:53 +02:00
Jenkins for ownCloud
2a185f6d89
[tx-robot] updated from transifex
2014-08-27 00:48:33 -04:00
jbtbnl
65966d2888
Fix Scrutinizer issues
2014-08-26 23:20:29 +02:00
jbtbnl
0129e59024
Hide upload iframe and fix merge flaws
2014-08-26 19:28:45 +02:00
jbtbnl
a9ade3079d
Merge remote-tracking branch 'origin/master' into import-new-ui
...
Conflicts:
css/contacts.css
lib/controller/importcontroller.php
2014-08-26 17:42:14 +02:00
Jenkins for ownCloud
f310236add
[tx-robot] updated from transifex
2014-08-26 00:48:42 -04:00
Jan-Christoph Borchardt
6aa9919ec2
Merge pull request #609 from ockham/rename-tagmgr-member
...
Rename $this->tagMgr to $this->tags as that's what they are.
2014-08-26 00:20:27 +02:00
Jenkins for ownCloud
1f97ef460d
[tx-robot] updated from transifex
2014-08-25 00:48:30 -04:00
Jenkins for ownCloud
84d09e8903
[tx-robot] updated from transifex
2014-08-24 00:48:33 -04:00
Jenkins for ownCloud
e3d0626823
[tx-robot] updated from transifex
2014-08-23 00:48:41 -04:00
Jenkins for ownCloud
e5ff5d0d48
[tx-robot] updated from transifex
2014-08-22 00:48:36 -04:00
Jenkins for ownCloud
6678b118d3
[tx-robot] updated from transifex
2014-08-21 00:48:32 -04:00
Jenkins for ownCloud
cedac5cd86
[tx-robot] updated from transifex
2014-08-20 00:48:34 -04:00
Bernhard Reiter
1e015d9872
Rename $this->tagMgr to $this->tags as that's what they are.
...
They're instances of OCP\ITags, not of OCP\ITagManager.
2014-08-19 14:29:46 +02:00
Jenkins for ownCloud
6d87c10db6
[tx-robot] updated from transifex
2014-08-19 00:48:31 -04:00
Jenkins for ownCloud
85dd2652b6
[tx-robot] updated from transifex
2014-08-18 00:48:43 -04:00
Jenkins for ownCloud
0a33b37f3f
[tx-robot] updated from transifex
2014-08-17 00:48:31 -04:00
Jenkins for ownCloud
81b232c74a
[tx-robot] updated from transifex
2014-08-16 00:48:26 -04:00
Jenkins for ownCloud
ec5e6681f1
[tx-robot] updated from transifex
2014-08-15 00:48:08 -04:00
Jenkins for ownCloud
5b01b36868
[tx-robot] updated from transifex
2014-08-14 00:48:30 -04:00
Volkan Gezer
d342be5ca6
remove obsolete japanese lang code
2014-08-13 22:39:20 +02:00
Jenkins for ownCloud
2cbb261820
[tx-robot] updated from transifex
2014-08-13 00:48:09 -04:00
Jenkins for ownCloud
0cd8a62ae3
[tx-robot] updated from transifex
2014-08-12 00:48:17 -04:00
Jenkins for ownCloud
941f8db6f5
[tx-robot] updated from transifex
2014-08-11 00:48:08 -04:00
Felix Eckhofer
87fa4d055c
Use correct method to extract image from vcard
...
It was incorrectly assumed, that $vcard is always an
OCA\Contacts\Contact (which is true when the contacts app is rendered)
but when called from the `contactUpdated` hook, it actually is a
OCA\Contacts\VObject\VCard.
Fixes owncloud/contacts#585
2014-08-10 20:16:52 +02:00
Jenkins for ownCloud
de132fed28
[tx-robot] updated from transifex
2014-08-10 00:48:09 -04:00
Jenkins for ownCloud
ffa7d985c0
[tx-robot] updated from transifex
2014-08-09 00:48:08 -04:00
Jenkins for ownCloud
e8250a7405
[tx-robot] updated from transifex
2014-08-08 00:48:18 -04:00
Jenkins for ownCloud
2c1e679b62
[tx-robot] updated from transifex
2014-08-07 00:48:10 -04:00
Jenkins for ownCloud
b58420d3e1
[tx-robot] updated from transifex
2014-08-06 00:48:21 -04:00
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
