Source Control Integration

Changesets: Import 2011-02-14 16:18:00		[ Browse ] [ Back to Index ]
master 7b265005 Timestamp: 2011-02-14 11:50:08 Author: Chris Case Committer: Chris Case [ Details ] [ Diff ]	Merge remote branch 'upstream/master'
	add - images/smiley-heart.gif		[ Diff ] [ File ]
	mod - boot.php		[ Diff ] [ File ]
	mod - include/acl_selectors.php		[ Diff ] [ File ]
	mod - include/main.js		[ Diff ] [ File ]
	mod - mod/item.php		[ Diff ] [ File ]
	mod - mod/network.php		[ Diff ] [ File ]
	mod - mod/profile.php		[ Diff ] [ File ]
	mod - view/comment_item.tpl		[ Diff ] [ File ]

master 42eb6dd7 Timestamp: 2011-02-14 05:44:27 Author: Chris Case Committer: Chris Case [ Details ] [ Diff ]	fixed a bbcode issue with rich text html messages, fixed some issues with plain text.
	mod - mod/dfrn_notify.php		[ Diff ] [ File ]

master 94e0c3c9 Timestamp: 2011-02-14 04:54:44 Author: Chris Case Committer: Chris Case [ Details ] [ Diff ]	fixed the charset on the html version of the message, overlooked this in the last commit, now uses utf-8 in the meta tag
	mod - view/de/mail_received_eml.tpl		[ Diff ] [ File ]
	mod - view/en/mail_received_eml.tpl		[ Diff ] [ File ]
	mod - view/fr/mail_received_eml.tpl		[ Diff ] [ File ]
	mod - view/it/mail_received_eml.tpl		[ Diff ] [ File ]

2.1-branch 61a3c935 Timestamp: 2011-02-11 03:18:51 Author: Friendika Committer: Friendika [ Details ] [ Diff ]	reinstate send slaps but only at top level (and followup)
	mod - include/notifier.php		[ Diff ] [ File ]

2.1-branch 09e07f0d Timestamp: 2011-02-10 13:19:17 Author: Friendika Committer: Friendika [ Details ] [ Diff ]	typo in schema
	mod - database.sql		[ Diff ] [ File ]

2.1-branch e2d6e986 Timestamp: 2011-02-10 04:22:04 Author: Friendika Committer: Friendika [ Details ] [ Diff ]	don't send empty tweets through to twitter/statusnet
	mod - addon/statusnet/statusnet.php		[ Diff ] [ File ]
	mod - addon/twitter/twitter.php		[ Diff ] [ File ]

2.1-branch 1d12a2be Timestamp: 2011-02-09 00:53:51 Author: Friendika Committer: Friendika [ Details ] [ Diff ]	string update
	mod - util/strings.php		[ Diff ] [ File ]

2.1-branch 9afbb74b Timestamp: 2011-02-09 00:48:07 Author: Friendika Committer: Friendika [ Details ] [ Diff ]	Merge branch 'tobiasd-master'
	mod - addon/statusnet/statusnet.php		[ Diff ] [ File ]
	mod - addon/twitter/twitter.php		[ Diff ] [ File ]