]> git.mxchange.org Git - quix0rs-gnu-social.git/log
quix0rs-gnu-social.git
13 years agoextra logging for OStatus enqueuing
Evan Prodromou [Wed, 29 Jun 2011 17:20:18 +0000 (13:20 -0400)]
extra logging for OStatus enqueuing

13 years agofix missing variable for createsim.php
Evan Prodromou [Mon, 27 Jun 2011 21:29:33 +0000 (17:29 -0400)]
fix missing variable for createsim.php

13 years agochange default theme to neo theme for installer
Evan Prodromou [Mon, 27 Jun 2011 21:14:35 +0000 (17:14 -0400)]
change default theme to neo theme for installer

13 years agostop sending OMB by default
Evan Prodromou [Mon, 27 Jun 2011 17:02:32 +0000 (13:02 -0400)]
stop sending OMB by default

13 years agocorrect const for ActivityStreamJSONDocument::CONTENT_TYPE
Evan Prodromou [Thu, 23 Jun 2011 15:39:08 +0000 (11:39 -0400)]
correct const for ActivityStreamJSONDocument::CONTENT_TYPE

13 years agoActivityStreamJSONDocument served as application/stream+json
Evan Prodromou [Thu, 23 Jun 2011 15:38:46 +0000 (11:38 -0400)]
ActivityStreamJSONDocument served as application/stream+json

13 years agouse application/stream+json for Activity Streams
Evan Prodromou [Thu, 23 Jun 2011 15:24:37 +0000 (11:24 -0400)]
use application/stream+json for Activity Streams

13 years agoMerge branch '1.0.x' into testing
Evan Prodromou [Wed, 22 Jun 2011 21:21:20 +0000 (17:21 -0400)]
Merge branch '1.0.x' into testing

13 years agolost cookie-jar file
Evan Prodromou [Wed, 22 Jun 2011 21:21:15 +0000 (17:21 -0400)]
lost cookie-jar file

13 years agoadd activitystreams links to other actions
Evan Prodromou [Wed, 22 Jun 2011 21:19:46 +0000 (17:19 -0400)]
add activitystreams links to other actions

13 years agoAdd Activity Streams feeds to export data
Evan Prodromou [Wed, 22 Jun 2011 21:09:04 +0000 (17:09 -0400)]
Add Activity Streams feeds to export data

13 years agoupdate HTTP_Request2 to 2.0.0RC1
Evan Prodromou [Wed, 22 Jun 2011 19:56:27 +0000 (15:56 -0400)]
update HTTP_Request2 to 2.0.0RC1

13 years agoMerge branch '1.0.x' into testing
Zach Copley [Tue, 21 Jun 2011 20:26:44 +0000 (13:26 -0700)]
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

13 years ago* only send the one invitation reminder per email address, regardless of how many...
Zach Copley [Tue, 21 Jun 2011 20:25:05 +0000 (13:25 -0700)]
* 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

13 years agoMerge branch 'testing' of gitorious.org:statusnet/mainline into testing
Evan Prodromou [Tue, 21 Jun 2011 18:12:24 +0000 (14:12 -0400)]
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing

13 years agoAdd tags and headers to improve email summary deliverability
Evan Prodromou [Tue, 21 Jun 2011 18:07:10 +0000 (14:07 -0400)]
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.

13 years agoMerge branch '1.0.x' into testing
Zach Copley [Tue, 21 Jun 2011 17:43:18 +0000 (10:43 -0700)]
Merge branch '1.0.x' into testing

* 1.0.x:
  Move print statement

13 years agoMove print statement
Zach Copley [Tue, 21 Jun 2011 17:42:01 +0000 (10:42 -0700)]
Move print statement

13 years agoMerge branch '1.0.x' into testing
Zach Copley [Tue, 21 Jun 2011 17:36:39 +0000 (10:36 -0700)]
Merge branch '1.0.x' into testing

* 1.0.x:
  Fix output bug in email reminder script

13 years agoFix output bug in email reminder script
Zach Copley [Tue, 21 Jun 2011 17:35:20 +0000 (10:35 -0700)]
Fix output bug in email reminder script

13 years agoMerge branch '1.0.x' into testing
Zach Copley [Tue, 21 Jun 2011 17:04:39 +0000 (10:04 -0700)]
Merge branch '1.0.x' into testing

