1
0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-11-29 11:24:11 +01:00
Commit Graph

3629 Commits

Author SHA1 Message Date
Thomas Müller
0e2f327174 No php based translations are required any more 2015-06-30 00:28:05 +02:00
Thomas Müller
513b1d6875 Merge pull request #894 from owncloud/scrutinizer-patch-1
Scrutinizer Auto-Fixes
2015-06-29 22:29:54 +02:00
Lukas Reschke
a2f6c24914 Bump version to 0.3.1.0 2015-06-29 14:23:57 +02:00
Jenkins for ownCloud
183de9aa6d [tx-robot] updated from transifex 2015-06-29 00:48:28 -04:00
Jenkins for ownCloud
f580d8dcff [tx-robot] updated from transifex 2015-06-28 00:48:36 -04:00
Jenkins for ownCloud
de94d081ad [tx-robot] updated from transifex 2015-06-27 00:49:06 -04:00
Thomas Müller
1a37138ec3 Merge pull request #906 from owncloud/fix_880_905
Fix #880 #905
2015-06-26 17:55:26 +02:00
Thomas Müller
0bcb5b61a2 Merge pull request #901 from MatthiasMMayr/master
Added german entry names for outlook-csv importer
2015-06-26 17:53:24 +02:00
Scrutinizer Auto-Fixer
cf7c31b6bb Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-06-26 17:49:39 +02:00
Thomas Müller
b82e877b0b Merge pull request #915 from owncloud/fix-standard-vcard-import
Fix standard vcard import
2015-06-26 17:47:30 +02:00
Thomas Müller
67d0f14ed3 Merge pull request #921 from schuemann/master
Fixed error handling in getContact if  $id not an array.
2015-06-26 17:44:34 +02:00
Thomas Müller
44370e7f38 Merge pull request #926 from mroi/patch-1
fix app loading with avatars disabled
2015-06-26 17:40:36 +02:00
Thomas Müller
5e37672d2e Merge pull request #934 from owncloud/default_to_home
default should always be home
2015-06-26 17:31:18 +02:00
Jenkins for ownCloud
5b26a58717 [tx-robot] updated from transifex 2015-06-26 00:49:04 -04:00
Bjoern Schiessle
d1b6ee9f2e default should always be home 2015-06-25 16:53:33 +02:00
Jenkins for ownCloud
544a60b39a [tx-robot] updated from transifex 2015-06-25 00:48:59 -04:00
Björn Schießle
6ef7913bf3 Merge pull request #924 from owncloud/federated_cloud
Federated cloud
2015-06-23 17:52:00 +02:00
Bjoern Schiessle
e0d0755998 allow user to add federated cloud ID to addressbook 2015-06-23 17:46:07 +02:00
Jenkins for ownCloud
053e52f6ed [tx-robot] updated from transifex 2015-06-23 00:49:14 -04:00
Jenkins for ownCloud
2eeed26e49 [tx-robot] updated from transifex 2015-06-21 00:48:56 -04:00
Michael Roitzsch
07283a2290 add avatar JavaScript
otherwise the contacts app fails to load due to JavaScript errors when avatars are disabled
2015-06-19 10:49:19 +02:00
Bjoern Schiessle
ceac26931b fix closing div 2015-06-17 10:02:37 +02:00
Jenkins for ownCloud
44e148408a [tx-robot] updated from transifex 2015-06-15 00:48:52 -04:00
schuemann
f8f60b50ae Use tabs instead of spaces. 2015-06-14 16:00:14 +02:00
schuemann
7aec8c49d6 Fixed error handling in getContact if is not an array. 2015-06-14 15:32:36 +02:00
Jenkins for ownCloud
2017cfeb72 [tx-robot] updated from transifex 2015-06-12 00:49:02 -04:00
Jenkins for ownCloud
346298e12b [tx-robot] updated from transifex 2015-06-09 00:49:01 -04:00
Jenkins for ownCloud
15ba90e9f4 [tx-robot] updated from transifex 2015-06-08 00:48:53 -04:00
Bernhard Posselt
24eda13752 fix standard vcard import 2015-06-06 20:06:52 +02:00
Jenkins for ownCloud
9058d5fe84 [tx-robot] updated from transifex 2015-06-02 00:48:45 -04:00
Jakob Sack
854e991441 Merge pull request #896 from derkostka/rebase-fix-#888
rebased fix for #888
2015-05-26 15:38:29 +02:00
Jenkins for ownCloud
6aa0d93c3a [tx-robot] updated from transifex 2015-05-24 00:48:52 -04:00
babelouest
057507d989 and one more time for scrutinizer
he's so obsessive, he reminds me sometimes...
2015-05-23 18:26:30 -04:00
babelouest
6032ec2e1e scrutinizer told me not to use spaces for indent, tabs only
so I did
2015-05-23 18:20:50 -04:00
babelouest
c4c1a1fa6b fix issue #905 2015-05-23 17:57:14 -04:00
Jenkins for ownCloud
b2b224afd6 [tx-robot] updated from transifex 2015-05-23 00:48:50 -04:00
Nicolas Mora
dcf242f501 use $property->add() instead of $property->parameters[] = new \Sabre\VObject\Parameter() 2015-05-20 07:29:35 -04:00
babelouest
75bbf040e4 fix bug #880, there was no $root parameter passed to the VObject/Parameter creation 2015-05-19 08:33:09 -04:00
Matthias Mayr
efd1a6a6d9 Added Altnames for Outlook 2007 2015-05-15 13:48:46 +02:00
Matthias Mayr
6b1b044909 Added german entry names for outlook-csv importer 2015-05-14 14:51:28 +02:00
Jenkins for ownCloud
f92f6a1deb [tx-robot] updated from transifex 2015-05-13 00:48:54 -04:00
Thomas Müller
d22476e460 Merge pull request #897 from owncloud/update-travis-branches-only-setting
Update the branches.only setting in .travis.yml
2015-05-12 09:33:49 +02:00
Joas Schilling
b8369f5e12 Update the branches.only setting in .travis.yml 2015-05-11 15:26:01 +02:00
Sebastian Kostka
d00df09e69 fix getBirthdayEvent
removing unneeded $vcal->add($vevent);
2015-05-10 19:07:40 +02:00
Sebastian Kostka
2d8d750895 Merge pull request #1 from owncloud/master
update master
2015-05-10 19:05:08 +02:00
Jenkins for ownCloud
10ce55db9c [tx-robot] updated from transifex 2015-05-09 00:48:56 -04:00
Thomas Müller
3b22a880b9 Adding magic file to not generate php translation files 2015-05-08 23:34:35 +02:00
Thomas Müller
dd569dc8ab Merge pull request #891 from owncloud/bring-scrutinizer-back
cleanup travis.yml and scrutnizer.yml
2015-05-08 22:46:51 +02:00
Thomas Müller
bd5b072a36 Set ownCloud min version to 8.1 2015-05-08 13:11:42 +02:00
Thomas Müller
fa342397be setup VCARD classes for tests as well 2015-05-08 13:11:42 +02:00