Commit graph

564 commits

Author SHA1 Message Date
Michael Vogel
82820d8e95 Now the third most likely languages are shown.
In "vier" the tag line is now suppressed. It saves a little bit of space - and is redundant.
2013-01-09 20:54:18 +01:00
friendica
4ab363ed71 bypass smarty wherever using intltext_templates (install, register, friend confirmation emails, etc.) 2013-01-07 20:14:00 -08:00
friendica
07ba4da634 email header encoding everywhere 2013-01-04 15:47:29 -08:00
Zach Prezkuta
e684324032 use explicit include paths 2012-12-28 14:51:50 -07:00
Michael Vogel
99ca867869 The performance settings and other systems settings (lock file path, temp path) can now be set via the front end. 2012-12-21 18:23:55 +01:00
Michael Vogel
7c7d3fe5de "share" - now the attribut value for the "author" is escaped 2012-12-21 02:10:26 +01:00
Michael Vogel
f4bc5c57f3 New option to enable and disable the "share" element
Changes to "vier" to use more "font awesome" icons
2012-12-21 00:08:58 +01:00
Michael Vogel
a86baa372a Mailimport is now realized like a wall-to-wall-post 2012-12-19 15:58:38 +01:00
Michael Vogel
c22f65bafa repeated items from ostatus and diaspora are now using the share-element.
Some design changes to repeated items in "vier".
2012-12-19 12:18:52 +01:00
friendica
226d1ba7c1 Merge pull request #537 from fermionic/20121121-features
Port Features from Red
2012-11-22 20:54:16 -08:00
Zach Prezkuta
94204d9160 implement features 2012-11-22 09:14:22 -07:00
friendica
9835efc9e4 fix jenkins tests 2012-11-22 05:06:15 -08:00
Michael Vogel
4196b6a96c Merge remote-tracking branch 'upstream/master' 2012-11-08 21:44:17 +01:00
friendica
776552226b Merge https://github.com/friendica/friendica into pull 2012-11-06 01:10:36 -08:00
friendica
fd4d35b16c set writable for ostatus followers 2012-11-06 01:10:12 -08:00
Fabrixxm
5b4944fe8e Merge remote-tracking branch 'remotes/friendica/master' into moveme 2012-11-05 09:37:58 +01:00
Michael
2b6498b2a2 Merge remote-tracking branch 'upstream/master' 2012-11-03 22:27:34 +01:00
Zach Prezkuta
6effdd570c add a confirm dialog and a busy rotator for delete selected 2012-11-01 17:42:40 -06:00
Fabrixxm
1a3a5ee8d9 moveme: first successful relocated user 2012-10-31 17:13:45 +01:00
Fabrixxm
dbc6cbe024 moveme: send and receive DFRN "relocate" message (WIP) 2012-10-29 17:50:55 +01:00
friendica
02251f23df undefined fn: init_groups_visitor in mod_profile, rev update 2012-10-21 14:41:10 -07:00
Michael Vogel
ea6ced8359 Merge remote branch 'upstream/master' 2012-09-29 08:35:17 +02:00
friendica
25773b41cb add "tagged" hook (bots and such) 2012-09-26 18:24:19 -07:00
Michael Vogel
4c389eb73b Merge remote branch 'upstream/master' 2012-09-20 08:32:33 +02:00
friendica
f4e3f335ef don't allow followers to get a post through unless it's a tag deliver 2012-09-12 18:53:20 -07:00
friendica
db09724aec use local photo for tag notifications if available 2012-09-12 17:19:26 -07:00
Michael Vogel
5cfb068c25 Merge remote branch 'upstream/master' 2012-09-10 23:28:07 +02:00
Domovoy
bb68461c6d Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
Conflicts:
	include/conversation.php
