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

1085 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lukas Reschke
230a10c954 Fix another XSS 2012-09-29 16:13:42 +02:00
Lukas Reschke
55963432e6 Fix XSS 
See 1c766278bac06d9a8cc91ee5928d5f317771750c
 2012-09-29 16:13:37 +02:00
Jenkins for ownCloud
934b46e497 [tx-robot] updated from transifex 2012-09-29 02:08:53 +02:00
Bart Visscher
a4f5478d06 Merge branch 'master' into routing 
Conflicts:
	gallery/lib/tiles.php
 2012-09-28 21:43:48 +02:00
Jenkins for ownCloud
bba9e57ad2 [tx-robot] updated from transifex 2012-09-28 02:08:20 +02:00
Jenkins for ownCloud
168be09747 [tx-robot] updated from transifex 2012-09-27 02:04:37 +02:00
Jenkins for ownCloud
546fe328e5 [tx-robot] updated from transifex 2012-09-26 13:27:02 +02:00
raghu
79b8a27ba0 A Polyfill for Placeholders added to the contacts_rework branch 2012-09-25 16:39:32 +05:30
Jenkins for ownCloud
0aec65e5e7 [tx-robot] updated from transifex 2012-09-24 02:05:00 +02:00
Jenkins for ownCloud
5aba072881 [tx-robot] updated from transifex 2012-09-22 02:05:30 +02:00
Jenkins for ownCloud
b4e2b32d61 [tx-robot] updated from transifex 2012-09-20 02:12:48 +02:00
Jenkins for ownCloud
2308a4b69f [tx-robot] updated from transifex 2012-09-19 02:07:43 +02:00
Jenkins for ownCloud
cd94a72dde [tx-robot] updated from transifex 2012-09-18 02:03:55 +02:00
Jenkins for ownCloud
2f80fc751d [tx-robot] updated from transifex 2012-09-17 17:01:13 +02:00
Thomas Tanghus
6b77479899 First work on new Contacts js and group based UI. 2012-09-17 16:15:31 +02:00
Thomas Tanghus
993c8f36f1 Missed one 'contacts' => 'contact' update. 2012-09-17 02:17:41 +02:00
Thomas Tanghus
11d9539a29 Merge branch 'vcategories_db' into contacts_rework 2012-09-17 02:05:58 +02:00
Thomas Tanghus
99cac70666 Merge branch 'master' of github.com:owncloud/apps into contacts_rework 2012-09-17 02:05:31 +02:00
Thomas Tanghus
fc62459aa2 Merge branch 'master' of github.com:owncloud/apps into vcategories_db 2012-09-17 02:05:08 +02:00
Thomas Tanghus
9571e4077c Use types (event/contact) instead of app names for vcategories. Also purge category/object relations on object deletion. 2012-09-17 02:03:28 +02:00
Thomas Tanghus
b15dfbba0d Don't open multiple eamil composers on click. 2012-09-16 18:53:26 +02:00
Thomas Tanghus
a31f47405a Merge branch 'master' of github.com:owncloud/apps into contacts_rework 2012-09-16 14:23:13 +02:00
Thomas Tanghus
dd42d05ac6 Merge branch 'master' of github.com:owncloud/apps into vcategories_db 2012-09-16 14:19:59 +02:00
Thomas Tanghus
0d3d1593c1 Removed context menu test. 2012-09-16 14:13:22 +02:00
Thomas Tanghus
a80604e0e8 Merge branch 'master' of github.com:owncloud/apps into contacts_rework 2012-09-16 14:07:18 +02:00
Jenkins for ownCloud
cc466a5a76 [tx-robot] updated from transifex 2012-09-15 02:07:46 +02:00
Thomas Tanghus
b0b25c043d Merge branch 'master' of github.com:owncloud/apps into vcategories_db 2012-09-13 18:17:58 +02:00
Thomas Tanghus
2fc7f0f12c Merge branch 'master' of github.com:owncloud/apps into contacts_rework 2012-09-13 02:15:14 +02:00
Thomas Tanghus
2d5d1e1c5c Mark newly added contact as active. oc-1694. 2012-09-13 02:10:15 +02:00
Thomas Tanghus
6dabd60e5a Merge branch 'master' of github.com:owncloud/apps into contacts_rework 2012-09-12 23:01:49 +02:00
Thomas Tanghus
3992402f1a Removed debug statement. 2012-09-12 21:19:15 +02:00
Thomas Tanghus
740995ced3 Use category format const. 2012-09-11 15:33:09 +02:00
Thomas Tanghus
4e470cb2bf Merge branch 'master' of github.com:owncloud/apps into vcategories_db 2012-09-11 14:21:01 +02:00
Thomas Tanghus
fbfe8aab45 Transitional filter-by-category design take 1. 2012-09-11 14:19:28 +02:00
Jenkins for ownCloud
25e2ed9d56 [tx-robot] updated from transifex 2012-09-11 02:07:59 +02:00
Jenkins for ownCloud
26f8359f28 [tx-robot] updated from transifex 2012-09-10 02:06:30 +02:00
Thomas Tanghus
c7ccfb9b4a Don't look up permissions from list. 2012-09-09 18:51:22 +02:00
Thomas Tanghus
818ddc1d13 And spell permissions correctly ;) 2012-09-09 18:48:28 +02:00
Thomas Tanghus
d321fe1549 Get permissions when loading contact. 2012-09-09 18:43:46 +02:00
Michael Gapczynski
475de65901 Update getChildren() for calendar and addressbook share backends 2012-09-08 23:11:40 -04:00
Jenkins for ownCloud
5005796479 [tx-robot] updated from transifex 2012-09-09 02:05:19 +02:00
Thomas Tanghus
0b42a3fb83 Edit dialog remained if you deleted an address book while editing it. oc-1657 2012-09-08 03:59:35 +02:00
Thomas Tanghus
c4c6323432 Addressbook selection didn't show if there was only one. 2012-09-08 03:50:38 +02:00
Jenkins for ownCloud
427494c428 [tx-robot] updated from transifex 2012-09-08 02:07:51 +02:00
Bart Visscher
d31248007e Merge branch 'master' into routing 
Conflicts:
	gallery/lib/tiles.php
 2012-09-07 15:45:35 +02:00
Thomas Mueller
089b7e8f8a adding space between) and { 2012-09-07 15:21:03 +02:00
Bart Visscher
b179feeea2 Fix whitespace in contacts 2012-09-07 14:32:45 +02:00
Bart Visscher
0986558df2 Remove empty lines at end of file 2012-09-07 14:25:28 +02:00
Bart Visscher
739c86b734 Remove php close tag from end of file. 
See also http://stackoverflow.com/questions/4410704/php-closing-tag
 2012-09-07 14:24:56 +02:00
Jenkins for ownCloud
4f919e91f3 [tx-robot] updated from transifex 2012-09-07 02:10:31 +02:00