wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,698 Commits 8 Branches 0 Tags 330 MiB
f81aaa5375
Commit Graph

2987 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Brion Vibber
4afa3caae3 ajax load for additional inline replies; /replies variant of conversationview 2011-03-17 16:27:42 -07:00
Siebrand Mazeland
b74a7d7a75 Change email to SMS. Spotted by Nikerabbit. 2011-03-17 13:59:22 +01:00
Siebrand Mazeland
9785140da5 Update translator documentation. 
L10n/i18n updates.
Superfluous whitespace removed.
 2011-03-17 11:46:49 +01:00
Brion Vibber
0bf40bd748 Output avatar/author along with ProfileNoticeListItem items on ShowProfileAction -- they get hidden in CSS anyway, and we need the author data for the inline reply form if you end up replying to yourself/someone else from a profile stream view. 
Note that the other modification -- of the repeat line -- is still going to be inconsistent between things originally on the page and anything that comes over Realtime.
 2011-03-16 14:54:14 -07:00
Brion Vibber
5ec018ca19 Fix tag nesting bug on group page 2011-03-16 10:58:18 -07:00
Evan Prodromou
9b4533058c no profileblock on login actions 2011-03-16 10:05:07 -04:00
Evan Prodromou
bbba1f6e16 Show group actions in profile block 2011-03-16 09:57:10 -04:00
Evan Prodromou
2d4554ea03 Remove UserProfile class 2011-03-16 09:57:10 -04:00
Evan Prodromou
561458650f profile group uses account profile block 2011-03-16 09:57:09 -04:00
Brion Vibber
08b430a247 Event hook for notice search pages 2011-03-15 15:33:37 -07:00
Brion Vibber
9e9cbdf505 Suppress PHP warnings/notices during AtomPub XML parsing to avoid HTTP header problems when given bad input. 
If display_errors is on, typical settings would cause PHP error messages to spew to output before the HTTP headers for setting a 400 error go through.
Also switched from deprecated static DOMDocument::loadXML() to non-static call.
 2011-03-15 10:09:20 -07:00
Brion Vibber
34e7d8ddf2 For good measure; trip short error mode in earlier on ajax shownotice 2011-03-14 13:44:39 -07:00
Brion Vibber
c7e7cc79da 'ajax' param on shownotice action so we can pull items in full html version for realtime 2011-03-14 13:05:30 -07:00
Siebrand Mazeland
eaef01233a Fix incorrect parameter documentation. Spotted by Nikerabbit. 2011-03-14 18:01:22 +01:00
Siebrand Mazeland
e2defc1f7c * update/add translator documentation. 
* remove superfluous whitespace.
* minor updates to L10n/i18n.
 2011-03-11 17:07:27 +01:00
Zach Copley
a984aae564 Show a reasonable error message when an image is bad, instead of 
letting the exception continue bubbling up.
 2011-03-10 15:18:14 -08:00
Brion Vibber
e74590d414 Ticket #3076: fix regression in password recovery when email address given that doesn't match 
Was triggering errors due to use of common_canonical_nickname() on arbitrary input without checking for exceptions about invalid nicknames (which didn't exist long ago in the before time)
 2011-03-09 15:46:24 -08:00
Evan Prodromou
a4b3edaf40 Login actions don't show the notice form 2011-03-09 10:11:59 -05:00
Brion Vibber
5b0ca315b4 'note' -> 'notice' in an error message -- thx to AVRS on IRC for the catch on translatewiki.net :D 2011-03-08 10:58:14 -08:00
Evan Prodromou
55b4303ea4 Merge branch '3cl' into 1.0.x 2011-03-07 14:30:30 -05:00
Shashi Gowda
382e4d2cdb people tag actions 2011-03-07 00:43:31 +05:30
Shashi Gowda
371e923c37 Twitter lists compatible people tags api 2011-03-07 00:36:06 +05:30
Siebrand Mazeland
e9933871e5 * fix i18n and L10n issues. 
* update translator documentation.
* remove superfluous whitespace.
 2011-03-05 17:03:12 +01:00
Siebrand Mazeland
a127ba78a8 * translator documentation updated. 
* superfluous whitespace removed.
* small refactoring in noticeform.php to allow proper translator hints.
 2011-03-05 00:24:19 +01:00
Siebrand Mazeland
b37e12ed34 * translator documntation updated 
* superfluous whitespace remove
* minor L10n and i18n updates
 2011-03-05 00:13:04 +01:00
Brion Vibber
9689bda21c Loading the original form instead of faking up our own. Sorta works but not pretty :D 2011-03-04 14:11:11 -08:00
Siebrand Mazeland
d55a831d97 Update translator documentation. 2011-03-03 01:42:54 +01:00
Brion Vibber
8cacecb6dc Use threaded replies in group inbox view 2011-03-01 16:29:11 -08:00
Zach Copley
5bf0c9f610 Fix mising require_once (now required here because of rearranging) 2011-03-01 15:31:06 -08:00
Zach Copley
243b396660 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-03-01 15:26:02 -08:00
Zach Copley
2fb8148788 Fix missing variable initialization 2011-03-01 15:25:06 -08:00
Brion Vibber
a7005f3975 Alternate Inbox streaming function optimized for threaded paging (for /all stream, while things using the existing API inbox methods won't be affected) 2011-03-01 15:16:39 -08:00
Evan Prodromou
64a1c9e376 object menu for user profile 2011-03-01 16:23:19 -05:00
Evan Prodromou
a1a0382d26 object menu on showgroup 2011-03-01 16:22:19 -05:00
Evan Prodromou
374253f0f7 defaultlocalnav for favorites 2011-03-01 16:21:22 -05:00