rooty/OwncloudContactsOfficial
1
0
Fork 0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-11-29 11:24:11 +01:00
Code Issues Releases Activity
746 Commits 18 Branches 95 Tags 40 MiB
839b873656
Commit Graph

71 Commits

Author SHA1 Message Date
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
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
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
Michael Gapczynski
4e99280907 Preparing for proper collection implementation 2012-08-03 15:05:45 -04:00
Thomas Tanghus
0db696e8c0 Unregister from personal settings. 2012-07-31 12:23:22 +02:00
Michael Gapczynski
93556984f2 Merge branch 'master' into share_api 
Conflicts:
	apps/calendar/js/loader.js
	apps/contacts/index.php
	apps/contacts/js/loader.js
	apps/files/js/files.js
	apps/files_sharing/sharedstorage.php
	lib/filesystemview.php
 2012-07-25 17:08:18 -04:00
Thomas Tanghus
61ec1d43ea Code style. 2012-07-20 17:11:13 +02:00
Thomas Tanghus
fb64183060 Change uri fields from 100 to 200 chars. 2012-07-20 15:15:18 +02:00
Thomas Tanghus
bbbc4d8ed0 Wrong version comparison in update.php. 2012-07-17 03:59:41 +02:00
Robin Appelman
073fd83d3f fix remote and public.php 2012-07-13 22:44:35 +02:00
Michael Gapczynski
00ef91f830 Merge branch 'master' into share_api 
Conflicts:
	apps/contacts/lib/addressbook.php
	apps/files_sharing/js/share.js
	apps/files_sharing/sharedstorage.php
 2012-07-11 20:25:59 -04:00
Thomas Tanghus
8a616c79ec Implemented VCFExportPlugin. 2012-07-08 17:52:57 +02:00
Thomas Tanghus
bbd260b27b Correct db default value. 2012-07-05 00:40:11 +02:00
Thomas Tanghus
b389f57610 Missing update script. 2012-07-04 22:58:31 +02:00
Thomas Tanghus
7caf34aac1 Remove ugly activation hack. 2012-07-04 22:13:36 +02:00
Tom Needham
58059d1648 Updates contacts migration provider 2012-06-30 22:56:47 +00:00
Michael Gapczynski
bd87f17c20 Change registerBackend calls class argument to strings 2012-06-30 17:33:30 -04:00
Tom Needham
7c8d44dff0 Migration: Fix contacts and bookmarks 2012-06-27 21:18:31 +00:00
Bart Visscher
69771d2050 Basic framework for contacts sharing 2012-06-27 01:05:36 +02:00
Thomas Tanghus
7c26a86550 Added createUser hook. 2012-06-26 18:15:24 +02:00
Brice Maron
a7baf611f0 Change app path logic in templates 2012-06-06 20:24:16 +00:00
Bart Visscher
ce6a393ef9 Remove OC_App::register function 
The data supplied is never used in OwnCloud. Removed the call from all the apps, and made the public API function empty.
 2012-05-31 13:01:30 +02:00
Frank Karlitschek
ce2d4f154a mark the apps as part of the shipped package and increase the requirement to ownCloud 4 2012-05-18 16:06:57 +02:00
Georg Ehrke
9a952df278 add caldav and carddav files in their old place for backward compatibility - add rewriterule for caldav and carddav 2012-05-16 21:05:15 +02:00
Thomas Tanghus
3ec6c2ab26 Contacts: Corrected i18n call. 2012-05-15 18:49:38 +02:00
Thomas Mueller
39f99602bf removing executable bit - again 2012-05-15 00:52:00 +02:00
Robin Appelman
0f3de1ee41 selective app loading for remote/public 2012-05-14 00:28:28 +02:00
Robin Appelman
afbfa8b537 load remote and public paths from info.xml during upgrade instead of setting them every time 2012-05-11 20:33:56 +02:00
Georg Ehrke
922a1cbcaf improve remote.php and create public.php 2012-05-07 15:39:17 +02:00
Georg Ehrke
e5c2d088eb fix merge conflicts 2012-05-07 11:47:14 +02:00
Georg Ehrke
9732f20400 make carddav work with remote.php 2012-05-07 11:24:19 +02:00
Frank Karlitschek
86ae149567 added a nice API to get the installes Apps with names, urls and icon from the outside. 
This is useful for some nice upcoming desktop and mobile integration
 2012-05-05 23:42:38 +02:00
Georg Ehrke
7087845860 push changes 2012-05-05 22:54:14 +02:00
Georg Ehrke
1ff57997af fix writing in remote folder 2012-05-05 18:29:26 +02:00
Frank Karlitschek
9c92fa3630 porting the hooks and starting with the templates 2012-05-05 10:18:45 +02:00
Thomas Tanghus
5e481f2e27 Changed $APPROOT to $APPSROOT as in https://gitorious.org/owncloud/owncloud/merge_requests/116 2012-05-04 11:16:29 +02:00
Frank Karlitschek
3d62cf716a ported oc_db 2012-05-03 13:06:08 +02:00
Frank Karlitschek
9d7b02c9dc port checkAppEnabled 2012-05-02 19:08:37 +02:00
Frank Karlitschek
ed0d7b837d fix install 2012-05-02 19:02:41 +02:00
Georg Ehrke
2a19800392 create folder 'remote' for the remote services like caldav, carddav and webdav 2012-05-02 16:41:23 +02:00
Frank Karlitschek
b2f19f3a7f ported the oc_app calls 2012-05-02 00:50:26 +02:00
Frank Karlitschek
fe55806527 ported the rest of the OC_Helper calls 2012-05-02 00:20:45 +02:00
Frank Karlitschek
47b18a270e port linkto and serverHost 2012-05-01 23:19:39 +02:00
Frank Karlitschek
4cfcd1f8f5 ported addSyript and other small stuff 2012-05-01 20:03:41 +02:00
Jakob Sack
d1b0434d82 Remove useless, unmaintained dav.php 2012-04-15 16:50:44 +02:00
Bart Visscher
a2f39dec1d Contact: Don't use non core class in appinfo/app.php 2012-04-14 18:34:59 +02:00
Robin Appelman
085b7fc5f8 keep version numbers in their own files for faster reading 2012-04-14 16:29:11 +02:00