Evan Prodromou
138ca38b6f
Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x
...
Conflicts:
plugins/EmailRegistration/emailregister.php
2011-04-18 20:19:25 -04:00
Zach Copley
bc66211565
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
...
* '1.0.x' of gitorious.org:statusnet/mainline:
Update translator documentation.
2011-04-18 16:51:49 -07:00
Zach Copley
a4077d472f
Just had to update util.min.js one more time for extra merge conflict fun!
2011-04-18 16:50:02 -07:00
Zach Copley
76ea9384a3
Remove billions of debugging statements and extra space
2011-04-18 16:49:32 -07:00
Zach Copley
ee799927e6
Fixed new answer textarea label
2011-04-18 16:49:32 -07:00
Zach Copley
c79d90be27
Only remove reply placeholders if the dummy answer field is visible
2011-04-18 16:49:32 -07:00
Zach Copley
5721bb146a
Add a 'closed' class to questions that have been closed
2011-04-18 16:49:32 -07:00
Zach Copley
68f6076831
OMG I think ajax works right now
2011-04-18 16:49:32 -07:00
Zach Copley
583b903559
More work trying to understand util.js and get my ajax working right
2011-04-18 16:49:00 -07:00
Zach Copley
d1443a6bd9
Getting some traction here on better QnA Ajax
2011-04-18 16:47:33 -07:00
Zach Copley
a610836e1c
Better QnA ajax insert - work in progress
2011-04-18 16:47:01 -07:00
Zach Copley
6bf29ff684
QnA - Work on getting questions and answers to appear correctly inline
2011-04-18 16:46:11 -07:00
Evan Prodromou
997b0933ea
Don't use bogus event in emailregistration
...
I was trying to be smart by calling the same registration event as 'register'
when doing EmailRegistration. However, that event is so low-bandwidth that plugins
go fingerpoken in all the attributes and call methods on the passed-in action and
things like that.
So, now we just fall back to using the low-level stuff, catch any
exceptions, and feel happy. Some stuff might not work, but it's
generally anti-spam stuff more suited to public sites.
2011-04-18 19:33:12 -04:00
Evan Prodromou
1619578818
fix bad variable, show frame length
2011-04-18 19:33:00 -04:00
Siebrand Mazeland
2c105e5575
Update translator documentation.
2011-04-19 01:13:28 +02:00
Evan Prodromou
73f4762a55
Don't serialize protected attrs
2011-04-18 18:23:06 -04:00
Evan Prodromou
3fd6b9d474
capture some info if serialization fails on stomp frame
2011-04-18 17:55:38 -04:00
Evan Prodromou
21c16b2e92
don't show display URL if avatar filename is missing
2011-04-18 16:59:17 -04:00
Evan Prodromou
2757bd8428
Revert "put some debugging code into the home and public timelines"
...
This reverts commit aa7b6447a1
2011-04-18 16:43:54 -04:00
Evan Prodromou
98b3f5ea91
no extra nulls on home page
2011-04-18 16:28:41 -04:00
Evan Prodromou
aa7b6447a1
put some debugging code into the home and public timelines
2011-04-18 16:20:51 -04:00
Evan Prodromou
b81ddc70df
correct category on inboxnoticestream
2011-04-18 16:19:15 -04:00
Evan Prodromou
7a333e3175
recover password uses login menu
2011-04-18 16:19:00 -04:00
Evan Prodromou
9346d50102
inviter URL corrected
2011-04-18 13:40:27 -04:00
Evan Prodromou
17424f49cd
better indenting in invite email
2011-04-18 13:37:54 -04:00
Evan Prodromou
25985ec6cb
linkify URLs in invite email
2011-04-18 13:30:02 -04:00
Evan Prodromou
122b38f354
check for valid email on invite
2011-04-18 13:26:46 -04:00
Evan Prodromou
d3215adfa1
Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x
2011-04-18 12:54:23 -04:00
Samantha Doherty
47ae0e31c7
New and hopefully correct util.min.js.
2011-04-18 12:44:57 -04:00
Samantha Doherty
e8e6d494d2
This util.min.js is pining for the fjords.
2011-04-18 12:42:00 -04:00
Samantha Doherty
45a2fdefea
Style updates for notice forms.
2011-04-18 11:51:38 -04:00
Samantha Doherty
027cdd4620
Need to be a little more specific about infield input labels.
2011-04-18 11:45:02 -04:00
Evan Prodromou
36b34ea831
correct password form fields
2011-04-18 11:02:16 -04:00
Evan Prodromou
90a66b61d3
correct password form fields
2011-04-18 11:01:58 -04:00
Evan Prodromou
fc89006e56
better output for registration confirmation
2011-04-18 10:52:57 -04:00
Evan Prodromou
2019d32b3d
let other validity checks go through first
2011-04-18 10:46:40 -04:00
Evan Prodromou
55ebddb5fd
catch exceptions and show them when validating email
2011-04-18 10:44:55 -04:00
Evan Prodromou
dfbb4eaa89
check for email domain when validating email
2011-04-18 10:44:41 -04:00
Evan Prodromou
c5671d7090
fix incorrect variable in registration
2011-04-18 10:15:18 -04:00
Evan Prodromou
3f238e4e16
redirect if you're already logged in.
2011-04-18 10:13:54 -04:00
Evan Prodromou
17adc94df7
DocFile::fromTitle() -> DocFile::forTitle()
2011-04-18 10:10:38 -04:00
Evan Prodromou
9e7b880df7
Revert "disable showing tags; it throws a notice for me"
...
This reverts commit 7d6efbf29e
2011-04-18 10:08:26 -04:00
Evan Prodromou
c30dcbebbc
no notice form on invites
2011-04-18 10:04:57 -04:00
Evan Prodromou
7d6efbf29e
disable showing tags; it throws a notice for me
2011-04-18 10:03:38 -04:00
Evan Prodromou
28d0d9caad
loop through args in common_markup_to_html
2011-04-18 09:51:26 -04:00
Evan Prodromou
b72788d9ce
pass args from Docfile to renderer
2011-04-18 09:47:08 -04:00
Evan Prodromou
213086cc1f
add login menu to email registration page
2011-04-18 09:22:51 -04:00
Evan Prodromou
4a8a424bdf
Use mail templates for invite text
2011-04-18 09:04:11 -04:00
Evan Prodromou
99d538af58
docfiles can take arguments
2011-04-18 09:03:43 -04:00
Evan Prodromou
551a4e8324
mail paths for docfile
2011-04-18 09:03:28 -04:00
