Commit Graph

13181 Commits

Author SHA1 Message Date
Brion Vibber
14a6ab2b04 Refactoring on notification mail generation: common profile & footer chunks pulled out, notifications added for group joins. 2011-03-22 16:50:27 -07:00
Evan Prodromou
fd8dad3963 Merge branch 'limitdist' of gitorious.org:~evan/statusnet/evans-mainline into limitdist
Conflicts:
	classes/Notice.php
2011-03-22 18:17:09 -04:00
Evan Prodromou
31e7d46a5b add profile to stream function 2011-03-22 18:15:53 -04:00
Brion Vibber
a12680e8d5 Fix typo in cf45c978 2011-03-22 14:20:21 -07:00
Evan Prodromou
26a4bd7dbf move scope check to Notice so we can have a null profile 2011-03-22 11:56:28 -04:00
Evan Prodromou
7fc5679e7e function for checking scope rules for Profile 2011-03-22 11:56:28 -04:00
Evan Prodromou
6cdbe47e72 add scope flags for Notice 2011-03-22 11:56:28 -04:00
Evan Prodromou
7f74aa6c20 Add scope bitmap for notices 2011-03-22 11:56:28 -04:00
Evan Prodromou
83fb5e6023 Mass replacement of #-comments with //-comments
like leprous boils in our code. So, I've replaced all of them with //
comments instead. It's a massive, meaningless, and potentially buggy
change -- great one for the middle of a release cycle, eh?
2011-03-22 11:54:23 -04:00
Shashi Gowda
f81aaa5375 Blend people tags UI into the new theme! 2011-03-22 12:18:12 +05:30
Zach Copley
7f4bd6b69f Work on QnA notice display -- in progress 2011-03-21 20:57:19 -07:00
Shashi Gowda
13e9e41d2f Blend in with some new code. New menus, etc. 2011-03-22 08:30:16 +05:30
Shashi Gowda
bf121a695a Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
Conflicts:
	classes/Profile.php
2011-03-22 07:59:06 +05:30
Shashi Gowda
31c1177970 Merge branch '1.0.x' into people_tags_rebase
Conflicts:
	EVENTS.txt
	actions/peopletag.php
	actions/tagother.php
	classes/Notice.php
	js/util.js
	js/util.min.js
	lib/accountprofileblock.php
	lib/action.php
	lib/activityobject.php
	lib/command.php
	lib/personalgroupnav.php
	plugins/OStatus/OStatusPlugin.php
2011-03-22 07:56:25 +05:30
Brion Vibber
61960d3668 Add pending members list to group navigation, if group has joins moderated or if it has pending requests open 2011-03-21 17:23:13 -07:00
Brion Vibber
942887ca8c Split up some list/form classes, and get the 'approve' and 'cancel' links on group member queue working. 2011-03-21 17:17:18 -07:00
Zach Copley
b0ed4cb89a * Move stuff around again
* Make answers save
2011-03-21 16:51:38 -07:00
Brion Vibber
6bdb1053ad Pending members queue list -- doesn't yet allow approval. 2011-03-21 16:40:10 -07:00
Brion Vibber
471a480587 Logic to have group joins turn into pending joins automatically when group is set to mod; allow users to cancel their pending group requests. 2011-03-21 16:26:41 -07:00
Zach Copley
73c3344cc3 * Fix plugin filename
* Make questions save!
2011-03-21 15:50:36 -07:00
Brion Vibber
a54eb0941e Tweaking request_queue -> group_join_queue, easier to deal with the indexes and keys and caching this way. 2011-03-21 15:05:36 -07:00
Brion Vibber
541dfa04fe Switch things from calling Group_member::join & leave & calling events manually to running through Profile::joinGroup() && Profile::leaveGroup(), with the events encapsulated. 2011-03-21 14:35:29 -07:00
Brion Vibber
0bec9cfdbc Add request_queue table and user_group.join_policy column, for upcoming join & subscription moderation.
UI for setting the join policy is in, but not yet used.
2011-03-21 13:51:13 -07:00
Brion Vibber
01ecca5e60 remove type hinting -- fails when ArrayWrapper gets passed in some profile list pages 2011-03-21 11:20:16 -07:00
Evan Prodromou
0a71622aa7 Widget automatically delegates unimplemented methods to attribute 2011-03-21 11:09:16 -04:00
Samantha Doherty
fac0d8496e Few IE fixes for neo theme. 2011-03-21 09:16:00 -04:00
Zach Copley
424670a5eb Merge branch '1.0.x' into qna
* 1.0.x:
  Remove stray get_class() call
