Evan Prodromou
36b331d469
Merge branch '1.0.x' into testing
...
Conflicts:
plugins/Event/RSVP.php
2011-04-05 13:16:28 -04:00
Zach Copley
6954cb3508
QnA - Add ToSelector to new question
2011-04-05 09:12:54 -07:00
Evan Prodromou
9018a118fa
add toselector to poll
2011-04-05 11:18:35 -04:00
Evan Prodromou
c0f63c9a69
add toselector to bookmark
2011-04-05 11:18:25 -04:00
Evan Prodromou
fff66e1ebb
move toselector out of <ul> in eventform
2011-04-05 11:18:10 -04:00
Zach Copley
5267f3d649
QnA - Better ajax response when making a new answer. Still not right. Needs to use threading.
2011-04-05 00:27:51 -07:00
Zach Copley
6c0bb0f35b
QnA
...
* Some bug fixes
* Better Question page
2011-04-04 23:58:35 -07:00
Zach Copley
cd7ab56874
QnA
...
* show number of answers on question notices
* change label on answer submit button to "Answer"
2011-04-04 22:05:43 -07:00
Zach Copley
984869e5fb
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
...
* '1.0.x' of gitorious.org:statusnet/mainline:
fix scope for replies to group-private notices
Direct events to users or groups
2011-04-04 21:37:22 -07:00
Zach Copley
338a75e12b
QnA - JavaScript to hide close and best buttons when clicked
2011-04-04 21:36:42 -07:00
Evan Prodromou
a9856e6550
Direct events to users or groups
2011-04-04 22:16:38 -04:00
Zach Copley
84b328450f
QnA - Whoops - this actually removes the unused function mentioned in the last commit
2011-04-04 18:06:29 -07:00
Zach Copley
559a688e42
QnA - Add in stub js
2011-04-04 17:31:38 -07:00
Zach Copley
92156317b6
QnA - truncate long question titles in notice content
2011-04-04 17:04:13 -07:00
Zach Copley
53c653038d
QnA - Don't output question-description if it's empty; Do output question-closed msg if question is closed
2011-04-04 15:28:28 -07:00
Zach Copley
9a371658bd
QnA - Rework output for notice stream
2011-04-04 15:08:47 -07:00
Zach Copley
5193afb8bf
QnA - Allow closing questions
2011-04-04 14:33:20 -07:00
Zach Copley
e6fd3fa038
QnA: Unify answer forms
2011-04-04 12:02:33 -07:00
Zach Copley
c4b9dc7a0f
Merge branch 'qna' into 1.0.x
...
* qna:
QnA - Allow answer revisions and marking a question as "best"
QnA - add best class to best answers
QnA - Better display of questions and answers in streams
QnA - save answer revisions and show # of revisions
2011-04-04 01:30:15 -07:00
Zach Copley
528d999ae7
QnA - Allow answer revisions and marking a question as "best"
2011-04-04 01:28:37 -07:00
Zach Copley
960aebdbc4
QnA - add best class to best answers
2011-04-03 17:25:44 -07:00
Zach Copley
bac112c244
QnA - Better display of questions and answers in streams
2011-04-03 16:57:59 -07:00
Siebrand Mazeland
e552993307
Fix incorrect substitution syntax.
2011-04-04 01:36:47 +02:00
Siebrand Mazeland
c50b06dd7e
Localisation updates from http://translatewiki.net .
2011-04-04 01:27:23 +02:00
Siebrand Mazeland
2dbdb0f185
Translator documentation updated/added.
...
i18n tweaks.
Superfluous whitespace removed.
YAY! All StatusNet core messages in the 1.0.x branch have been documented at this point in time!!!
2011-04-04 00:41:48 +02:00
Siebrand Mazeland
09523a19d7
Localisation updates from http://translatewiki.net .
2011-04-03 15:35:52 +02:00
Siebrand Mazeland
527151c5ef
L10n/i18n tweaks.
2011-04-03 15:06:52 +02:00
Zach Copley
8e086d5a90
QnA - save answer revisions and show # of revisions
2011-04-02 00:00:27 -07:00
Siebrand Mazeland
d2a2575648
Localisation updates from http://translatewiki.net .
2011-04-01 22:59:31 +02:00
Siebrand Mazeland
bf75ae8f9b
L10n tweaks.
2011-04-01 22:35:23 +02:00
Siebrand Mazeland
ade7172a25
L10n/i18n updates.
2011-04-01 22:32:56 +02:00
Siebrand Mazeland
6c9554ddb2
L10n updates.
2011-04-01 22:27:35 +02:00
Siebrand Mazeland
5a34d26b98
i18n/L10n updates.
2011-04-01 22:20:25 +02:00
Siebrand Mazeland
8bf3424532
Fix incorrect translator documentation.
2011-04-01 22:14:43 +02:00
Siebrand Mazeland
308a761e5b
Fix typo in message.
2011-04-01 22:12:39 +02:00
Siebrand Mazeland
6e67eb3b81
Many i18n and L10n updates.
2011-04-01 22:08:38 +02:00
Siebrand Mazeland
969d80f270
Fix i18n issues and bugs in string replacement.
2011-04-01 21:56:55 +02:00
Siebrand Mazeland
62eed1e23e
Fix i18n issues.
...
Fix incorrect variable usage in messages.
2011-04-01 19:55:15 +02:00
Zach Copley
1e73ba00bd
Merge branch 'qna' into 1.0.x
...
* qna:
Some work towards allowing revisions
Make new answers work
More plumbing
Work on QnA notice display -- in progress
* Move stuff around again * Make answers save
* Fix plugin filename * Make questions save!
Renamed QuestionAndAnswerPlugin to QnAPlugin
Most objects and forms are in place, now I just have to make it work.
Skeleton / Stub for Question and Answers micro-app plugin
2011-04-01 02:37:32 -07:00
Zach Copley
9cea85065c
Some work towards allowing revisions
2011-04-01 02:35:05 -07:00
Siebrand Mazeland
4ac471f380
Localisation updates from http://translatewiki.net .
2011-03-31 23:30:07 +02:00
Zach Copley
eeff6285ae
Make new answers work
2011-03-31 09:58:26 -07:00
Brion Vibber
24945715d0
Provisional fix for ticket #3108 : Facebook bridge sends "likes" as the notice's original poster instead of as the person doing the liking.
...
Adds optional $profile parameter for Facebookclient constructor and uses that for the foreign_link lookup if provided instead of the notice's poster.
2011-03-30 17:02:40 -07:00
Siebrand Mazeland
14456cbbb2
Fix gettext domain for messages in plugins "_()" to "_m()".
...
Some other i18n and L10n updates, too.
i18n/L10n review not complete.
2011-03-30 22:31:23 +02:00
Brion Vibber
0ac0925309
Fix timestamps in fallback content for EventPlugin
...
A bunch of the common_* functions for date formatting expect an interpretable string, rather than a Unix timestamp, as input. Switched to using the DB-formatted timestamps as we put them into the object rather than the unix timestamp intermediate value when formatting the plaintext and HTML fallback content.
2011-03-30 12:50:56 -07:00
Brion Vibber
d2cd5b3353
Tweak which should fix ActivityStreams output for Twitter profiles (if remote_profile entries didn't match, we ended up losing id/URI).
...
Explicitly uses the Twitter profile URL as profile URI if matching, without having to check the db.
2011-03-30 11:22:32 -07:00
Zach Copley
7669bed9f3
More plumbing
2011-03-30 10:33:15 -07:00
Brion Vibber
1c63ae29fe
typo fix in format string
2011-03-29 17:00:00 -07:00
Brion Vibber
20ca5027cc
Consolidate common code in micro-apps custom notice type display actions.
...
The ShowNoticeAction subclasses were cut-n-pasting a lot of prepare() code from ShowNoticeAction, though the only part that's different is how we look up the notice. Broke that out to a getNotice() method, so only that needs to be copied. Avoids extra copies of permission checks and other common code in this spot.
2011-03-29 16:58:15 -07:00
Brion Vibber
23436ad83d
Fix for bookmark posting: missing object was causing error output to crush ajax
2011-03-29 16:50:06 -07:00