2012-09-10 09:19:08 +02:00
friendica
5c0f0df59a provide local_block - block_public as far as content but can connect with the grid. 2012-09-06 20:17:50 -07:00
friendica
4cd8233f61 remote_user can now support multiple contacts being logged in at once 2012-09-04 22:50:28 -07:00
Michael Vogel
f6818ab243 Merge remote branch 'upstream/master' 2012-09-02 17:50:25 +02:00
Michael Vogel
3c24a7ed3e items: added some logging infos 2012-09-02 17:49:06 +02:00
Domovoy
17f9fcaec9 Checks done on topmost parent in local_delivery, closes #10 2012-08-18 17:17:33 +02:00
Michael Vogel
d40f25ae08 bbcode: Function for cleaning CSS commands (not yet in function)
items.php: The detection if a rss/atom-title is identically to the body is improved.
2012-08-17 07:59:21 +02:00
friendica
68d7a3ae01 put a variant of the parent_uri into email notification message-ids. Current message-ids aren't completel legal. More work to do. 2012-08-15 17:14:29 -07:00
friendica
bfec28f1fe threading messed up a bit of cross-site federation code 2012-08-12 18:42:43 -07:00
Zach Prezkuta
009ebc732a move tag transformation to bb2diaspora; start taking out unnecessary signature stuff 2012-08-10 08:13:17 -06:00
Domovoy
f3b1391501 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-08-07 09:40:21 +02:00
friendica
5d7f9d3b4b rev update 2012-08-05 21:43:20 -07:00
Domovoy
e247915f48 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
Conflicts:
	include/conversation.php
2012-08-05 13:43:53 +02:00
Domovoy
5d1eb37b9b Remote items should be threaded now 2012-08-05 13:30:51 +02:00
friendica
9732f1fccf expire issue 2012-08-04 23:29:52 -07:00
friendica
0c67649c08 put back notags 2012-08-03 18:36:45 -07:00
friendica
621e737826 fix angle char storage and transmission, rev update 2012-08-03 18:33:11 -07:00
friendica
982625db9c update contact photos and names in local delivery - not just polled feeds 2012-07-23 20:00:00 -07:00
friendica
a54278649f poke notifications 2012-07-19 20:13:40 -07:00
Michael Vogel
7aa10d1935 Merge remote branch 'upstream/master' 2012-07-15 17:26:00 +02:00
Michael Vogel
8d7d46ae7a Bugfix: multiple linefeeds were generated when items where written in the editor. The existing fix didn't really work 2012-07-14 19:54:27 +02:00
Michael Vogel
72f430ae58 parse_url: Problem when resizing images 2012-07-14 13:59:42 +02:00
friendica
8b6942c572 don't use language detection if < php 5.3 2012-07-13 15:38:02 -07:00
Michael Vogel
bfca7f47ef Merge remote branch 'upstream/master'
Conflicts:
	include/bb2diaspora.php
2012-07-13 23:39:51 +02:00
Michael Vogel
5f400c4a97 API: Now returns a real 404 when a function isn't implemented
parse_url: Image handling improved
2012-07-13 23:23:31 +02:00
Zach Prezkuta
f92338d79b make likes on comments work with Diaspora, some small bugs 2012-07-12 23:14:39 -06:00
friendica
9a299920eb language detection - result is stored in item['postopts'] 2012-07-11 22:45:14 -07:00
Zach Prezkuta
fc6f7daf38 small cleanup 2012-07-10 19:28:38 -06:00
Zach Prezkuta
c8378260bc check for posted dates based on month only 2012-07-08 08:46:46 -06:00
Zach Prezkuta
6d10374c17 cleanup 2012-07-07 18:50:46 -06:00
Zach Prezkuta
da2ccebed8 fix bugs 2012-07-07 18:50:33 -06:00
Zach Prezkuta
173b3a1b9a allow more than one embedded private photo 2012-07-07 16:24:20 -06:00
Zach Prezkuta
57635e7684 add function to exclude embedded images when checking message length 2012-07-07 16:24:20 -06:00
Zach Prezkuta
5395cf5bd9 clear title and body of items on local delete 2012-07-05 20:07:01 -06:00
Michael Vogel
dafc84390d Improvments of the HTML to make a better bb2markdown conversion (nested lists, youtube, vimeo, ...) 2012-07-05 23:36:00 +02:00
Michael Vogel
bcca817b9a Removing of the title if it is the same (or part) from the body. Helps against auto generated titles from tumblr. 2012-06-30 09:25:22 +02:00
Michael Vogel
65268d25e6 Merge remote branch 'upstream/master'
Conflicts:
	include/items.php