2011-03-20 19:38:05 -07:00
Zach Copley
fc0ed76ebd Remove stray get_class() call 2011-03-20 19:37:25 -07:00
Zach Copley
f9cf1dddfe Merge branch '1.0.x' into qna
* 1.0.x: (23 commits)
  ModPlus plugin -- Ticket #3095: add remote profile options popup to group membership and other profile lists
  fix ModPlus 'remote profile options' popup for Realtime
  Fixes for GroupPrivateMessage, OStatus due to changes in group output events, and some internal bugs using wrong vars
  Tickets #1610, #1949: show permalinks on Popular Notices, attachments aside sections
  Localisation updates from http://translatewiki.net.
  Translator documentation added/updated. Superfluous whitespace removed. L10n update.
  Add myself to contributors array.
  i18n updates. Translator documentation added. Superfluous whitespace removed.
  Translator documentation added/updated. i18n updates. Superfluous whitespace removed.
  Fixed issues with plural handling. L10n/I18n updates. Translator documentation added. Superfluous whitespace removed.
  Translator documentation added/updates. L10n/i18n updates. Superfluous whitespace removed.
  Update/add translator documentation. L10n/i18n updates. Superfluous whitespace removed.
  * Add FIXME: $profile appears to be undefined. * Update translator documentation.
  Caching for conversation root lookup, some logic fixes in threaded view
  Use cached sources for favorites & repeats info on threaded notice lists
  ajax load for additional inline replies; /replies variant of conversationview
  Fixes for race conditions between Realtime plugin and the AJAX display of inline replies.
  Initial use of inline reply area for marking repeats...
  Initial inline listing of favoriters
  Favored lists in progress: 'foo, bar and baz'
  ...
2011-03-20 19:25:32 -07:00
Zach Copley
2167454eb2 Renamed QuestionAndAnswerPlugin to QnAPlugin 2011-03-20 19:24:35 -07:00
Brion Vibber
e6afd16c02 ModPlus plugin -- Ticket #3095: add remote profile options popup to group membership and other profile lists
Popup remote profile options menu now shown on profile lists as well as notice lists.
2011-03-18 16:35:50 -07:00
Brion Vibber
0ea360c498 fix ModPlus 'remote profile options' popup for Realtime
Switched from one-time setup to live stuff that'll work without per-notice setup.
Used to not matter because Realtime wouldn't include the extra stuff, but new Realtime pulls the full rendering, so yay!
2011-03-18 16:23:22 -07:00
Brion Vibber
a390e3e888 Fixes for GroupPrivateMessage, OStatus due to changes in group output events, and some internal bugs using wrong vars 2011-03-18 15:00:02 -07:00
Brion Vibber
ab6a168d68 Merge branch 'more' into 1.0.x 2011-03-18 14:06:32 -07:00
Brion Vibber
4874ab0e7d Tickets #1610, #1949: show permalinks on Popular Notices, attachments aside sections
These mini notice lists were previously not actually showing links to the notices, making them hard to use. There was code to output a link, but it had been unused due to the config options triggering it not being set. The links also looked bad ("( see )" with bad spacing).
Replaced that code with a call into NoticeListItem's existing code to format a relative timestamp with the notice permalink, which looks nice. Used a div rather than p to avoid clearing the float, so it flows nicely.
2011-03-18 13:58:13 -07:00
Siebrand Mazeland
5bb6fae307 Localisation updates from http://translatewiki.net. 2011-03-18 20:59:45 +01:00
Siebrand Mazeland
84e5ca6158 Translator documentation added/updated.
Superfluous whitespace removed.
L10n update.
2011-03-18 20:37:04 +01:00
Siebrand Mazeland
902990bb72 Add myself to contributors array. 2011-03-18 20:15:57 +01:00
Siebrand Mazeland
7ef8bd9275 i18n updates.
Translator documentation added.
Superfluous whitespace removed.
2011-03-18 20:12:59 +01:00
Siebrand Mazeland
a4e334a0ba Translator documentation added/updated.
i18n updates.
Superfluous whitespace removed.
2011-03-18 18:03:41 +01:00
Siebrand Mazeland
cf45c978d9 Fixed issues with plural handling.
L10n/I18n updates.
Translator documentation added.
Superfluous whitespace removed.
2011-03-18 17:59:51 +01:00
Siebrand Mazeland
8a2002afe7 Translator documentation added/updates.
L10n/i18n updates.
Superfluous whitespace removed.
2011-03-18 17:04:38 +01:00
Siebrand Mazeland
b7178d2197 Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline into 1.0.x 2011-03-18 16:09:27 +01:00
Siebrand Mazeland
0de0ae2f48 Update/add translator documentation.
L10n/i18n updates.
Superfluous whitespace removed.
2011-03-18 13:48:47 +01:00
Siebrand Mazeland
6f9c277494 * Add FIXME: $profile appears to be undefined.
* Update translator documentation.
2011-03-18 13:10:55 +01:00
Zach Copley
46793caf4b Most objects and forms are in place, now I just have to make it work. 2011-03-17 17:43:13 -07:00
Brion Vibber
90a7631592 Caching for conversation root lookup, some logic fixes in threaded view 2011-03-17 17:36:53 -07:00
Brion Vibber
0c2c73659c Use cached sources for favorites & repeats info on threaded notice lists 2011-03-17 17:06:04 -07:00
Brion Vibber
4afa3caae3 ajax load for additional inline replies; /replies variant of conversationview 2011-03-17 16:27:42 -07:00
Brion Vibber
057a831026 Fixes for race conditions between Realtime plugin and the AJAX display of inline replies.
* keep the notice-reply-placeholder around, but hidden
* insert things before the placeholder, rather than appending to the end of the list.
* append the active form after the hidden placeholder, so things inserted before the placeholder never come after it
* Realtime: check pre-existing notice visibility a second time after loading the HTML for a notice. Fixes bug where sometimes your own post would be shown twice because the Realtime notification arrived before the AJAX posting returned, but Realtime's AJAX fetch of the notice returned after.
2011-03-17 15:54:40 -07:00