GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity
13,749 Commits 8 Branches 4 Tags 309 MiB
Commit Graph

3251 Commits

Author SHA1 Message Date
Zach Copley fe28432a26 Merge branch '1.0.x' into testing 
* 1.0.x:
  * only send the one invitation reminder per email address, regardless of how many invitations there are * don't send invitations converted invitations * better error checking * more logging
 2011-06-21 13:26:44 -07:00
Zach Copley e7a4fee32b * only send the one invitation reminder per email address, regardless of how many invitations there are 
* don't send invitations converted invitations
* better error checking
* more logging
 2011-06-21 13:25:05 -07:00
Evan Prodromou f7ba2d1f8a Merge branch 'testing' of gitorious.org:statusnet/mainline into testing 2011-06-21 14:12:24 -04:00
Evan Prodromou 718203306c Add tags and headers to improve email summary deliverability 
SpamAssassin doesn't like HTML email without a) a Mime-Version header
and b) an <html> tag in the body. Although not everyone uses SA, there
are probably other spam systems that implement similar rules. And it's
always nice to play nice.
 2011-06-21 14:07:10 -04:00
Zach Copley 14f555fe65 Merge branch '1.0.x' into testing 
* 1.0.x:
  Move print statement
 2011-06-21 10:43:18 -07:00
Zach Copley e53dad35b8 Move print statement 2011-06-21 10:42:01 -07:00
Zach Copley ba5dc26a76 Merge branch '1.0.x' into testing 
* 1.0.x:
  Fix output bug in email reminder script
 2011-06-21 10:36:39 -07:00
Zach Copley 9051417605 Fix output bug in email reminder script 2011-06-21 10:35:20 -07:00
Zach Copley a7b23fdb9d Merge branch '1.0.x' into testing 
* 1.0.x:
  Update subject of one-time email reminders
 2011-06-21 10:04:39 -07:00
Zach Copley 809482b5fb Update subject of one-time email reminders 2011-06-21 10:03:39 -07:00
Evan Prodromou 67cb4c5b88 Merge branch 'testing' of gitorious.org:statusnet/mainline into testing 2011-06-20 17:28:02 -04:00
Zach Copley 6943f00e37 Merge branch '1.0.x' into testing 
* 1.0.x:
  Add ability to send special one-time reminders
 2011-06-20 14:16:30 -07:00
Evan Prodromou 42f3fedd43 use old-style plugin initializers as fallback for GoogleAnalytics 2011-06-20 17:06:17 -04:00
Evan Prodromou 34a2152d0a use async, domain-aware GoogleAnalytics JS 2011-06-20 16:38:00 -04:00
Zach Copley 29403a764c Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 
* '1.0.x' of gitorious.org:statusnet/mainline: (31 commits)
  Enable TinyMCE for the blog form
  upgrade TinyMCE to 3.4.x
  correctly purify input for Blog_entry
  better management of HTML input
  correctly return the HTML representation of a new blog entry
  Fine-tuning Blog_entry class
  don't double-show summary and content
  move class BlogEntry to Blog_entry for DB_DataObject compliance
  get right output context for BlogEntryListItem
  correct staticGet() declaration
  First coded version of blog plugin
  push regex pattern for UUID to that class
  Localisation updates from http://translatewiki.net.
  Document a few messages I missed.
  Add translator documentation. Broke a few long lines. i18n/L10n updates. Whitespace updates.
  Localisation updates from http://translatewiki.net.
  Add missing translator documentation.
  Update translator documentation. Whitespace updates.
  Fix i18n issues. Cannot use a PHP variable in a gettext messages. Needs to be replaced. Whitespace updates.
  Add translator documentation.
  ...

Conflicts:
	plugins/EmailReminder/EmailReminderPlugin.php
	plugins/EmailReminder/lib/userinvitereminderhandler.php
 2011-06-20 13:14:19 -07:00
Zach Copley aebab2742a Add ability to send special one-time reminders 2011-06-20 12:58:14 -07:00
Evan Prodromou f078c19f09 Merge branch '1.0.x' into testing 2011-06-20 12:23:16 -04:00
Evan Prodromou 182a8cf377 Enable TinyMCE for the blog form 2011-06-20 12:21:04 -04:00
Evan Prodromou 12ab4629f3 Merge branch 'upgradetinymce' into newblogplugin 2011-06-20 11:34:41 -04:00
Evan Prodromou d67b8fdae8 upgrade TinyMCE to 3.4.x 2011-06-20 11:34:24 -04:00
Evan Prodromou acd1c6287d correctly purify input for Blog_entry 2011-06-20 11:28:46 -04:00
Evan Prodromou 4c5d583403 better management of HTML input 2011-06-20 11:01:50 -04:00
Evan Prodromou 06ac0f9e9e correctly return the HTML representation of a new blog entry 2011-06-20 10:49:37 -04:00
Evan Prodromou e5126ebb77 Fine-tuning Blog_entry class 
Gave it a different object type (Article), fine-tuned the summary process, and
made sure to return the saved Notice in saveNew().
 2011-06-20 10:48:02 -04:00