* 1.0.x:
  Update subject of one-time email reminders

13 years agoUpdate subject of one-time email reminders
Zach Copley [Tue, 21 Jun 2011 17:03:39 +0000 (10:03 -0700)]
Update subject of one-time email reminders

13 years agoMerge branch '1.0.x' into testing
Evan Prodromou [Tue, 21 Jun 2011 15:33:18 +0000 (11:33 -0400)]
Merge branch '1.0.x' into testing

13 years agoFix addressees when drop-down for a single user is used
Evan Prodromou [Tue, 21 Jun 2011 15:32:26 +0000 (11:32 -0400)]
Fix addressees when drop-down for a single user is used

13 years agoMerge branch 'testing' of gitorious.org:statusnet/mainline into testing
Evan Prodromou [Mon, 20 Jun 2011 21:28:02 +0000 (17:28 -0400)]
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing

13 years agoMerge branch '1.0.x' into testing
Zach Copley [Mon, 20 Jun 2011 21:16:30 +0000 (14:16 -0700)]
Merge branch '1.0.x' into testing

* 1.0.x:
  Add ability to send special one-time reminders

13 years agouse old-style plugin initializers as fallback for GoogleAnalytics
Evan Prodromou [Mon, 20 Jun 2011 21:06:17 +0000 (17:06 -0400)]
use old-style plugin initializers as fallback for GoogleAnalytics

13 years agouse async, domain-aware GoogleAnalytics JS
Evan Prodromou [Mon, 20 Jun 2011 20:38:00 +0000 (16:38 -0400)]
use async, domain-aware GoogleAnalytics JS

13 years agoMerge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
Zach Copley [Mon, 20 Jun 2011 20:14:19 +0000 (13:14 -0700)]
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

13 years agoAdd ability to send special one-time reminders
Zach Copley [Mon, 20 Jun 2011 19:58:14 +0000 (12:58 -0700)]
Add ability to send special one-time reminders

13 years agoMerge branch '1.0.x' into testing
Evan Prodromou [Mon, 20 Jun 2011 16:23:16 +0000 (12:23 -0400)]
Merge branch '1.0.x' into testing

13 years agoEnable TinyMCE for the blog form
Evan Prodromou [Mon, 20 Jun 2011 16:21:04 +0000 (12:21 -0400)]
Enable TinyMCE for the blog form

13 years agoMerge branch 'upgradetinymce' into newblogplugin
Evan Prodromou [Mon, 20 Jun 2011 15:34:41 +0000 (11:34 -0400)]
Merge branch 'upgradetinymce' into newblogplugin

13 years agoupgrade TinyMCE to 3.4.x
Evan Prodromou [Mon, 20 Jun 2011 15:34:24 +0000 (11:34 -0400)]
upgrade TinyMCE to 3.4.x

13 years agocorrectly purify input for Blog_entry
Evan Prodromou [Mon, 20 Jun 2011 15:28:46 +0000 (11:28 -0400)]
correctly purify input for Blog_entry

13 years agobetter management of HTML input
Evan Prodromou [Mon, 20 Jun 2011 15:01:50 +0000 (11:01 -0400)]
better management of HTML input

13 years agocorrectly return the HTML representation of a new blog entry
Evan Prodromou [Mon, 20 Jun 2011 14:49:37 +0000 (10:49 -0400)]
correctly return the HTML representation of a new blog entry

13 years agoFine-tuning Blog_entry class
Evan Prodromou [Mon, 20 Jun 2011 14:48:02 +0000 (10:48 -0400)]
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().

13 years agodon't double-show summary and content
Evan Prodromou [Mon, 20 Jun 2011 14:26:24 +0000 (10:26 -0400)]
don't double-show summary and content

13 years agomove class BlogEntry to Blog_entry for DB_DataObject compliance
Evan Prodromou [Mon, 20 Jun 2011 14:20:01 +0000 (10:20 -0400)]
move class BlogEntry to Blog_entry for DB_DataObject compliance

13 years agoget right output context for BlogEntryListItem
Evan Prodromou [Mon, 20 Jun 2011 14:14:37 +0000 (10:14 -0400)]
get right output context for BlogEntryListItem

