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
aab265709a
use old-style plugin initializers as fallback for GoogleAnalytics
2011-06-20 17:07:17 -04:00
Evan Prodromou
c4fc69ad2a
use async, domain-aware GoogleAnalytics JS
2011-06-20 17:07:02 -04: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
Siebrand Mazeland
59ee7e0f5b
Translator documentation updated.
...
Whitespace updates.
2011-06-17 22:36:29 +02:00
Siebrand Mazeland
dbde94fc34
Whitespace updates.
2011-06-17 22:36:28 +02:00
Siebrand Mazeland
2906f97dd9
Fix i18n for some very visible UI messages.
2011-06-17 22:36:26 +02:00
Evan Prodromou
4989fc72d2
Merge branch '1.0.x' into testing
2011-06-17 09:29:53 -04:00
Zach Copley
a35392da2f
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
2011-06-17 02:24:34 -07:00
Siebrand Mazeland
bbb240e47e
Update translator documentation.
...
Whitespace updates.
Line break changes in README.
i18n updates.
2011-06-15 13:25:43 +02:00
Evan Prodromou
820e7586ec
suppress free email
2011-06-10 19:56:26 -04:00
Evan Prodromou
527ed62f3f
Merge branch '1.0.x' into testing
2011-06-10 17:46:44 -04:00
Evan Prodromou
f294ed0091
remember to send confirmation email for registration
2011-06-10 17:46:35 -04:00
Evan Prodromou
8b47400183
Merge branch '1.0.x' into testing
2011-06-10 16:51:07 -04:00
Evan Prodromou
c227045975
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-06-10 16:50:33 -04:00
Evan Prodromou
331d8a99ba
Merge branch 'statusnetworkapi' into 1.0.x
2011-06-10 16:50:15 -04:00
Evan Prodromou
625e63a303
Make errors work correctly
2011-06-10 16:50:06 -04:00
Evan Prodromou
2d72a64841
First pass at complete global API
2011-06-10 15:51:30 -04:00
Zach Copley
36d619480a
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
2011-06-09 16:20:19 -04:00
Evan Prodromou
fdee419051
Merge branch '1.0.x' into testing
2011-06-09 10:33:36 -04:00
Evan Prodromou
ed61a217a2
clear up whitespace in sendemailsummary
2011-06-08 16:33:06 -04:00
Samantha Doherty
c6d6749d6f
Only unbind privacy checkbox when actually on mobile profile, oops.
2011-06-08 15:59:05 -04:00
Evan Prodromou
c9756872bc
Wrap email summary and better subject line
2011-06-08 15:23:41 -04:00
Evan Prodromou
ba219fa805
include a dummy non-empty value for sitesum queue items
2011-06-08 08:46:44 -04:00
Evan Prodromou
65005d35ce
correct transport for usersum
2011-06-08 08:46:21 -04:00
Evan Prodromou
40cfc5490a
fix the streams for email summary
2011-06-07 17:38:24 -04:00
Evan Prodromou
a10edb3183
Merge branch 'testing' into 1.0.x
...
Conflicts:
plugins/Directory/locale/mk/LC_MESSAGES/Directory.po
plugins/Directory/locale/tl/LC_MESSAGES/Directory.po
2011-06-07 16:04:49 -04:00
Evan Prodromou
59c980cea8
first pass at actions for initializing a network
2011-06-07 12:06:02 -04:00
Evan Prodromou
17294a4627
move email registration code to DomainStatusNetworkPlugin
2011-06-06 12:25:26 -04:00
Siebrand Mazeland
31a92ede44
Update translator documentation.
...
i18n/L10n updates.
Whitespace update.
2011-06-06 00:38:38 +02:00
Siebrand Mazeland
f007bcee16
Add translator documentation.
2011-06-06 00:37:10 +02:00
Siebrand Mazeland
9358a34384
Add translator documentation.
2011-06-06 00:36:50 +02:00
Siebrand Mazeland
ff33d0ff35
Add onPluginVersion().
...
Add translator documentation.
Whitespace update.
Add FIXME for global functions.
2011-06-06 00:36:31 +02:00
Siebrand Mazeland
9a59d44208
Add translator documentation.
...
L10n update.
Whitespace update.
2011-06-06 00:35:40 +02:00
Siebrand Mazeland
c11a549071
Add translator documentation.
2011-06-06 00:35:12 +02:00
Siebrand Mazeland
2b3b11fca6
Add translator documentation.
2011-06-06 00:34:57 +02:00
Siebrand Mazeland
c3f081c583
Localisation updates from http://translatewiki.net .
2011-06-05 21:15:31 +02:00
Siebrand Mazeland
acc4d8b1c3
Use language specific truncation symbol.
...
Add translator documentation.
2011-06-05 20:51:50 +02:00
Siebrand Mazeland
49eb66c57e
Update translator documentation.
...
Whitespace updates.
i18n/L10n updates.
2011-06-05 20:42:11 +02:00
Siebrand Mazeland
8807705bb4
Update translator documentation and whitespace.
2011-06-05 20:23:13 +02:00
Siebrand Mazeland
4110266b68
Update translator documentation.
...
i18n/L10n fixes.
Whitespace updates.
2011-06-05 20:15:01 +02:00
Siebrand Mazeland
8ce0acca33
Add translator documentation.
2011-06-05 19:59:50 +02:00
Siebrand Mazeland
158140a118
Add translator documentation.
...
Whitespace updates.
i18n fixes.
2011-06-05 19:58:11 +02:00
Siebrand Mazeland
fdca686298
Update translator documentation.
...
Update whitespace.
2011-06-05 19:46:45 +02:00
Siebrand Mazeland
59006ffee1
Update translator documentation.
2011-06-05 19:40:25 +02:00
Siebrand Mazeland
eb0fb9c2b7
Add todo. URLs are outdated.
2011-06-05 19:39:59 +02:00
Siebrand Mazeland
0cca861ea7
Update translator documentation.
...
L10n fixes.
Whitespace updates.
2011-06-05 19:33:41 +02:00
Siebrand Mazeland
b4efd97c62
Add translator documentation.
2011-06-05 19:30:04 +02:00
Siebrand Mazeland
b0e80d1e28
Fix xgettext translator comment.
2011-06-05 19:27:42 +02:00
Siebrand Mazeland
9e78c631fb
Fix plural issue.
...
Fix translator documentation.
2011-06-05 19:23:35 +02:00
Siebrand Mazeland
7c5fb37e59
Localisation updates from http://translatewiki.net .
2011-06-05 11:50:05 +02:00
Siebrand Mazeland
834ed4365d
Fix i18n.
...
Update translator documentation.
2011-06-05 11:44:01 +02:00
Siebrand Mazeland
a4e807ea46
Add translator documentation.
2011-06-05 11:35:11 +02:00
Siebrand Mazeland
9f9f940833
Add translator documentation.
...
Change a few double quotes to single quotes.
2011-06-05 11:30:46 +02:00
Siebrand Mazeland
9baa02fc7c
Add translator documentation.
2011-06-05 11:22:56 +02:00
Siebrand Mazeland
3dcdf2ef03
Update translator documentation.
2011-06-05 11:12:34 +02:00
Siebrand Mazeland
9758134d1a
Update translator documentation.
...
Update whitespace.
L10n/i18n updates.
2011-06-05 11:06:47 +02:00
Evan Prodromou
e1791525e8
initialize schema_version table after install
2011-06-02 13:58:53 -04:00
Evan Prodromou
7f1a30dc40
allow setting some initial tags on a new network
2011-06-01 10:53:46 -04:00
Evan Prodromou
f4e17c1bdf
Merge branch '1.0.x' into testing
2011-05-31 17:16:45 -04:00
Brion Vibber
712ba64fa6
Apply upstream fix to MSN library for darkip
...
Upstream fix
http://code.google.com/p/phpmsnclass/source/diff?spec=svn52&old=47&r=52&format=unidiff&path=%2Ftrunk%2Fphpmsnclassv2%2Fmsn.class.php
2011-05-31 11:46:50 -07:00
Samantha Doherty
a026608953
Only use mobile doctype on actual mobile devices.
2011-05-31 12:14:26 -04:00
Evan Prodromou
412adfb587
Merge branch '1.0.x' into testing
2011-05-30 15:37:46 -04:00
Samantha Doherty
70f01b2b34
Remove privacy checkbox replacement from Mobile Profile.
2011-05-27 11:50:49 -04:00
Evan Prodromou
b34e267e53
Merge branch '1.0.x' into testing
...
Conflicts:
plugins/EmailRegistration/scripts/cancelemailregistration.php
2011-05-23 18:20:18 -04:00
Evan Prodromou
fd847c29c5
Make emailregistration more invitation-friendly
2011-05-23 17:45:41 -04:00
Evan Prodromou
86a7889012
render question description in QnA plugin
2011-05-23 12:33:16 -04:00
Evan Prodromou
f1772b75d5
render question description in QnA plugin
2011-05-23 12:30:34 -04:00
Evan Prodromou
3f3babbcf2
Merge remote-tracking branch 'origin/1.0.x' into 1.0.x
2011-05-23 12:29:08 -04:00
Siebrand Mazeland
def0483c5e
Small change to kick syntax highlighter into shape.
2011-05-20 16:58:02 +02:00
Siebrand Mazeland
e48c26e156
Update translator documentation, i18n and L10n.
2011-05-20 16:57:05 +02:00
Siebrand Mazeland
3501ad6c77
Add FIXME for missing i18n.
2011-05-20 16:56:12 +02:00
Siebrand Mazeland
1d1a929718
Update translator documentation and L10n.
2011-05-20 16:03:53 +02:00
Evan Prodromou
9c4c2c710f
remove stray newlines that were causing problems with the build
2011-05-20 06:08:42 -07:00
Evan Prodromou
b9f8e6e8cc
fail quickly if we can't find a for DomainStatusNetwork
2011-05-19 15:30:38 -04:00
Samantha Doherty
2a0dc2291d
Toggle to show and hide local nav.
2011-05-18 11:08:31 -04:00
Samantha Doherty
e3acf5b72b
Remove primary nav and notice form overrides, and extra notice forms, from MobileProfile.
2011-05-18 10:13:06 -04:00
Zach Copley
73251c7629
Script to cancel an email registration
2011-05-16 13:37:55 -07:00
Zach Copley
4718063a78
Script to cancel an email registration
2011-05-16 13:25:26 -07:00
Zach Copley
125141a0c6
Make the effects for adding/removing invites less jerky
2011-05-11 17:20:24 -07:00
Zach Copley
4a04291c16
Make add/remove item buttons work the same way they do on the extended profile form
2011-05-11 16:29:35 -07:00
Zach Copley
607fa56449
Don't add the user's domain to invitee domains unless it's on the whitelist
2011-05-11 16:19:51 -07:00
Zach Copley
84c8ffc28a
Show confirm dialog when deleting an invite (if the user has already entered an email address)
2011-05-11 16:00:35 -07:00
Zach Copley
04a593487a
Change whitelist invite form's add new item control to be consistent with similar controls elsewhere
2011-05-11 14:33:22 -07:00