Commit Graph

3273 Commits

Author SHA1 Message Date
Evan Prodromou 069d976fab SearchSubMenu is a MoreMenu 2011-07-07 12:06:56 -04:00
Evan Prodromou baaad0dc8b TagSubMenu is a MoreMenu 2011-07-07 10:59:00 -04:00
Evan Prodromou af0eded741 add an URI index to blogs so they get cached 2011-07-04 15:58:56 -04:00
Evan Prodromou 44753d64ea use Poll_response::pkeyGet() in Poll::getResponse() 2011-07-04 15:47:36 -04:00
Evan Prodromou c468b0d7f3 explicitly name URI attribute for Poll_response 2011-07-04 15:47:09 -04:00
Evan Prodromou 6ff3149082 SearchSub respects empty set from memcache. 2011-07-04 12:49:09 -04:00
Evan Prodromou d4b7f5d8ac TagSub doesn't refetch empty set of tag subscriptions 2011-07-04 12:39:57 -04:00
Evan Prodromou 144755d1c9 Merge branch '1.0.x' of git+ssh://statusnetdev.net/var/www/evan into 1.0.x 2011-07-04 12:26:59 -04:00
Evan Prodromou 15dafffb3b Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-07-04 12:26:41 -04:00
Evan Prodromou db85774f25 only update the avatar of an Ostatus_profile if it's a profile 2011-07-04 12:24:59 -04:00
Evan Prodromou 333876c6a9 don't force replies to empty set in Poll_response 2011-07-02 00:49:04 -04:00
Evan Prodromou 2998033816 Add FIXME comments to remember to encode/decode important data about a
happening in ActivityStreams format
2011-07-01 23:06:16 -04:00
Evan Prodromou a0ed80a5d8 Correct list of parameters for Happening::saveNew() 2011-07-01 23:04:44 -04:00
Evan Prodromou 66edc023d7 Happening::saveNew() is static 2011-07-01 23:03:41 -04:00
Evan Prodromou c37c303b14 Correct the category of the EventPlugin 2011-07-01 22:20:13 -04:00
Siebrand Mazeland eb90389a22 Localisation updates from http://translatewiki.net. 2011-07-01 13:02:21 +02:00
Evan Prodromou 9f8d0b36a8 Merge branch '1.0.x' of git+ssh://statusnetdev.net/var/www/evan into 1.0.x 2011-06-30 15:44:11 -04:00
Zach Copley 4eac561cf6 Fix ajax error output 2011-06-29 21:55:28 +00:00
Zach Copley 7fb93673bc Get rid of PHP notice 2011-06-29 21:55:00 +00:00
Zach Copley 2471f2092a Fix avatar saving for OStatus -- how did this ever work? 2011-06-29 19:03:16 +00:00
Evan Prodromou da4ba6a5a9 reinstate lost replies code in OStatusQueueHandler 2011-06-29 13:51:19 -04:00
Evan Prodromou 7759aa51e6 extra logging for OStatus enqueuing 2011-06-29 13:20:18 -04:00
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