13 years agocorrect staticGet() declaration
Evan Prodromou [Mon, 20 Jun 2011 14:14:24 +0000 (10:14 -0400)]
correct staticGet() declaration

13 years agoMerge remote-tracking branch 'evan/blogplugin' into newblogplugin
Evan Prodromou [Mon, 20 Jun 2011 13:34:32 +0000 (09:34 -0400)]
Merge remote-tracking branch 'evan/blogplugin' into newblogplugin

13 years agoMerge branch '1.0.x' into testing
Evan Prodromou [Mon, 20 Jun 2011 13:13:42 +0000 (09:13 -0400)]
Merge branch '1.0.x' into testing

13 years agoFirst coded version of blog plugin
Evan Prodromou [Mon, 20 Jun 2011 05:11:35 +0000 (01:11 -0400)]
First coded version of blog plugin

A basic blog plugin. Allows posting open-ended HTML with a title. Not yet
tested (even run).

13 years agopush regex pattern for UUID to that class
Evan Prodromou [Mon, 20 Jun 2011 05:11:08 +0000 (01:11 -0400)]
push regex pattern for UUID to that class

13 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 19 Jun 2011 13:19:14 +0000 (15:19 +0200)]
Localisation updates from http://translatewiki.net.

13 years agoDocument a few messages I missed.
Siebrand Mazeland [Sun, 19 Jun 2011 13:14:45 +0000 (15:14 +0200)]
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...

13 years agoAdd translator documentation.
Siebrand Mazeland [Sun, 19 Jun 2011 13:02:31 +0000 (15:02 +0200)]
Add translator documentation.
Broke a few long lines.
i18n/L10n updates.
Whitespace updates.

13 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 19 Jun 2011 11:20:34 +0000 (13:20 +0200)]
Localisation updates from http://translatewiki.net.

13 years agoAdd missing translator documentation.
Siebrand Mazeland [Sun, 19 Jun 2011 10:31:36 +0000 (12:31 +0200)]
Add missing translator documentation.

13 years agoUpdate translator documentation.
Siebrand Mazeland [Sun, 19 Jun 2011 10:23:14 +0000 (12:23 +0200)]
Update translator documentation.
Whitespace updates.

13 years agoFix i18n issues. Cannot use a PHP variable in a gettext messages. Needs to be replaced.
Siebrand Mazeland [Sun, 19 Jun 2011 10:21:12 +0000 (12:21 +0200)]
Fix i18n issues. Cannot use a PHP variable in a gettext messages. Needs to be replaced.
Whitespace updates.

13 years agoAdd translator documentation.
Siebrand Mazeland [Sun, 19 Jun 2011 10:12:47 +0000 (12:12 +0200)]
Add translator documentation.

13 years agoUpdate translator documentation.
Siebrand Mazeland [Sun, 19 Jun 2011 10:07:59 +0000 (12:07 +0200)]
Update translator documentation.
Remove superfluous whitespace.

13 years agoAdd translator documentation.
Siebrand Mazeland [Sun, 19 Jun 2011 09:54:10 +0000 (11:54 +0200)]
Add translator documentation.

13 years agoUse _() instead of _m() as there is no context or plural.
Siebrand Mazeland [Sun, 19 Jun 2011 09:49:33 +0000 (11:49 +0200)]
Use _() instead of _m() as there is no context or plural.

13 years agoHopefully fix TRANS message not getting picked up by xgettext.
Siebrand Mazeland [Sun, 19 Jun 2011 09:45:37 +0000 (11:45 +0200)]
Hopefully fix TRANS message not getting picked up by xgettext.

13 years agoFix incorrect tag (missing colon).
Siebrand Mazeland [Sun, 19 Jun 2011 09:30:35 +0000 (11:30 +0200)]
Fix incorrect tag (missing colon).

13 years agoRemove double tag in comment.
Siebrand Mazeland [Sun, 19 Jun 2011 09:15:31 +0000 (11:15 +0200)]
Remove double tag in comment.

13 years agoFix typo in comment.
Siebrand Mazeland [Sun, 19 Jun 2011 09:11:12 +0000 (11:11 +0200)]
Fix typo in comment.