2012-06-29 21:43:49 +02:00
Michael Vogel
52569e536e Tests considering removing of the title 2012-06-29 21:40:54 +02:00
friendica
43036bee98 wrong column name (- vs _) 2012-06-28 21:32:49 -07:00
friendica
1830ecc9ba remote_self feeds are not private 2012-06-28 18:52:49 -07:00
friendica
a3edbf7e5d create third privacy state - public post but not searchable or publicly visible 2012-06-28 17:43:29 -07:00
friendica
de93c61e0d remove titles in ostatus even when edited date differs from created date 2012-06-28 16:04:00 -07:00
friendica
d32d0e2154 typos 2012-06-25 21:39:07 -07:00
friendica
78ede4744f add event titles to discovered birthday events 2012-06-25 21:37:38 -07:00
friendica
53f0aee82d Merge https://github.com/friendica/friendica into pull 2012-06-25 18:16:55 -07:00
friendica
f1991a5952 propagate remote deletes 2012-06-25 18:15:56 -07:00
Zach Prezkuta
5773241537 add some debug logging 2012-06-25 19:03:03 -06:00
Zach Prezkuta
c0c50ece0f revert extra Diaspora disabling changes to try to eliminate Mustard double-posting 2012-06-25 19:03:03 -06:00
Zach Prezkuta
8bb7ab88fb Clean up the Diaspora connectivity:
- Move Diaspora code into separate functions to make it more modular
- Create more checks for whether Diaspora connectivity has been enabled
2012-06-25 19:03:03 -06:00
friendica
f0b41709eb improve remote delete forwarding 2012-06-25 17:45:33 -07:00
friendica
1574396d04 sort out some "like" issues 2012-06-23 21:11:18 -07:00
friendica
63141c73d8 debugging 2012-06-23 07:26:45 -07:00
friendica
a132eda2cf cokmment likes not propagating 2012-06-23 06:41:37 -07:00
friendica
1ba0d73a9a make feeds work with comment likes/dislikes 2012-06-23 06:13:11 -07:00
friendica
f55e8e831c typo 2012-06-23 06:04:56 -07:00
friendica
bf0ab10caf undefined unmark_for_death 2012-06-20 16:35:49 -07:00
friendica
f0db196288 iframes were getting stripped at the rss/atom parser level. We can preserve these because we will strip them in the purifier after checking for supported video sources 2012-06-20 05:04:51 -07:00
friendica
b3bf48782f allow dfrn_deliver to undo a mark_for_death just in case the poller is consistently getting killed. 2012-06-19 20:59:22 -07:00
friendica
341a5a2672 public forum author using private posting, correct the comment permissions downstream. 2012-06-18 17:19:56 -07:00
friendica
edeca6d815 remove php version restriction on archive widget 2012-06-13 20:59:19 -07:00
friendica
d908c9dd71 disable archive widget for PHP < 5.3 2012-06-13 16:17:45 -07:00
friendica
a424fecdae this should catch any weirdness caused by being in different timezones and making your first post on the 31st of March 2012-06-12 22:52:34 -07:00
friendica
bbdb8751e5 that was it 2012-06-12 21:39:39 -07:00
friendica
82ad881c85 think this will fix it 2012-06-12 21:38:10 -07:00
friendica
d955813f22 tracking another edge case 2012-06-12 21:34:28 -07:00
friendica
08af43f396 edge case 2012-06-12 21:30:17 -07:00
friendica
920ea2e1c7 archive widget 2012-06-12 20:46:30 -07:00
friendica
1dd52c20cf move parens to proper place 2012-06-12 02:47:05 -07:00
friendica
645c2f9092 Merge pull request #331 from mexon/upstream
Add a hook for post-processing remote items
2012-06-12 00:52:36 -07:00
Matthew Exon
33a4e45f6b Add a hook for post-processing remote items after they've been stored in the database and have an ID 2012-06-12 07:58:12 +02:00
friendica
b7e2f802d8 revert an optimisation that was wrong 2012-06-11 21:50:10 -07:00
friendica
75104416e0 reduce reverted edits due to edit arriving before original 2012-06-11 18:14:49 -07:00
friendica
afa8815411 bug #447 - make followed feeds private 2012-06-11 05:28:08 -07:00
friendica
da7773a259 ostatus hub subscription issues 2012-06-07 19:53:39 -07:00
friendica
ba2452a076 png support for embedded private photos 2012-06-07 16:02:56 -07:00
Fabio Comuni
7cc8c369cb Add support for PNG images with alpha 2012-06-07 17:42:13 +02:00
friendica
6477c24919 more logging on subscribe_to_hub 2012-06-06 23:10:32 -07:00
Zach Prezkuta
9920fb39e5 Debugged implementation of Diaspora relayable_retractions
Diaspora "relayable_retraction" is now supported by Friendica.
The following should now work:

	Friendica top-level post:
	Diaspora comment deleted, disappears in Friendica
	Friendica comment deleted, disappears in Diaspora
	Diaspora like retracted, disappears in Friendica
	Friendica like retracted, disappears in Diaspora

	Diaspora top-level post:
	Same

