Evan Prodromou
46e0337348
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-04-05 13:29:02 -04:00
Evan Prodromou
2d2c134a1f
fix constructor error in FileNoticeStream
2011-04-05 13:28:41 -04:00
Samantha Doherty
f753258a74
Style for best QnA answer.
2011-04-05 13:23:41 -04:00
Evan Prodromou
36b331d469
Merge branch '1.0.x' into testing
...
Conflicts:
plugins/Event/RSVP.php
2011-04-05 13:16:28 -04:00
Evan Prodromou
7533c7cfe1
Revert "Paging fix for public timeline: drop replies from the stuff we pull in for the threaded web view."
...
This reverts commit 880661de4e
2011-04-05 12:53:49 -04:00
Samantha Doherty
5bc6a8c614
Style changes for privacy selectors and markers.
2011-04-05 12:38:15 -04:00
Evan Prodromou
6a7f3501e5
forgot other two files while minifying
2011-04-05 12:27:07 -04:00
Zach Copley
6954cb3508
QnA - Add ToSelector to new question
2011-04-05 09:12:54 -07:00
Evan Prodromou
ac24ed3dff
add checkbox initialization
2011-04-05 11:48:53 -04: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
Samantha Doherty
a02da55eac
A little more style for QnA.
2011-04-05 09:10:20 -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
Shashi Gowda
ced00cf0bd
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
2011-04-05 10:28:05 +05:30
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
797cd9ccd4
fix scope for replies to group-private notices
2011-04-04 22:34:47 -04: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
4fea746913
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
...
* '1.0.x' of gitorious.org:statusnet/mainline:
Style for QnA plugin.
2011-04-04 17:32:06 -07:00
Zach Copley
559a688e42
QnA - Add in stub js
2011-04-04 17:31:38 -07:00
Samantha Doherty
a3ba11a8ac
Style for QnA plugin.
2011-04-04 20:29:30 -04:00
Zach Copley
92156317b6
QnA - truncate long question titles in notice content
2011-04-04 17:04:13 -07:00
Zach Copley
7fb963bb42
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
...
* '1.0.x' of gitorious.org:statusnet/mainline:
force the reply to a notice to have the same scope
2011-04-04 15:29:53 -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
Evan Prodromou
229692be3a
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-04-04 18:20:45 -04:00
Evan Prodromou
eaa70d337d
force the reply to a notice to have the same scope
2011-04-04 18:13:28 -04:00
Zach Copley
9d18b57812
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
...
* '1.0.x' of gitorious.org:statusnet/mainline:
include protected flag for users in JSON or XML
Force group scope on notices sent to a private-only group
2011-04-04 15:09:29 -07:00
Zach Copley
9a371658bd
QnA - Rework output for notice stream
2011-04-04 15:08:47 -07:00
Evan Prodromou
ddbd4801e0
include protected flag for users in JSON or XML
2011-04-04 17:44:23 -04:00
Evan Prodromou
747748a0fa
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-04-04 17:35:34 -04:00
Zach Copley
e7124528a3
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
...
* '1.0.x' of gitorious.org:statusnet/mainline:
single flag for private groups
add force_scope flag to User_group
2011-04-04 14:33:55 -07:00
Evan Prodromou
660f1cd6b8
Force group scope on notices sent to a private-only group
...
For groups that require a private scope, we force every notice to be limited to group scope.
Changed the group-discovery code so we only get groups once -- regardless if they were provided or not.
2011-04-04 17:33:42 -04:00
Zach Copley
5193afb8bf
QnA - Allow closing questions
2011-04-04 14:33:20 -07:00
Evan Prodromou
b41c62a27c
single flag for private groups
2011-04-04 16:58:52 -04:00
Evan Prodromou
51dc0e1c9b
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-04-04 16:26:26 -04:00
Evan Prodromou
82a357947d
add force_scope flag to User_group
2011-04-04 16:24:43 -04: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
Shashi Gowda
57198a7464
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
...
Conflicts:
actions/tagother.php
lib/subscriberspeopleselftagcloudsection.php
lib/subscriptionspeopleselftagcloudsection.php
2011-04-04 13:26:27 +05:30
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
cdebd59970
L10n consistency tweak.
2011-04-04 01:08:11 +02:00
Siebrand Mazeland
34ed86981b
Fixes for an xgettext peculiarity.
2011-04-04 01:01:42 +02:00
