wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5534 commits 157 branches 562 tags 714 MiB
Commit graph

61 commits

Author SHA1 Message Date
Thomas Tanghus
7fff386679 Code style. 2012-07-20 17:11:13 +02:00
Thomas Tanghus
eba4f08015 Refactored contacts import. 2012-07-15 04:17:30 +02:00
Michael Gapczynski
f496a9dea6 Rename $contacts to $has_contacts, it missed this commit: 7cb74a0 2012-07-11 20:29:59 -04:00
Thomas Tanghus
34ac2ea1ba Don't escape assigned values. 2012-07-10 01:24:40 +02:00
Thomas Tanghus
7cb74a0bf3 Reduce variables assigned. 2012-07-10 01:24:40 +02:00
Jörn Friedrich Dreyer
e59a1806cf remove superfluous ?> at the end of .php files (left out apps/*/templates) 2012-07-09 16:51:16 +02:00
Thomas Tanghus
d8b181cd84 Added error checking on all db queries. 2012-06-26 18:15:24 +02:00
Thomas Tanghus
ef93bf223a Try to conserve some memory. Should fix oc-1106 for master. 2012-06-25 17:26:44 +02:00
Thomas Tanghus
6642ef6a50 Fix string encoding probs. 2012-06-16 18:06:47 +02:00
Thomas Mueller
583dce5276 removing executable bit - again 2012-05-15 00:52:00 +02:00
Frank Karlitschek
1945cd6946 ported the oc_template class 2012-05-06 23:00:36 +02:00
Thomas Tanghus
248eae2d0f Contacts: Improve NOTE UI. Cleanup markup. 2012-05-04 15:47:55 +02:00
Frank Karlitschek
4fe90f62f4 port checkAppEnabled 2012-05-02 19:08:37 +02:00
Frank Karlitschek
2fe646dcec ported the oc_app calls 2012-05-02 00:50:26 +02:00
Frank Karlitschek
93b63cf375 ported the rest of the OC_Helper calls 2012-05-02 00:20:45 +02:00
Frank Karlitschek
31e32e3c10 ported checkLoggedIn and checkAdmin 2012-05-01 22:59:38 +02:00
Frank Karlitschek
1a2bbd2ee4 ported addSyript and other small stuff 2012-05-01 20:03:41 +02:00
Frank Karlitschek
70cea18cce ported getUser 2012-05-01 18:50:31 +02:00
Frank Karlitschek
e8ec999090 port to use the new public api 2012-05-01 09:49:22 +02:00
Thomas Tanghus
f6fefe9a36 Contacts: Ensure TYPE parameters on email aren't deleted on edit. They are still not shown in the UI. 
Remove an obsolute file and did some cleanup.
 2012-04-29 22:12:27 +02:00
Georg Ehrke
69ee0efc0b remove the require_once lib base from all (or nearly all) files 2012-04-17 19:31:29 +02:00
Thomas Tanghus
6aee6dae6b VCategories css is now in styles.css 2012-04-13 18:50:40 +02:00
Bart Visscher
86edc0da31 Contacts: add space before parameter 2012-04-12 23:10:49 +02:00
Bart Visscher
fa853102e4 Contacts: Move use of OC_Contacts_App::$categories to inside of OC_Contacts_App 
This is in preparation of making $categories protected and initialized
with default categories.
 2012-04-12 23:10:49 +02:00
Thomas Tanghus
b71cf1a4f9 Fix bug oc-413: PHP fatal error in contacts page when no contacts in ownCloud. 2012-04-07 16:03:43 +02:00
Thomas Tanghus
896bff5748 Contacts: rescan categories on load if there are none. 2012-04-03 03:29:12 +02:00
Thomas Tanghus
d36d317bb2 Contacts: Modifications for using categories. 2012-03-12 14:13:03 +01:00
Thomas Tanghus
a33a62bf60 Merge branch 'vcategories' of gitorious.org:owncloud/owncloud into vcategories 
Conflicts:
	apps/contacts/lib/vcard.php
	apps/contacts/templates/part.contact.php
 2012-03-08 02:55:48 +01:00
Bart Visscher
340320625e Contacts: Add UI for categories 2012-03-07 21:50:55 +01:00
Thomas Tanghus
75323b86d1 Contacts: UI updates and ajax methods for categories. 2012-03-07 16:39:56 +01:00
Bart Visscher
5f3c549227 Contacts: Add removed app enabled check 2012-02-17 22:07:14 +01:00
Thomas Tanghus
53503148f3 Use proper index file. 2012-02-14 01:47:18 +01:00
Thomas Tanghus
1697347045 Oops. Missing ')' :-P 2012-01-12 22:55:43 +01:00
Thomas Tanghus
e60860148c Don't chunk_split encoded image string. 
Don't return json error but null if card can't be parsed.
Small check for non-parsable card in index.php.
 2012-01-12 22:50:12 +01:00
Thomas Tanghus
1a6ad816a3 CSS cleanup, more error checking, better error messages, general cleanup. 2012-01-11 04:05:30 +01:00
Thomas Tanghus
604ca61d78 Some cleanup, better error messages and such. 2012-01-09 20:38:06 +01:00
Thomas Tanghus
47548fb8c6 Fixed showing first contact if non is selected. 2012-01-09 20:38:05 +01:00
Thomas Tanghus
d91a4fcaf3 Changed SQL queries for looking up contacts to only query once and sort at the same time. 2012-01-09 20:38:05 +01:00
Thomas Tanghus
4793d25c57 Added license and waiver of conditions for jquery.inview. 
CSS fix on contact list.
Query contacts from multiple address books.
 2011-12-30 21:07:16 +01:00
Bart Visscher
3e2e5196d2 Merge branch 'tanghus_remote_backup' of git://gitorious.org/~tanghus/owncloud/tanghus-owncloud 
Conflicts:
	apps/calendar/export.php
	apps/contacts/index.php
 2011-12-27 22:18:01 +01:00
Bart Visscher
dff9585f64 Contacts: add missing property_options template var 2011-12-18 23:10:43 +01:00
Thomas Tanghus
feeb0c742a Misc. changes after review by bartv. 2011-12-16 17:42:07 +01:00
Thomas Tanghus
c7b7758816 Updating of contact list when activating/adding/deleting address books now works. 2011-12-11 16:26:00 +01:00
Thomas Tanghus
5cb10548b3 Resolved conflict 2011-12-09 15:28:51 +01:00
Thomas Tanghus
7aa8eb3427 Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup 
Conflicts:
	apps/contacts/ajax/deletebook.php
	apps/contacts/index.php
 2011-12-09 15:25:26 +01:00
Thomas Tanghus
b3661adf02 Various fixes to multiple address books handling 2011-12-09 15:10:51 +01:00
Bart Visscher
1220edd4df Contacts: Add direct link to details of a contact 2011-12-07 20:40:59 +01:00
Bart Visscher
7e990a8e5c Contacts: refactor common ajax functions to OC_Contacts_App 2011-12-07 20:40:59 +01:00
Bart Visscher
247146f703 Contacts: refactor rendering of part.details template 2011-12-07 20:40:58 +01:00
Bart Visscher
c67ac46b6c Use a proxy class to interface with Sabre_VObject classes 2011-12-07 20:40:58 +01:00