There are still exceptions, however. First, Friendica and Diaspora
seem to frequently reject comments with an "invalid signature" error.
This can probably be fixed.

Also, some comments/likes/retractions seem to just disappear on the
Diaspora side. In the Diaspora log these seem to be accompanied by a
"not a valid object" error, often preceeded by a "received a comment
but no corresponding post" error. These seem to be purely internal,
since sometimes it works for some Diaspora contacts but not others.
2012-06-03 14:53:30 -06:00
Zach Prezkuta
cde0de965f first shot at getting like/unlike functions to work consistently 2012-06-03 14:53:30 -06:00
Zach Prezkuta
77962aa79d Fix bugs in the retraction code
Currently, the following seems to be the functional status:
	For a Diaspora top-level post:
		Friendica comments show up AND delete
		Diaspora comments show up AND delete for top-level owner
		Diaspora comments show up for non-owner
		Diaspora comments sometimes don't delete for non-owner
			-> Appears to be Diaspora's fault, as a "not a valid object" error shows up in the log

		Friendica likes show up, but can't unlike (Friendica doesn't even message Diaspora)
		Diaspora likes show up
		Diaspora non-owner can't unlike
			-> Same as comments, seems to be Diaspora's fault

	For a Friendica top-level post:
		Friendica comments show up AND delete
		Diaspora comments show up AND delete

		Friendica likes don't show up in Diaspora sometimes
		Friendica doesn't even message Diaspora for unlikes (sometimes?)
		Diaspora likes and unlikes work
2012-06-03 14:53:30 -06:00
Zach Prezkuta
c0af6dbb1a Implement relaying of relayable_retractions
Also: some whitespace cleanup, fix Diaspora parent DB query
2012-06-03 14:53:29 -06:00
friendica
f0cf0ebb48 prevent email from leaking in feeds 2012-05-30 19:11:01 -07:00
friendica
e5a988f0b5 fix private photos that also have a size specification 2012-05-30 01:52:58 -07:00
friendica
88a0d6a1d5 private group tests, cont. 2012-05-29 22:57:15 -07:00
friendica
419cf91aae bugfixes: private photo embeds and search for strings with % 2012-05-29 16:44:02 -07:00
friendica
2eafa9a475 ability to only expire contacts, not self 2012-05-29 01:14:53 -07:00
friendica
0241bd1fbf Provide backend option to only expire other peoples' conversations. 2012-05-28 23:24:10 -07:00
friendica
f033c9a4ae rev update 2012-05-28 16:51:52 -07:00
friendica
2bd1004587 rework the way private photos are embedded to avoid url differences and also check the permissions if possible to make sure that nothing sneaks by. 2012-05-27 21:01:58 -07:00
friendica
3ce06caeed cause of bogus wall-to-wall posts found 2012-05-22 03:55:11 -07:00
friendica
7b0ded3f14 more private forums, default privacy group for new contacts 2012-05-17 22:44:52 -07:00
friendica
7cfa7a7671 tell browser not to cache permission denied (private) photos so that after authenticating we don't have to fight the browser - plus more prvgroup work 2012-05-17 19:59:46 -07:00
friendica
d5d853f37f setup delivery chain for private groups (work in progress) 2012-05-17 19:35:24 -07:00
friendica
20229ce187 better test of email reply visibility 2012-05-11 05:11:53 -07:00
friendica
8c26640835 reset permissions to forum default when adding forum delivery chain 2012-05-06 23:06:21 -07:00
friendica
8ae83201cf consolidate item deletion so we can fix orphaned categories and file_as tags. 2012-05-05 07:05:32 -07:00
friendica
da555286d6 missed a db field 2012-04-29 22:36:26 -07:00
friendica
928faf3b97 typo in profile_selectors, fix remote tagging 2012-04-29 22:34:05 -07:00
friendica
2170df897b bug #388 - notify_comment received after post deleted 2012-04-22 19:19:02 -07:00
Tobias Hößl
e3af818263 Typo 2012-04-17 19:31:06 +00:00
Tobias Hößl
720c8324c7 Some Bugfixes, and variable checks 2012-04-17 11:33:50 +00:00
friendica
0b838e4cc7 propagate edited comments 2012-04-16 02:09:00 -07:00
friendica
c8598e7da6 edited comments weren't being relayed 2012-04-16 01:35:27 -07:00
friendica
9dd0ef2aeb bug #372 - category feeds 2012-04-14 04:19:41 -07:00
friendica
5a78400f37 table cleanup 2012-04-12 05:15:45 -07:00
friendica
19b636e7e8 more backend work on mail2 followers 2012-04-10 19:15:52 -07:00
Alexander Kampmann
355c42cb30 Merge branch 'master' of https://github.com/friendica/friendica
Conflicts:
	include/config.php
	update.php
