rooty/OwncloudContactsOfficial
1
0
Fork 0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-12-03 15:24:09 +01:00
Code Issues Releases Activity
1,719 Commits 18 Branches 95 Tags 40 MiB
3eb5303c3e
Commit Graph

1719 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robin Appelman
1cb9d45ccc Merge branch 'master' into gallery 2012-11-07 17:19:52 +01:00
Robin Appelman
dbd03670cc Merge branch 'master' into filesystem 2012-11-07 17:19:36 +01:00
Raghu Nayyar
32f7466e6e Update contacts/css/contacts.css 
text-align should either be removed or be given a property. ;)
 2012-11-07 00:30:02 +05:30
Raghu Nayyar
554de1c990 Update contacts/css/contacts.css 
Syntax Error resolved.
 2012-11-06 19:58:40 +05:30
Thomas Tanghus
4b73ded2ac Trying to limit Cyclomatic Complexity (?) 2012-11-06 01:36:27 +01:00
Thomas Tanghus
543dc62b4c Merge branch 'master' of github.com:owncloud/apps into contacts_rework 2012-11-06 00:10:29 +01:00
Jenkins for ownCloud
9a61fbeebd [tx-robot] updated from transifex 2012-11-06 00:03:22 +01:00
Thomas Tanghus
e34a932609 Contacts: Hide preferred checkbox if only one property of the type (TEL/EMAIL/URL etc.) 2012-11-05 20:52:54 +01:00
Thomas Tanghus
3cdf82f7c1 Contacts: Let unload trigger beforeunload. 2012-11-05 20:45:08 +01:00
Thomas Tanghus
4f477dfa93 Merge branch 'master' of github.com:owncloud/apps into contacts_rework 2012-11-05 12:41:25 +01:00
Thomas Tanghus
851028b0ae Hide fileupload. 2012-11-05 12:40:50 +01:00
Thomas Tanghus
1588a6504d Cleanup add to/remove from groups. 2012-11-05 12:39:49 +01:00
Thomas Tanghus
c76abd593a Re-enable profile picture upload. 2012-11-05 12:39:12 +01:00
Thomas Tanghus
10d7fbdb92 Add missing upload iframe. 2012-11-05 12:37:05 +01:00
Robin Appelman
6d0e568cf8 merge master into filesystem 2012-11-04 21:08:15 +01:00
Robin Appelman
72ba9734b6 Merge branch 'master' into gallery 2012-11-04 21:05:40 +01:00
Jenkins for ownCloud
8a5f0ae5c5 [tx-robot] updated from transifex 2012-11-03 00:02:23 +01:00
Jan-Christoph Borchardt
8c3deaa39f Merge branch 'master' into navigation 2012-11-01 16:57:35 +01:00
Robin Appelman
b1dffd0063 Merge branch 'master' into gallery 2012-11-01 16:45:23 +01:00
Robin Appelman
4f2fe3282b Merge branch 'master' into filesystem 2012-11-01 16:45:10 +01:00
Thomas Tanghus
358721f249 Merge branch 'master' of github.com:owncloud/apps into contacts_rework 
Conflicts:
	contacts/js/contacts.js
 2012-11-01 15:34:57 +01:00
Thomas Tanghus
501ec1052d app:contacts: Add/remove multiple contacts to/from group. 2012-11-01 15:31:58 +01:00
Thomas Tanghus
71e247f097 Namespace fix. 2012-11-01 15:31:36 +01:00
Thomas Tanghus
307409b7e2 Open contact from search without reloading app. 2012-11-01 02:01:00 +01:00
Thomas Tanghus
09843741e3 Fix namespace error. 2012-11-01 02:00:29 +01:00
Thomas Tanghus
27fd043e4f Contacts: Also show address when adding it. Fixes issue #96. 2012-11-01 00:38:41 +01:00
Jenkins for ownCloud
30a6061a7e [tx-robot] updated from transifex 2012-11-01 00:03:46 +01:00
Thomas Tanghus
7383915904 Added more error checking to db queries. 2012-10-31 21:37:49 +01:00
Thomas Tanghus
7ccaa51361 Merge branch 'master' of github.com:owncloud/apps into contacts_rework 
Conflicts:
	contacts/appinfo/app.php
 2012-10-31 16:14:37 +01:00
Robin Appelman
d717b8e8b9 Merge branch 'master' into filesystem 2012-10-30 23:00:10 +01:00
Robin Appelman
6df32185b9 Merge branch 'master' into gallery 2012-10-30 22:46:51 +01:00
Thomas Tanghus
a96fea3541 VCF export plugin now included in SabreDAV. 2012-10-30 08:49:24 +01:00
Thomas Tanghus
8c3ed1d894 Correct app include path. 2012-10-30 07:25:28 +01:00
Thomas Tanghus
ec86736336 Merge branch 'master' of github.com:owncloud/apps into contacts_rework 
Fix conflicts:
	contacts/ajax/contact/saveproperty.php
	contacts/js/contacts.js
	contacts/lib/hooks.php
	contacts/lib/search.php
	contacts/lib/vcard.php
 2012-10-30 07:19:56 +01:00
Thomas Tanghus
db8175bb3d Use local namespace. 2012-10-30 07:08:41 +01:00
Thomas Tanghus
ef893ce9c7 Move unused variable. 2012-10-30 07:08:00 +01:00
Thomas Tanghus
d98861d841 Change variable name. 2012-10-30 07:07:30 +01:00
Thomas Tanghus
93db2ca723 Add some docs and reminders. 2012-10-30 07:06:37 +01:00
Thomas Tanghus
efb1db1788 Remove not needed method. 2012-10-30 07:05:27 +01:00
Thomas Tanghus
812a966b42 Improvements on callback functions. 2012-10-30 07:03:09 +01:00
Jenkins for ownCloud
49d1c3b059 [tx-robot] updated from transifex 2012-10-30 00:03:08 +01:00
Robin Appelman
019fef640a merge master into gallery 2012-10-28 12:58:16 +01:00
Robin Appelman
3b0ce012d7 Revert "[tx-robot] updated from transifex" due to merge conflicts 
This reverts commit a468d47dfb2ca740e25edfac3b11a6ea21ee1546.
 2012-10-28 12:53:13 +01:00
Robin Appelman
1e92a928fc Merge branch 'master' into filesystem 2012-10-28 10:29:03 +01:00
Jenkins for ownCloud
f353a19ab9 [tx-robot] updated from transifex 2012-10-28 00:02:30 +02:00
Robin Appelman
0eeab1c036 Merge branch 'master' into filesystem 2012-10-27 18:12:32 +02:00
Jan-Christoph Borchardt
617a622c95 first step to update icons for changes in core navigation, still needs sprited hover state 2012-10-27 17:46:14 +02:00
Bart Visscher
c2d29f20f7 Merge remote-tracking branch 'git://github.com/susinths/apps' 
Conflicts:
	calendar/ajax/event/edit.form.php
	calendar/lib/object.php
 2012-10-27 16:36:06 +02:00
Robin Appelman
2d022b19b4 Merge branch 'master' into filesystem 2012-10-27 15:31:19 +02:00
Bart Visscher
d696522f3a Merge branch 'routing' 2012-10-27 15:07:15 +02:00