13 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sat, 18 Jun 2011 16:14:28 +0000 (18:14 +0200)]
Localisation updates from http://translatewiki.net.

13 years agoAdd new POT files.
Siebrand Mazeland [Sat, 18 Jun 2011 15:58:54 +0000 (17:58 +0200)]
Add new POT files.

13 years agoUpdate translator documentation.
Siebrand Mazeland [Sat, 18 Jun 2011 15:20:36 +0000 (17:20 +0200)]
Update translator documentation.
Update whitespace.
i18n/L10n fixes.

13 years agoFix FIXME: removed patchwork message. Using Markdown now.
Siebrand Mazeland [Sat, 18 Jun 2011 15:19:36 +0000 (17:19 +0200)]
Fix FIXME: removed patchwork message. Using Markdown now.
Update translator documentation.
Update whitespace.
i18n fixes.

13 years agoUpdate translator documentation.
Siebrand Mazeland [Fri, 17 Jun 2011 20:35:45 +0000 (22:35 +0200)]
Update translator documentation.
L10n/i18n updates.
Whitespace updates.

13 years agoUpdate translator documentation.
Siebrand Mazeland [Fri, 17 Jun 2011 14:31:22 +0000 (16:31 +0200)]
Update translator documentation.
Whitespace updates.
Correction to fix syntax highlighting in my editor. Didn't complete it, though.

13 years agoUpdate translator documentation.
Siebrand Mazeland [Fri, 17 Jun 2011 14:19:18 +0000 (16:19 +0200)]
Update translator documentation.
i18n/L10n updates.
Whitespace updates.

13 years agoFix a todo wrt plural support.
Siebrand Mazeland [Fri, 17 Jun 2011 14:03:15 +0000 (16:03 +0200)]
Fix a todo wrt plural support.
Update translator documentation.
Whitespace updates.

13 years agoi18n fixes.
Siebrand Mazeland [Fri, 17 Jun 2011 13:54:34 +0000 (15:54 +0200)]
i18n fixes.
Translator documentation updated.
Whitespace updates.

13 years agoUpdate translator documentation.
Siebrand Mazeland [Fri, 17 Jun 2011 13:48:22 +0000 (15:48 +0200)]
Update translator documentation.

13 years agoTranslator documentation updated.
Siebrand Mazeland [Fri, 17 Jun 2011 13:41:45 +0000 (15:41 +0200)]
Translator documentation updated.
Whitespace updates.

13 years agoWhitespace updates.
Siebrand Mazeland [Fri, 17 Jun 2011 12:54:33 +0000 (14:54 +0200)]
Whitespace updates.

13 years agoFix i18n for some very visible UI messages.
Siebrand Mazeland [Fri, 17 Jun 2011 10:20:20 +0000 (12:20 +0200)]
Fix i18n for some very visible UI messages.

13 years agoL10n updates.
Siebrand Mazeland [Fri, 17 Jun 2011 09:20:19 +0000 (11:20 +0200)]
L10n updates.

13 years agoMerge branch '1.0.x' into testing
Evan Prodromou [Fri, 17 Jun 2011 13:29:53 +0000 (09:29 -0400)]
Merge branch '1.0.x' into testing

13 years agoEmailReminder plugin to send reminders about various things
Zach Copley [Fri, 17 Jun 2011 09:24:34 +0000 (02:24 -0700)]
EmailReminder plugin to send reminders about various things

* Needs some cleanup and testing
* Email templates need work
* More documentation

Squashed commit of the following:

commit 1c7b418dad5ec1b7713d61b6a42d6d7a394d500f
Author: Zach Copley <zach@status.net>
Date:   Fri Jun 17 02:17:31 2011 -0700

    * Set the reminder interval correctly

commit ae0ded8cf95210f54b4cd58dac0eeeedf2d99c67
Author: Zach Copley <zach@status.net>
Date:   Fri Jun 17 02:15:01 2011 -0700

    Send email reminders for invitations

commit 1b596d08f5dbe765a16fbdfbd21e2ad68e8b0058
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 16 23:53:48 2011 -0700

    Handle multiple confirmation types

commit 25d83351d878f39498cd6a14fddde27f1afef2ca
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 16 18:04:57 2011 -0700

    Actually send reminders and record a record of doing so