2012-04-05 13:39:15 +02:00
friendica
00bbb9ad36 slight improvement in handling of plaintext feeds 2012-04-01 15:43:57 -07:00
friendica
9b4bef8ac4 that didn't quite work out 2012-04-01 06:46:12 -07:00
friendica
f0b8d01615 try slightly better detection of html in feeds 2012-04-01 03:19:37 -07:00
friendica
7956c2d08e improved rw notifications 2012-03-28 17:21:56 -07:00
friendica
20f9733250 don't expire filed items 2012-03-27 00:54:34 -07:00
friendica
b5d0315d55 preparation for some possibly killer features 2012-03-26 17:57:27 -07:00
friendica
3ae43c2448 prevent duplicate friend suggestions 2012-03-24 15:53:53 -07:00
friendica
3aacc119a1 block filed items from deletion 2012-03-24 04:16:27 -07:00
friendica
528d795fb6 ability to change tags in edited posts 2012-03-22 16:17:10 -07:00
friendica
cca524495c community discovery cont., cleanup of DB debugging 2012-03-18 22:12:36 -07:00
friendica
805087af67 whitespace 2012-03-16 05:41:29 -07:00
friendica
7684f63ecd track whether contact is a community page or not 2012-03-15 16:38:26 -07:00
friendica
f0a62d8908 ssl_policy stuff 2012-03-14 20:36:23 -07:00
Tobias Hößl
635958e11d Merge branch 'master' of git://github.com/friendica/friendica 2012-03-09 10:00:12 +00:00
friendica
395a9530dc still getting parent relays on remote systems 2012-03-07 18:23:55 -08:00
friendica
23718bfc25 prevent duplicate likes 2012-03-06 02:17:55 -08:00
friendica
fba089012a correct owner info from misconfigured installs, duepuntozero title block misplaced in editplain mode 2012-03-04 18:50:32 -08:00
friendica
bd2c8c92f1 yet more work on notifications 2012-02-29 19:23:01 -08:00
friendica
4dd4a22582 From Tobias H - catch some irregularities caused by cut/paste code 2012-02-28 14:52:23 -08:00
Tobias Hößl
e55d13c2b4 Avoid a notice 2012-02-28 12:56:16 +00:00
Tobias Hößl
e33c2b8f89 Avoid a Notice 2012-02-27 22:08:00 +00:00
Tobias Hößl
4b1de0f538 Avoid some notices 2012-02-26 20:43:51 +00:00
Abinoam P. Marques Jr
bcfac6c72f include/items.php pass 'parent' to notification 2012-02-25 16:59:44 -08:00
friendica
a3cf563b68 update author name across items if changed. 2012-02-24 20:40:09 -08:00
friendica
f5c5da742d attribution issue - don't take author name from contact if available from item. 2012-02-24 20:03:13 -08:00
friendica
f03aaf554e mark all notifications read 2012-02-21 16:59:57 -08:00
friendica
32d9008dd4 more cleanup of community followup detection. Remote worked well but local didn't. 2012-02-20 21:07:40 -08:00
friendica
b821399f00 email notify now redirected through mod_notify, weirdness in local deliver caused by community page changes 2012-02-20 19:50:05 -08:00
friendica
11871195be fix twitter title showing up occasionally 2012-02-20 18:06:43 -08:00
friendica
1b9c03f6fc new notifications - implement storage 2012-02-18 02:57:42 -08:00
friendica
2abbd81ce1 a few fixes for offsite community members 2012-02-16 18:29:09 -08:00
friendica
d79c3351ea db installation sync 2012-02-10 13:43:35 -08:00
friendica
b346f4464c send notify emails to community pages as well as people 2012-02-10 00:08:23 -08:00
friendica
ffe7d8b1e9 item tag notifications 2012-02-09 21:18:50 -08:00
friendica
7b0a005441 edit post not working after plaintext editor fixes, missing some recent editor template changes 2012-02-09 15:58:26 -08:00
friendica
4993f4f1d6 allow plugin to abort message posting, fix half-duplex D* relationship 2012-01-30 20:49:54 -08:00
friendica
e2d0eb4a88 redirect to a useful location after deleting or ignoring a friend request, begin comment moderation logic 2012-01-24 18:59:55 -08:00
friendica
a76a497d92 implement "moderate" flag on items 2012-01-23 20:56:11 -08:00
friendica
8aa2552372 add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit) 2012-01-18 16:21:30 -08:00
friendica
d840943621 use reltoabs - primarily for github activity feeds 2012-01-17 16:30:32 -08:00
friendica
c1cf6e48c2 Allow Diaspora to post to forums 2012-01-04 13:50:12 -08:00
friendica
fc7d0360bb add verb and item to notifications to aid in localisation 2012-01-03 20:26:20 -08:00
friendica
969cd145ce suggestion notifications 2012-01-03 17:29:07 -08:00
friendica
c583d16209 fix reference variable effects on sorting 2012-01-03 14:27:00 -08:00
friendica
3e162bcf8f function not defined 2011-12-30 20:48:49 -08:00
friendica
a76be1934a migrate more notifications 2011-12-29 22:32:30 -08:00
friendica
bb40e54dec new notification module working for "email message received" 2011-12-25 23:00:19 -08:00
friendica
0b598dedd0 more work on enotify 2011-12-23 23:07:05 -08:00
friendica
3da3cd686c notifications refactor 2011-12-08 01:28:27 -08:00
friendica
513c1c0d68 dynamic delete icons for saved-search on network page 2011-12-01 18:27:45 -08:00
friendica
b795ce4fe7 little stuff - name change, live updates, new network types 2011-11-23 23:17:26 -08:00
friendica
c568493f57 add expire_starred option, fix "delete selected" on some themes, new project name in email templates 2011-11-21 19:01:05 -08:00
Fabio Comuni
cb05e677a9 Merge remote-tracking branch 'friendica/master' 2011-11-21 13:52:15 +01:00
friendica
aaedac8f57 community forums cleanup 2011-11-19 13:45:20 -08:00
friendica
191a9b048f forum cleanup 2011-11-19 03:13:46 -08:00
friendica
72dd6457b0 first forum test 2011-11-19 03:06:15 -08:00
friendica
6463543832 new approach to secondary delivery fork 2011-11-18 22:20:08 -08:00
friendica
fd4fe24406 Merge branch 'master' into groups 2011-11-18 22:04:41 -08:00
Fabio Comuni
590f1d2b25 log less in expire items 2011-11-17 16:18:59 +01:00
Fabio Comuni
79603e3146 expire settings for items, notes and photos.
show default privacy acl in popup
2011-11-17 15:53:59 +01:00
friendica
c9846b745d allow dup tag names with different urls 2011-11-16 17:09:58 -08:00
friendica
485f97b3d8 tgroup relays 2011-11-15 20:30:34 -08:00
Friendika
d23867f5a0 incorrect total use for get_feedtags 2011-11-12 02:53:53 -08:00
Friendika
20ca93191f cleanup and loose ends 2011-11-08 16:54:32 -08:00
Friendika
3d9a9614e2 common friends 2011-11-01 19:16:33 -07:00
Friendika
573670fa0c more social graph stuff 2011-11-01 16:08:07 -07:00