Evan Prodromou 3d8b776dc7 don't double-show summary and content 2011-06-20 10:26:24 -04:00
Evan Prodromou d51abd8830 move class BlogEntry to Blog_entry for DB_DataObject compliance 2011-06-20 10:20:01 -04:00
Evan Prodromou 4c9ae4fae6 get right output context for BlogEntryListItem 2011-06-20 10:14:37 -04:00
Evan Prodromou a1911dc2c1 correct staticGet() declaration 2011-06-20 10:14:24 -04:00
Evan Prodromou 01996b1a46 Merge remote-tracking branch 'evan/blogplugin' into newblogplugin 2011-06-20 09:34:32 -04:00
Evan Prodromou 8104b1f766 Merge branch '1.0.x' into testing 2011-06-20 09:13:42 -04:00
Evan Prodromou cd7d0eae4a First coded version of blog plugin 
A basic blog plugin. Allows posting open-ended HTML with a title. Not yet
tested (even run).
 2011-06-20 01:11:35 -04:00
Siebrand Mazeland 0ed9000fd3 Localisation updates from http://translatewiki.net. 2011-06-19 15:19:14 +02:00
Siebrand Mazeland 6917d6c7de Document a few messages I missed. 
This should actually bring 1.0.x to 100% translator documention, but of course new messages will appear and I'll probably have overseen a few...
 2011-06-19 15:14:45 +02:00
Siebrand Mazeland 0155198ffa Add translator documentation. 
Broke a few long lines.
i18n/L10n updates.
Whitespace updates.
 2011-06-19 15:02:31 +02:00
Siebrand Mazeland 42b28547d5 Localisation updates from http://translatewiki.net. 2011-06-19 13:20:34 +02:00
Siebrand Mazeland d750a943ed Add missing translator documentation. 2011-06-19 12:31:36 +02:00
Siebrand Mazeland 10600579e0 Update translator documentation. 
Whitespace updates.
 2011-06-19 12:23:14 +02:00
Siebrand Mazeland 2f3bec5a43 Fix i18n issues. Cannot use a PHP variable in a gettext messages. Needs to be replaced. 
Whitespace updates.
 2011-06-19 12:21:12 +02:00
Siebrand Mazeland 46d9df2f8a Update translator documentation. 
Remove superfluous whitespace.
 2011-06-19 12:07:59 +02:00
Siebrand Mazeland 9272fcd3ab Add translator documentation. 2011-06-19 11:54:10 +02:00
Siebrand Mazeland 89aebb4ef0 Localisation updates from http://translatewiki.net. 2011-06-18 18:14:28 +02:00
Siebrand Mazeland 33ce46f074 Add new POT files. 2011-06-18 17:58:54 +02:00
Siebrand Mazeland 199404c74a Update translator documentation. 
Update whitespace.
i18n/L10n fixes.
 2011-06-18 17:20:36 +02:00
Siebrand Mazeland 3891697222 Fix FIXME: removed patchwork message. Using Markdown now. 
Update translator documentation.
Update whitespace.
i18n fixes.
 2011-06-18 17:19:36 +02:00
Siebrand Mazeland 96b9ecaf07 Update translator documentation. 
L10n/i18n updates.
Whitespace updates.
 2011-06-17 22:36:40 +02:00
Siebrand Mazeland dc3cdfc0f8 Update translator documentation. 
Whitespace updates.
Correction to fix syntax highlighting in my editor. Didn't complete it, though.
 2011-06-17 22:36:39 +02:00
Siebrand Mazeland acb215d550 Update translator documentation. 
i18n/L10n updates.
Whitespace updates.
 2011-06-17 22:36:37 +02:00
Siebrand Mazeland 0b81532cbc Fix a todo wrt plural support. 
Update translator documentation.
Whitespace updates.
 2011-06-17 22:36:35 +02:00
Siebrand Mazeland 9f4a9a13cd i18n fixes. 
Translator documentation updated.
Whitespace updates.
 2011-06-17 22:36:33 +02:00
Siebrand Mazeland 037a905929 Update translator documentation. 2011-06-17 22:36:31 +02:00