commit 9ffc2dbee15cacc7e7f9feab492185ee9964a17e
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 16 14:20:16 2011 -0700

    Make the queue handling actually work

commit 2a6ce3c17c045bdb0a3ddf36f2c290c9c48eb003
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 16 13:27:56 2011 -0700

    Fix syntax errors

commit 054b54847dfadc490aa7d7dff12d473af31c99bb
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 16 00:36:37 2011 -0700

    Registration reminders should work now, but code is untested

commit b44117017b64635aae340c260167cf1efab9b2ae
Merge: 9d1441d f74de88
Author: Zach Copley <zach@status.net>
Date:   Tue Jun 14 09:43:19 2011 -0700

    Merge branch 'email-reminder' of gitorious.org:~zcopley/statusnet/zcopleys-clone into email-reminder

    * 'email-reminder' of gitorious.org:~zcopley/statusnet/zcopleys-clone:
      Stubby EmailReminderPlugin and data class
      Remove bogus data class

    Conflicts:
     plugins/EmailReminder/EmailReminderPlugin.php
     plugins/EmailReminder/classes/Email_reminder.php

commit 9d1441d7366df57e38cdfaf96e006f7d2f29d889
Author: Zach Copley <zach@status.net>
Date:   Tue Jun 14 09:23:23 2011 -0700

    Most of the other classes needed to send email reminders

commit 4e9bb11dbb23556bf5c1847e7a127084b5cc217c
Author: Zach Copley <zach@status.net>
Date:   Mon Jun 13 12:10:55 2011 -0700

    size -> length

commit a9ea80ef8abae1e64d5713091baedd931b7184e2
Author: Zach Copley <zach@status.net>
Date:   Fri Jun 10 16:38:06 2011 -0400

    Stubby EmailReminderPlugin and data class

commit 5d893f982209b245cb9113a59e49721dd6e191b6
Author: Zach Copley <zach@status.net>
Date:   Fri Jun 10 14:01:48 2011 -0400

    Remove bogus data class

commit f74de8841a98add73536fd8a4d3cee76035b491c
Author: Zach Copley <zach@status.net>
Date:   Fri Jun 10 16:38:06 2011 -0400

    Stubby EmailReminderPlugin and data class

commit 5b14370918233e5112a95da94567c4ed83429bc9
Author: Zach Copley <zach@status.net>
Date:   Fri Jun 10 14:01:48 2011 -0400

    Remove bogus data class

13 years agoFix typo. Spotted by Nikerabbit.
Siebrand Mazeland [Wed, 15 Jun 2011 11:24:53 +0000 (13:24 +0200)]
Fix typo. Spotted by Nikerabbit.

13 years agoUpdate translator documentation.
Siebrand Mazeland [Wed, 15 Jun 2011 11:20:23 +0000 (13:20 +0200)]
Update translator documentation.
Whitespace updates.
Line break changes in README.
i18n updates.

13 years agoUpdate translator documentation per request of Nikerabbit.
Siebrand Mazeland [Wed, 15 Jun 2011 11:12:36 +0000 (13:12 +0200)]
Update translator documentation per request of Nikerabbit.

13 years agoUpdate translator documentation and L10n.
Siebrand Mazeland [Fri, 10 Jun 2011 15:09:20 +0000 (17:09 +0200)]
Update translator documentation and L10n.

13 years agopass nickname into mail_send_sms_notice_address()
Evan Prodromou [Tue, 14 Jun 2011 15:33:52 +0000 (11:33 -0400)]
pass nickname into mail_send_sms_notice_address()

13 years agosuppress free email
Evan Prodromou [Fri, 10 Jun 2011 23:56:26 +0000 (19:56 -0400)]
suppress free email

13 years agoBetter handling for combined memcache identifiers
Evan Prodromou [Fri, 10 Jun 2011 23:13:33 +0000 (19:13 -0400)]
Better handling for combined memcache identifiers

13 years agohide errors when deleting cached status_network_tag keys
Evan Prodromou [Fri, 10 Jun 2011 22:57:17 +0000 (18:57 -0400)]
hide errors when deleting cached status_network_tag keys

