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

3766 Commits

Author SHA1 Message Date
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
Thomas Müller
95528debca try to fix broken unit tests 2015-05-08 13:11:42 +02:00
Thomas Müller
fc7af9898b cleanup travis.yml and scrutnizer.yml 2015-05-08 13:11:21 +02:00
Thomas Müller
eb8fb7a225 Merge pull request #895 from jakobsack/master
Fix creation of ics files
2015-05-08 11:01:25 +02:00
Jakob Sack
e009465f81 Fix creation of ics files 2015-05-08 10:02:41 +02:00
Thomas Müller
f8e175f944 Merge pull request #734 from owncloud/fix-updated-t
fix auto escaping functionality of t()
2015-05-08 00:43:00 +02:00
Thomas Müller
6b85b484d3 Merge pull request #857 from lupusmeatus/bugfix-restrict-addressbookprovider-search-to-single-addressbook
Restrict addressbookprovider-search to its address-book to fix duplicate search results
2015-05-08 00:35:05 +02:00
Thomas Müller
ba050ccf11 Merge pull request #877 from derkostka/master
fix Undefined index error ehen updatein thumbnail of contacts
2015-05-08 00:34:01 +02:00
Thomas Müller
4acefa4c3a Merge pull request #887 from jakobsack/master
Make birthday events non-blocking
2015-05-08 00:32:58 +02:00
Jenkins for ownCloud
779cba368f [tx-robot] updated from transifex 2015-05-05 00:48:52 -04:00
Jenkins for ownCloud
8e261a9f0f [tx-robot] updated from transifex 2015-05-04 00:48:51 -04:00
Jenkins for ownCloud
712619c1a8 [tx-robot] updated from transifex 2015-05-03 00:48:54 -04:00
Sebastian Kostka
bb600cd86f fix undefined variable $vevent
using the return value of createComponent
2015-04-27 23:02:13 +02:00
Bernhard Posselt
fcf77a71c7 Merge pull request #886 from owncloud/issue-885
remove use of obsolete class OC_FileProxy
2015-04-27 22:08:05 +02:00
Jakob Sack
1ca7a34675 Make birthday events non-blocking 2015-04-27 17:35:25 +02:00
babelouest
03776258bb remove use of obsolete class OC_FileProxy 2015-04-26 15:09:13 -04:00
Jenkins for ownCloud
de7eafb8b9 [tx-robot] updated from transifex 2015-04-24 00:48:50 -04:00