rooty/OwncloudContactsOfficial
1
0
Fork 0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-12-13 23:49:04 +01:00
Code Issues Releases Activity
2,806 Commits 18 Branches 95 Tags 40 MiB
6de5415f22
Commit Graph

2806 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Tanghus
d16ea83f24 Try to align and float contact parts better. 2012-08-21 00:20:18 +02:00
Michael Gapczynski
d80d66fe58 Merge branch 'share_api' 
Conflicts:
	apps/contacts/lib/vcard.php
	apps/files/index.php
	lib/files.php
 2012-08-19 22:29:01 -04:00
Jenkins for ownCloud
d371458cac [tx-robot] updated from transifex 2012-08-20 02:03:51 +02:00
Jenkins for ownCloud
d34176be97 [tx-robot] updated from transifex 2012-08-20 02:01:32 +02:00
Thomas Tanghus
6f33954ca7 Removed stray img element. 2012-08-19 17:05:45 +02:00
Thomas Tanghus
2e6a8b4ba1 Strip slashes from commas and semi-colons. 2012-08-19 16:32:32 +02:00
Lukas Reschke
4a219e7baa Optimized image size 2012-08-18 13:56:04 +02:00
Jenkins for ownCloud
e8f3f62c05 [tx-robot] updated from transifex 2012-08-18 02:04:07 +02:00
Jenkins for ownCloud
d76edf6330 [tx-robot] updated from transifex 2012-08-17 00:45:46 +02:00
Jenkins for ownCloud
95183b5819 [tx-robot] updated from transifex 2012-08-16 02:09:15 +02:00
Thomas Tanghus
1d9d5e64e9 Merge addressbooks. 2012-08-16 00:25:32 +02:00
Jenkins for ownCloud
294f675bcb [tx-robot] updated from transifex 2012-08-15 02:07:20 +02:00
Thomas Tanghus
cada857f16 Use correct class. 2012-08-14 20:06:45 +02:00
Lukas Reschke
95b72311f5 Disable user enumeration 2012-08-14 17:23:26 +02:00
Michael Gapczynski
839b873656 Merge branch 'master' into share_api 
Conflicts:
	lib/group.php
	lib/group/backend.php
	lib/group/database.php
	lib/group/interface.php
	lib/public/user.php
	lib/user.php
	lib/user/backend.php
	lib/user/database.php
	lib/user/interface.php
 2012-08-14 10:22:13 -04:00
Jenkins for ownCloud
b8e3ec55e7 [tx-robot] updated from transifex 2012-08-13 23:19:31 +02:00
Thomas Tanghus
e805d90f21 Automatically check radio when new addressbook fields get focus. 2012-08-13 15:07:15 +02:00
Bart Visscher
db14482378 Change image links to use imagePath function 2012-08-12 22:30:13 +02:00
Thomas Tanghus
7ebe70e85c Readded refresh param. 304 and ETag is still sent so shouldn't matter. 2012-08-12 17:30:09 +02:00
Jenkins for ownCloud
d108d6d545 [tx-robot] updated from transifex 2012-08-12 02:04:58 +02:00
Jenkins for ownCloud
1e7d3c75f2 [tx-robot] updated from transifex 2012-08-11 02:05:58 +02:00
Lukas Reschke
95f9fa0dce Following the code guidelines makes Michael happy :-) 2012-08-10 22:20:32 +02:00
Lukas Reschke
8a1cbaa014 Disable listening, instead checking the ACL to prevent DoS 2012-08-10 22:18:08 +02:00
Lukas Reschke
f3edf2799c Activate ACLs 2012-08-10 22:02:04 +02:00
Bart Visscher
8679aa2699 Contacts: Check format parameter 2012-08-10 14:40:43 +02:00
Bart Visscher
fe8bae5b1e Contacts: Better parameter names in addressbook share backend 2012-08-10 14:32:54 +02:00
Thomas Tanghus
90f4e3e40e Used wrong class. 2012-08-10 01:39:05 +02:00
Thomas Tanghus
f53a65ef3a Fixed 3 - THREE - errors in one method call :-P 2012-08-09 23:16:07 +02:00
Michael Gapczynski
e2c3489e79 Additional permission checks for editing and deleting contacts 2012-08-09 13:54:59 -04:00
Michael Gapczynski
a1ac3767ce Merge branch 'master' into share_api 
Conflicts:
	apps/contacts/lib/vcard.php
	apps/files_sharing/sharedstorage.php
 2012-08-09 11:38:22 -04:00
Thomas Tanghus
4ed4ef96cd Change parameter name and update docs. 2012-08-09 17:04:14 +02:00
Thomas Tanghus
696a330c37 Another take at profile photo/thumbnail caching. oc-839. 2012-08-09 16:32:05 +02:00
Thomas Tanghus
ad653dddc9 Fix require statements. Fix for oc-1460. 2012-08-09 11:35:14 +02:00
Michael Gapczynski
14d67ba771 Start adding permission checks for addressbooks 2012-08-08 21:43:02 -04:00
Michael Gapczynski
34fdb2306c Don't include shared addressbook if source not found 2012-08-08 19:12:59 -04:00
Jenkins for ownCloud
a4deaea7bb [tx-robot] updated from transifex 2012-08-07 02:07:50 +02:00
Thomas Tanghus
50a4e8ed8d Some UI improvements on the addressbooks settings. 2012-08-07 00:06:18 +02:00
Michael Gapczynski
9b2e8de621 Sharing backends for contacts and addressbooks 2012-08-06 16:11:03 -04:00
Michael Gapczynski
9fa545b2ec Load icons for addressbooks, fix statuses for types other than files 2012-08-06 15:24:08 -04:00
Michael Gapczynski
2b37dd1aa2 Add share action back into addressbook settings, bump up z-index of dropdown so the autocomplete list is visible 2012-08-06 15:09:01 -04:00
Michael Gapczynski
6db5e23c77 Merge branch 'master' into share_api 
Conflicts:
	apps/contacts/lib/app.php
	apps/contacts/templates/part.chooseaddressbook.rowfields.php
 2012-08-06 13:49:54 -04:00
Michael Gapczynski
693b496fdd Lots of refactoring to share API 2012-08-06 11:27:13 -04:00
Jenkins for ownCloud
9cb83cf2af [tx-robot] updated from transifex 2012-08-06 02:02:50 +02:00
Thomas Tanghus
3996dfa330 Correct path to ajax file. 2012-08-05 03:36:16 +02:00
Jenkins for ownCloud
c106e0e91d [tx-robot] updated from transifex 2012-08-04 02:04:21 +02:00
Thomas Tanghus
e59775c602 Reorganize ajax scripts. 2012-08-03 21:32:27 +02:00
Thomas Tanghus
1d094c2631 Some fixes for keyboard shortcuts. 2012-08-03 21:32:27 +02:00
Thomas Tanghus
9553dc0da3 FF complained about missing charset. 2012-08-03 21:32:27 +02:00
Thomas Tanghus
3877804669 White space. 2012-08-03 21:32:27 +02:00
Thomas Tanghus
76f36ed875 Revert "Removed text/plain header." 
This reverts commit fa6d26b53c020940e38f632940f73dbbb56f6847.
 2012-08-03 21:32:27 +02:00