13 years agotry to make it so Status_network_tag can go fingerpoken in Status_network's static...
Evan Prodromou [Fri, 10 Jun 2011 22:12:51 +0000 (18:12 -0400)]
try to make it so Status_network_tag can go fingerpoken in Status_network's static vars

13 years agoMerge branch '1.0.x' into testing
Evan Prodromou [Fri, 10 Jun 2011 21:46:44 +0000 (17:46 -0400)]
Merge branch '1.0.x' into testing

13 years agoremember to send confirmation email for registration
Evan Prodromou [Fri, 10 Jun 2011 21:46:35 +0000 (17:46 -0400)]
remember to send confirmation email for registration

13 years agoMerge branch '1.0.x' into testing
Evan Prodromou [Fri, 10 Jun 2011 20:51:07 +0000 (16:51 -0400)]
Merge branch '1.0.x' into testing

13 years agoMerge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
Evan Prodromou [Fri, 10 Jun 2011 20:50:33 +0000 (16:50 -0400)]
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

13 years agoMerge branch 'statusnetworkapi' into 1.0.x
Evan Prodromou [Fri, 10 Jun 2011 20:50:15 +0000 (16:50 -0400)]
Merge branch 'statusnetworkapi' into 1.0.x

13 years agoMake errors work correctly
Evan Prodromou [Fri, 10 Jun 2011 20:50:06 +0000 (16:50 -0400)]
Make errors work correctly

13 years agoFirst pass at complete global API
Evan Prodromou [Fri, 10 Jun 2011 19:51:30 +0000 (15:51 -0400)]
First pass at complete global API

13 years agoMerge remote branch 'origin/1.0.x' into 1.0.x
Samantha Doherty [Fri, 10 Jun 2011 00:24:09 +0000 (20:24 -0400)]
Merge remote branch 'origin/1.0.x' into 1.0.x

13 years agoStyle for SNOD company logo plugin temporarily goes here.
Samantha Doherty [Fri, 10 Jun 2011 00:22:18 +0000 (20:22 -0400)]
Style for SNOD company logo plugin temporarily goes here.

13 years agoAdd current class to selected menu items
Zach Copley [Thu, 9 Jun 2011 23:29:19 +0000 (19:29 -0400)]
Add current class to selected menu items

13 years agoAllow changing the site logo from the site admin panel
Zach Copley [Thu, 9 Jun 2011 21:05:17 +0000 (17:05 -0400)]
Allow changing the site logo from the site admin panel

13 years agoRip out user, group and site design customization code
Zach Copley [Thu, 9 Jun 2011 20:20:19 +0000 (16:20 -0400)]
Rip out user, group and site design customization code

Squashed commit of the following:

commit 0bcfb6535115ec0a11669420f8689aeedc417bc8
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 15:51:47 2011 -0400

    Remove design-related stuff from the API

commit 88da010256fbcaee1ff01d9507ea47d3225f2825
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 15:40:16 2011 -0400

    Mop up misc design related code

commit 11958b064745b797b4c9f9f4b7e8f65e4c82ce83
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 15:21:00 2011 -0400

    Remove Design DB_DataObject class and references to it in schema

commit f8540594728ce6ba4697eb21657ccb897a9fc127
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 13:15:54 2011 -0400

    Remove design-related actions and widgets

commit ddf7b4d425b88b58956b8be06047d2a3e0560bd2
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 13:10:57 2011 -0400

    Remove navigation / routing to design settings actions

commit e3f280f8780d99168edf37ef766956f281e9c5da
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 13:03:09 2011 -0400

    CurrentUserDesignAction -> Action

commit 6780b1a07e1375a7fa0fd48c8bf3109d9a12e33e
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 12:54:22 2011 -0400

    * GroupDesignAction -> GroupAction (new base class for group actions)

commit 2136377e895db274709a1d486f377f13946ccfd6
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 12:36:40 2011 -0400

    OwnerDesignAction -> Action

13 years agoMerge branch '1.0.x' into testing
Evan Prodromou [Thu, 9 Jun 2011 14:33:36 +0000 (10:33 -0400)]
Merge branch '1.0.x' into testing

13 years agoclear up whitespace in sendemailsummary
Evan Prodromou [Wed, 8 Jun 2011 20:33:06 +0000 (16:33 -0400)]
clear up whitespace in sendemailsummary