Commit Graph

3464 Commits

Author SHA1 Message Date
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
213086cc1f add login menu to email registration page 2011-04-18 09:22:51 -04:00
Evan Prodromou
9bfade7573 remove debugging comment from emailregister 2011-04-18 08:52:50 -04:00
Siebrand Mazeland
13ae3ab259 Localisation updates from http://translatewiki.net. 2011-04-18 13:41:15 +02:00
Evan Prodromou
206376cf10 use Start/EndRegistrationTry events for email registration 2011-04-18 06:46:16 -04:00
Evan Prodromou
6267ea2e8d show the welcome page on registration completion 2011-04-18 06:32:32 -04:00
Evan Prodromou
9c12aa29ef add the welcome document 2011-04-18 06:19:51 -04:00
Evan Prodromou
2e75100108 break out email registration forms to their own modules 2011-04-18 06:07:32 -04:00
Evan Prodromou
5253b9ea68 ConfirmRegistrationForm includes the code 2011-04-18 04:30:13 -04:00
Samantha Doherty
b11bfa3c06 Add class to bookmark form thumbnail image. 2011-04-18 02:29:16 -04:00
Samantha Doherty
68bc240d4c Add JS for second step of bookmark form. 2011-04-18 00:41:42 -04:00
Zach Copley
f25b6e6116 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
* '1.0.x' of gitorious.org:statusnet/mainline:
  Correct fieldset ID for Event form.
  Update Event plugin datepicker function for new unique input IDs.
2011-04-17 20:34:55 -07:00
Zach Copley
b422a0d21a spelling 2011-04-17 20:34:05 -07:00
Samantha Doherty
34b6038b83 Correct fieldset ID for Event form. 2011-04-17 21:40:15 -04:00
Samantha Doherty
c2038e796b Update Event plugin datepicker function for new unique input IDs. 2011-04-17 21:40:15 -04:00
Zach Copley
f3e0cd0b30 Some special .js for the bookmark plugin, so we can control the form in the second step 2011-04-17 18:37:51 -07:00
Zach Copley
8cfb81deac Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
* '1.0.x' of gitorious.org:statusnet/mainline:
  Remove empty locale files.
  Localisation updates from http://translatewiki.net.
2011-04-17 16:33:25 -07:00
Zach Copley
d9cf0280d2 Give microapp form elements unique ids 2011-04-17 16:32:52 -07:00
Evan Prodromou
dbb9f66982 get email for code 2011-04-17 19:29:55 -04:00
Evan Prodromou
a564af4948 get email for code 2011-04-17 19:28:22 -04:00
Evan Prodromou
6a329f4397 complete registration form 2011-04-17 19:24:33 -04:00
Siebrand Mazeland
4afe9c5885 Remove empty locale files. 2011-04-18 00:50:07 +02:00
Evan Prodromou
383b4cae76 Missed an argument to a function 2011-04-17 18:48:58 -04:00
Siebrand Mazeland
0d431cd6ee Localisation updates from http://translatewiki.net. 2011-04-18 00:38:35 +02:00
Zach Copley
5f81f4c701 Fix form elements in bookmark plugin 2011-04-17 15:34:50 -07:00
Evan Prodromou
3996199c6a some better breaks on error entry 2011-04-17 18:30:25 -04:00
Evan Prodromou
e119b295c0 email register is a login action 2011-04-17 18:29:10 -04:00
Evan Prodromou
45b0c5ef10 Yoink the registration action 2011-04-17 18:27:25 -04:00
Evan Prodromou
064ed69446 Revert "some debugging for email registration routes"
This reverts commit 165d9fd9de.
2011-04-17 18:22:59 -04:00
Evan Prodromou
b5dfceb59c Revert "bad variable in debugging"
This reverts commit 87330bf977.
2011-04-17 18:22:46 -04:00
Evan Prodromou
96d735baf4 Revert "additional debugging in router"
This reverts commit daadb7905b.
2011-04-17 18:22:35 -04:00
Evan Prodromou
daadb7905b additional debugging in router 2011-04-17 18:19:47 -04:00
Evan Prodromou
35361656d5 reverse order of register connects 2011-04-17 18:12:12 -04:00
Evan Prodromou
87330bf977 bad variable in debugging 2011-04-17 18:10:30 -04:00
Zach Copley
007d1be06d Give bookmark form elements unique ids 2011-04-17 15:09:56 -07:00
Evan Prodromou
165d9fd9de some debugging for email registration routes 2011-04-17 18:09:26 -04:00
Evan Prodromou
7cc4c97aa9 add our routes at the begnning, not the end. 2011-04-17 18:05:18 -04:00
Evan Prodromou
b9eee437dd Merge branch '1.0.x' into emailregistration 2011-04-17 17:48:15 -04:00
Evan Prodromou
b86bb0335c action for registering by email 2011-04-17 17:48:09 -04:00
Evan Prodromou
3ae972906f customize the EmailRegistration plugin 2011-04-17 17:47:37 -04:00
Siebrand Mazeland
5f3dbc3e98 Localisation updates http://translatewiki.net. 2011-04-17 20:30:47 +02:00
Siebrand Mazeland
4ab995dd1e Complete "people tag" to "list" in UI messages.
Update translator documentation accordingly.

Probably a few cases left where "tag[ged[" has to be replaced by "list[ed]".
2011-04-17 20:08:03 +02:00
Evan Prodromou
d4e25ea2cc Copy Sample plugin to EmailRegistration 2011-04-17 13:22:21 -04:00
Siebrand Mazeland
4c00b830bf Localisation updates from http://translatewiki.net. 2011-04-17 01:15:30 +02:00
Evan Prodromou
6d5b6d98b5 Merge branch '1.0.x' into testing 2011-04-15 14:57:41 -04:00
Siebrand Mazeland
c27b9c0722 Update translator documentation.
i18n/L10n updates.
Whitespace updates.
2011-04-15 15:07:35 +02:00
Siebrand Mazeland
abcfde4d7d i18n fixes for xgettext issue with contructions like "<<< END_OF_INSTRUCTIONS".
Update translator documentation.
FIXMEs added. Asking Zach on IRC to have a look at them.
2011-04-15 09:55:09 +02:00
Evan Prodromou
1c2d4de469 scale down the thumbnail image if necessary 2011-04-14 23:57:30 -04:00
Evan Prodromou
2df98fc240 auto-fill bookmark data 2011-04-14 23:44:01 -04:00
Evan Prodromou
41a883aeab Merge branch '1.0.x' of gitorious.org:statusnet/mainline into prefillbookmark 2011-04-14 21:55:16 -04:00
Evan Prodromou
2581e46a25 hide tagsub from stats 2011-04-14 17:03:32 -04:00
Evan Prodromou
6e5e486dc8 hide searchsub from stats 2011-04-14 17:03:23 -04:00
Shashi Gowda
53af608ef8 People tags -> Lists (only UI changes, for experimentation) 2011-04-14 19:49:42 +00:00
Evan Prodromou
75f0429961 Revert "Use gravatar as a fallback for missing files"
This reverts commit 52493a9a2b.
2011-04-14 13:06:23 -04:00
Evan Prodromou
52493a9a2b Use gravatar as a fallback for missing files 2011-04-14 13:05:11 -04:00
Evan Prodromou
a62e9fec65 remove avatar saving from GravatarPlugin 2011-04-14 11:47:20 -04:00
Evan Prodromou
458871705a Grossly simplify Gravatar plugin 2011-04-14 11:38:41 -04:00
Samantha Doherty
cb379a7a33 Remove duplicate noticeforms from realtime popup. 2011-04-14 02:57:34 -04:00
Zach Copley
c5849e1de2 Group directory - reword instructions 2011-04-13 18:37:43 -07:00
Zach Copley
fff83723ff Group directory - nuke admins column (not that useful) 2011-04-13 18:29:55 -07:00
Zach Copley
ddc42b1baf Groups directory - fix missing closing list item tag - was making the layout wonky 2011-04-13 18:17:04 -07:00
Zach Copley
b959147ada Group directory - add in asides 2011-04-13 17:46:35 -07:00
Zach Copley
88bcc7728c Add "create a new group" button to group directory 2011-04-13 16:43:28 -07:00
Zach Copley
e188a11ef6 Fix public group nav to highlight properly when our group directory is selected 2011-04-13 16:11:34 -07:00
Zach Copley
3a3a53dfcc Group directory - fix group logo display 2011-04-13 15:52:44 -07:00
Evan Prodromou
3bea1b5371 initial bookmark form 2011-04-13 18:37:14 -04:00
Zach Copley
055d61ef79 Group directory - use correct constant 2011-04-13 15:36:27 -07:00
Zach Copley
4f60c43d32 Better instructions for group directory 2011-04-13 15:31:51 -07:00
Zach Copley
42e945a42d Style group directory output 2011-04-13 15:09:46 -07:00
Zach Copley
b6b9baa9a2 DirectoryPlugin - Group directory mostly working. HTML markup for results needs fixing. 2011-04-13 15:09:45 -07:00
Zach Copley
0f9d6f4c82 DirectoryPlugin - Hijack router mapping for normal groups page to substitute a directory page 2011-04-13 15:09:45 -07:00
Evan Prodromou
66dee8a966 Merge branch '1.0.x' into prefillbookmark 2011-04-13 15:38:39 -04:00
Evan Prodromou
1434099ed8 better versions for BookmarkPlugin 2011-04-13 15:27:30 -04:00
Siebrand Mazeland
409550e1dc Localisation updates from http://translatewiki.net. 2011-04-13 15:48:18 +02:00
Siebrand Mazeland
ab52460691 Update translator documentation.
Number parameters.
2011-04-13 15:43:05 +02:00
Siebrand Mazeland
124070e63d Update punctuation for exceptions. 2011-04-13 15:13:14 +02:00
Siebrand Mazeland
57c28ba4d0 Update translator documentation and whitespace.
Update file header comment.
2011-04-13 13:22:50 +02:00
Siebrand Mazeland
e53e60f782 Update translator documentation and whitespace. 2011-04-12 18:40:25 +02:00
Zach Copley
43f542c3a2 Script to delete bad OStatus hub URIs (until we have better error handling for broken hubs) 2011-04-12 02:29:02 -07:00
Evan Prodromou
c0c5235080 only allow a whitelist of email domains for the site 2011-04-11 16:49:50 -04:00
Evan Prodromou
820e19e197 Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x 2011-04-11 11:20:27 -04:00
Siebrand Mazeland
0644cdb6d0 Localisation updates from http://translatewiki.net. 2011-04-11 15:10:09 +02:00
Evan Prodromou
a665d1f772 more information for bookmark without attachment 2011-04-10 19:27:09 -04:00
Siebrand Mazeland
b83e0fd0e8 Update translator documentation.
i18n fixes (gettext domain).
L10n updates.
Whitespace updates.
Some tabs to spaces.
2011-04-11 00:39:51 +02:00
Evan Prodromou
d375317c7f Better SQLStats output with 0 queries 2011-04-10 18:32:09 -04:00
Siebrand Mazeland
8c63d6ead4 Localisation updates from http://translatewiki.net. 2011-04-10 10:44:39 +02:00
Zach Copley
e75c9988eb Merge branch 'people_tags_rebase' into 1.0.x
Conflicts:
	EVENTS.txt
2011-04-10 08:10:01 +00:00
Siebrand Mazeland
396005ecf6 Fix incorrect parameter notation. 2011-04-10 01:32:57 +02:00
Siebrand Mazeland
d6aea8e39e Update translator documentation. 2011-04-10 01:24:15 +02:00
Evan Prodromou
638d29a820 Hide RSVPs from threaded notice output 2011-04-09 17:11:38 -04:00
Evan Prodromou
b80ece1691 hide poll response notices from threaded view 2011-04-09 17:07:03 -04:00
Siebrand Mazeland
396a0c08b3 Localisation updates from http://translatewiki.net. 2011-04-09 20:53:29 +02:00
Shashi Gowda
f47027abbe Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
Conflicts:
	lib/profileblock.php
	theme/default/css/display.css
2011-04-09 21:57:45 +05:30
Shashi Gowda
a0ac51c22f use notifyDeferred for tag/untag so that it gets queued offline 2011-04-09 17:18:33 +05:30
Zach Copley
e3789488c6 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
* '1.0.x' of gitorious.org:statusnet/mainline:
  use conversationnoticestream in conversationrepliesaction
  use conversationnoticestream in conversationaction
  make ConversationNoticeStream accept a profile parameter
  enable user directory and extended profile by default
  Remove incompatible theme victorian
  Remove incompatible theme shiny
  Remove incompatible theme pigeonthoughts
  Remove incompatible theme mnml
  Remove incompatible theme identica
  Remove incompatible theme h4ck3r
  Remove incompatible theme default
  Remove incompatible theme cloudy
  Remove incompatible theme cleaner
  Remove incompatible theme clean
  Remove incompatible theme biz
  correctly return for deleted items
  show event as deleted
  Use pkeyGet() instead of idStream() for fave caching
  store oft-requested stuff in the data object
2011-04-08 15:47:18 -07:00
Zach Copley
3022d711e3 Add some more events to aside profile blocks and rework a bit 2011-04-08 15:45:49 -07:00
Evan Prodromou
8cb0d7e708 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-04-08 17:09:15 -04:00
Zach Copley
8335d234f7 Don't try to show search and tag subs unless a user is logged in 2011-04-08 13:56:08 -07:00
Evan Prodromou
bfc33f3999 Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x 2011-04-08 16:14:09 -04:00
Siebrand Mazeland
ea82086297 Update translator documentation.
Whitespace updates.
Header updates.
Break long lines in README.
Indentation updates.
2011-04-08 18:47:07 +02:00
Siebrand Mazeland
b77531897a Fixed incorrect single quotes with newlines from Commit:3e8bf13aab25050cce09a3180ea7b56c41ed40e3. 2011-04-08 18:47:04 +02:00
Evan Prodromou
997babfea3 correctly return for deleted items 2011-04-08 12:15:32 -04:00
Evan Prodromou
50c4731d20 show event as deleted 2011-04-08 12:14:05 -04:00
Shashi Gowda
4d61760154 Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase 2011-04-08 17:16:20 +05:30
Siebrand Mazeland
3e8bf13aab Update translator documentation.
L10n/i18n updates.
2011-04-08 10:59:10 +02:00
Siebrand Mazeland
a9eaaf6341 Update translator documentation.
Whitespace updates.
L10n/i18n updates.
2011-04-08 01:22:04 +02:00
Siebrand Mazeland
2640232c68 Update translator documentation.
L10n and i18n updates.
Break long lines in README before or at 80 characters.
Superfluous whitespace removed.
2011-04-08 01:22:02 +02:00
Siebrand Mazeland
a5aade0a3b Update maintainer e-mail address.
Update translator documentation.
2011-04-08 01:21:58 +02:00
Evan Prodromou
45ba33e2ac use InboxNoticeStream in AllmapAction in Mapstraction 2011-04-07 15:41:34 -04:00
Shashi Gowda
ad86eb78d3 Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
Conflicts:
	js/util.min.js
	lib/default.php
2011-04-07 23:13:45 +05:30
Siebrand Mazeland
6806a42e2c Update translator documentation. 2011-04-07 10:06:46 +02:00
Evan Prodromou
a1fa47d904 Cache RSVP counts for Event plugin 2011-04-07 00:01:51 -04:00
Evan Prodromou
524b98bfa3 remove debugging statement from Happening 2011-04-06 23:48:10 -04:00
Evan Prodromou
bf39c95795 Bookmarks more robust to missing profiles 2011-04-06 23:47:05 -04:00
Evan Prodromou
d9ca956ecf SQLStatsPlugin to get some profiling data on SQL queries 2011-04-06 22:46:28 -04:00
Siebrand Mazeland
512bd91dee Translator documentation added.
Whitespace updates.
2011-04-06 23:43:52 +02:00
Siebrand Mazeland
caa6690f4c Update translator documentation.
Whitespace updates.
Break lines in README at or before 80 characters.
L10n updates.
2011-04-06 23:43:50 +02:00
Zach Copley
b541443370 QnA - Fix typo 2011-04-06 11:15:32 -07:00
Siebrand Mazeland
553a0c8b9b i18n/L10n updates/fixes.
Translator documentation added/updated.
Whitespace updates.
2011-04-06 16:36:35 +02:00
Siebrand Mazeland
5b660bd3c6 Update translator documentation.
i18n/L10n fixes.
Superfluous whitespace removed.
2011-04-06 15:36:03 +02:00
Siebrand Mazeland
1a91f85438 Tabs to spaces. 2011-04-06 15:12:56 +02:00
Siebrand Mazeland
cc78aca0d2 L10n and whitespace updates. 2011-04-06 15:08:39 +02:00
Siebrand Mazeland
e25cb9b570 Shorten plugin description. 2011-04-06 15:07:23 +02:00
Siebrand Mazeland
5f591e05ae Update translator documentation.
i18n/L10n fixes.
Superfluous whitespace removed.
onPluginVersion() added where missing.
2011-04-06 14:57:48 +02:00
Siebrand Mazeland
cca159883a Update translator documentation.
i18n/L10n issues fixed.
Superfluous whitespace removed.
2011-04-06 02:11:09 +02:00
Evan Prodromou
cffbda8183 add search submenu to default local nav 2011-04-05 18:45:37 -04:00
Evan Prodromou
11bbc5adcd a little more protection against empty tags 2011-04-05 18:36:49 -04:00
Evan Prodromou
f2a9c9c26d check for 0-tag menu 2011-04-05 18:29:09 -04:00
Evan Prodromou
a5de3a076b cut-and-paste error in TagSubMenu 2011-04-05 18:19:26 -04:00
Evan Prodromou
a6620dbaf4 Added tagsub to the left-hand menu 2011-04-05 18:14:48 -04:00
Evan Prodromou
03ad3f69cc Merge branch '1.0.x' into testing 2011-04-05 13:47:49 -04:00
Evan Prodromou
d09995561d Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-04-05 13:47:07 -04:00
Evan Prodromou
d3b9aabac3 Questions show private lock correctly 2011-04-05 13:46:44 -04:00
Evan Prodromou
4397686c91 include limited-scope class on bookmarks in output 2011-04-05 13:44:27 -04:00
Evan Prodromou
c9ca11eb64 include limited-scope class on bookmarks in output 2011-04-05 13:43:54 -04:00
Zach Copley
8ef341d589 QnA - best answers were not getting the 'best' class on their lis (fixed) 2011-04-05 10:29:10 -07:00
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
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
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
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
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
Evan Prodromou
580986f007 Plugin to put the sitenotice in the sidebar 2011-04-01 13:34:55 -04:00
Evan Prodromou
a84d584971 delete the Bookmark if Notice::saveNew() fails 2011-04-01 09:30:25 -04: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
Evan Prodromou
d5a38c62f4 Don't try to import a <dd> without a <dt> from delicious 2011-03-31 16:15:30 -04:00
Zach Copley
eeff6285ae Make new answers work 2011-03-31 09:58:26 -07:00
Evan Prodromou
2411caa000 If Router is mucked up, force URI for Bookmark 2011-03-31 11:20:24 -04:00
Brion Vibber
347b57f72a 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-31 00:31:24 +00: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
Evan Prodromou
83d1997f59 incorrect name for bookmark plugin 2011-03-30 10:58:28 -04:00
Shashi Gowda
5a2bab07b2 Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
Conflicts:
	actions/tagother.php
	classes/Profile.php
	classes/Profile_tag.php
	js/util.min.js
2011-03-30 15:47:42 +05:30
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
Siebrand Mazeland
0a19674c9f @evan Fixed message domain for messages in plugins for recent commits.
Numbered parameters when more than one used in a message.
L10n updates for consistency.
i18n for non-translatable exception.
Updated translator documentation.
Removed superfluous whitespace.
2011-03-30 00:48:41 +02:00
Evan Prodromou
908551ae3d disallow access to out-of-scope poll 2011-03-28 22:50:52 -04:00
Evan Prodromou
2856982a1c disallow access to out-of-scope bookmark 2011-03-28 22:50:45 -04:00
Evan Prodromou
57dee164ca fix missing cur in Event 2011-03-28 22:50:29 -04:00
Evan Prodromou
c1d4186c98 Disallow access to events and RSVPs out of scope 2011-03-28 22:43:38 -04:00
Evan Prodromou
e862dcdb8a Merge branch '1.0.x' into limitdist2 2011-03-28 21:56:34 -04:00
Evan Prodromou
a74eda4e9a don't send private notices over OStatus 2011-03-28 16:37:35 -04:00
Evan Prodromou
cbe003eb38 don't leak private notices to facebook 2011-03-28 16:10:24 -04:00
Evan Prodromou
683bd3f2b5 don't push twitter stuff public if its not public 2011-03-28 12:56:18 -04:00
Evan Prodromou
7dd06b5246 ShortenAction::handle() had bad args 2011-03-28 12:20:00 -04:00
Siebrand Mazeland
f06f8d51fd Slightly uncomplicate and disambiguate the plugin description.
Add translator documentation.
2011-03-27 12:58:35 +02:00
Siebrand Mazeland
5502e535de Localisation updates from http://translatewiki.net. 2011-03-26 12:21:36 +01:00
Siebrand Mazeland
41e919f3ca L10n update.
Translator documentation added.
Superfluous whitespace removed.
2011-03-25 09:55:33 +01:00
Brion Vibber
e68271c471 TwitterBridge: discard outgoing queue items instead of retrying when Twitter API returns HTTP 400 or 404 error codes
We get HTTP 400 for various cases of invalid data, where retrying doesn't help at all -- previously those would loop forever, or until something died at least. :)
400 is also used for rate limiting, but retrying *immediately* will just hit the rate limit again, so better to discard if we're going over for now.
2011-03-24 18:43:25 -07:00
Brion Vibber
d994b4583a TwitterBridge: discard outgoing queue items instead of retrying when Twitter API returns HTTP 400 or 404 error codes
We get HTTP 400 for various cases of invalid data, where retrying doesn't help at all -- previously those would loop forever, or until something died at least. :)
400 is also used for rate limiting, but retrying *immediately* will just hit the rate limit again, so better to discard if we're going over for now.
2011-03-24 18:41:25 -07:00
Zach Copley
c1a27922ba Merge branch '1.0.x' into qna
* 1.0.x: (26 commits)
  Fix typo in documentation.
  Fix i18n.
  Change formatting of i18n slightly. Translator hints were not picked up in pot file. May now they are.
  Localisation updates from http://translatewiki.net.
  Translator documentation updated. i18n/L10n updates. Superfluous whitespace removed. Add FIXME for missing class documentation.
  Update translator documentation. Remove superfluous whitespace. L10n/I18n updates. FIXMEs added for missing documentation or headers.
  Update translator documentation. i18n/L10n updates. Superfluous whitespace removed. Add FIXME in files with missing documentation.
  Fallback for RSVP display when Event is deleted
  Enhancement for 'ajax' form class: submit buttons behave more like normal submissions, submitting their name/values through a hidden field.
  Retool group join queue list ajax forms to use two buttons in one form, making it more ajax-submit-friendly. Needs util.js fixes for AJAX submission input buttons...
  Some fixes to make the notice stream class work
  let Inbox class go fingerpokin' in streams
  New NoticeStream class to reify streams of notices
  Refactoring on notification mail generation: common profile & footer chunks pulled out, notifications added for group joins.
  Fix typo in cf45c978
  Mass replacement of #-comments with //-comments
  Add pending members list to group navigation, if group has joins moderated or if it has pending requests open
  Split up some list/form classes, and get the 'approve' and 'cancel' links on group member queue working.
  Pending members queue list -- doesn't yet allow approval.
  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-24 14:03:04 -07:00
Siebrand Mazeland
4e64bd4e5b Localisation updates from http://translatewiki.net. 2011-03-24 16:08:03 +01:00
Evan Prodromou
69bb30e09c Fallback for RSVP display when Event is deleted 2011-03-23 22:16:00 -04:00
Evan Prodromou
bd11d11bfc Fallback for RSVP display when Event is deleted 2011-03-23 22:10:44 -04:00
Evan Prodromou
dc73cf0b05 don't send group private message mail notification to the author 2011-03-23 14:31:13 -04:00
Evan Prodromou
acd594c9a6 put correct content into the group private message update 2011-03-23 14:31:05 -04:00
Evan Prodromou
a221259328 group private message email notification fix 2011-03-23 14:30:56 -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
Zach Copley
7f4bd6b69f Work on QnA notice display -- in progress 2011-03-21 20:57:19 -07:00
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
Zach Copley
b0ed4cb89a * Move stuff around again
* Make answers save
2011-03-21 16:51:38 -07:00
Zach Copley
73c3344cc3 * Fix plugin filename
* Make questions save!
2011-03-21 15:50: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
01ecca5e60 remove type hinting -- fails when ArrayWrapper gets passed in some profile list pages 2011-03-21 11:20:16 -07:00
Brion Vibber
9fc6de6b37 remove type hinting -- fails when ArrayWrapper gets passed in some profile list pages 2011-03-21 11:18:38 -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
afd92957b4 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:38:31 -07:00
Brion Vibber
119d0f7dba 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:38:26 -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
Siebrand Mazeland
5bb6fae307 Localisation updates from http://translatewiki.net. 2011-03-18 20:59:45 +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
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
Zach Copley
4cf0450809 Merge branch '1.0.x' into qna 2011-03-17 13:20:37 -07:00
Luke Fitzgerald
cd4b23aa39 Merge branch '1.0.x' into msn-plugin 2011-03-17 20:00:06 +00:00
Brion Vibber
0d30dff6d6 Fix reversed poll & poll response object types in ActivityStreams output 2011-03-17 12:13:46 -07:00
Siebrand Mazeland
86fcd73a84 L10n/i18n updates
* number multiple parameters
* put messages in plugin domain (use _m() NOT _()!)
Translator documentation updated.
2011-03-17 15:11:30 +01:00
Evan Prodromou
7cf12f093e Merge branch '1.0.x' into testing
Conflicts:
	lib/common.php
2011-03-17 09:20:32 -04:00
Siebrand Mazeland
a9f556795b Localisation updates from http://translatewiki.net. 2011-03-17 13:59:24 +01:00
Samantha Doherty
49952b08e1 A little more quick styling for Events. 2011-03-17 08:32:18 -04:00
Siebrand Mazeland
726ddf7b42 L10n updates.
Translator documentation.
2011-03-17 11:54:18 +01:00
Siebrand Mazeland
3d835bb8b5 Translator documentation added/updated.
i18n/L10n updates.
2011-03-17 11:38:18 +01:00
Siebrand Mazeland
199e05f9de Localisation updates from http://translatewiki.net. 2011-03-17 11:17:22 +01:00
Zach Copley
30cdc6944b Skeleton / Stub for Question and Answers micro-app plugin 2011-03-16 18:15:45 -07:00
Brion Vibber
0754edf9a2 SearchSub plugin: 'track X', 'untrack X', 'tracking', 'track off' commands now overridden :D 2011-03-16 17:22:37 -07:00
Brion Vibber
e36959d451 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-03-16 16:42:12 -07:00
Brion Vibber
390881e817 SearchSub plugin: add management UI for subscribed searches 2011-03-16 16:41:02 -07:00
Zach Copley
262126bd54 Extended profile - Add sammdy to author credits in version info 2011-03-16 16:17:02 -07:00
Zach Copley
e7843dfda2 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-03-16 16:09:50 -07:00
Evan Prodromou
0182b96f7c Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-03-16 19:08:50 -04:00
Zach Copley
88d31a7933 Extended profile - move some files around and rename stuff to follow plugin conventions 2011-03-16 16:08:49 -07:00
Evan Prodromou
1b82589b8f better date handling in events 2011-03-16 19:08:35 -04:00
Brion Vibber
95942f02ac Merge branch 'subwork' into 1.0.x 2011-03-16 15:56:11 -07:00
Brion Vibber
f8859aa3aa Tag subscriptions management UI for TagSub plugin 2011-03-16 15:55:40 -07:00
Zach Copley
2d88e6d07e Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-03-16 14:53:20 -07:00
Zach Copley
59515d5976 Extended profile - don't show rel for empty phone number 2011-03-16 14:52:42 -07:00
Evan Prodromou
29a4bb4d91 better formatting for RSVPs 2011-03-16 17:51:27 -04:00
Brion Vibber
7785407c65 Work in progress: tagsub editing ui 2011-03-16 14:49:27 -07:00
Evan Prodromou
ba2a246951 slightly better formatting on events 2011-03-16 17:13:34 -04:00
Brion Vibber
c211b1a38e Work in progress: adding link for managing tag subscriptions. Needs the action still to be functional. 2011-03-16 12:28:26 -07:00
Evan Prodromou
47cd5f311c my code-to-verb logic was ab0rken; fixed 2011-03-16 15:22:15 -04:00
Evan Prodromou
f4ff375dbd Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-03-16 15:00:22 -04:00
Evan Prodromou
9966c51625 use Y,N,? instead of 1,0,null for 3vl in RSVPs 2011-03-16 14:55:19 -04:00
Zach Copley
405dae87b1 Extended profile - fix for unix epoc getting displayed for empty birthday and some validation issues 2011-03-16 10:58:13 -07:00
Samantha Doherty
5e40450efd Quick style update for profile blocks. 2011-03-16 13:50:24 -04:00
Zach Copley
3692a09095 Extended profile - add nav link to new profile block 2011-03-16 10:30:57 -07:00
Samantha Doherty
0666c6f8b2 Fix for education description fields in extended profile. 2011-03-16 13:05:55 -04:00
Evan Prodromou
9b4533058c no profileblock on login actions 2011-03-16 10:05:07 -04:00
Evan Prodromou
41420449f8 Merge branch 'jqueryui' into 1.0.x
Conflicts:
	lib/action.php
2011-03-16 09:56:26 -04:00
Evan Prodromou
3598134330 Merge remote branch 'origin/1.0.x' into 1.0.x 2011-03-16 09:52:35 -04:00
Zach Copley
daf73f8231 Merge branch 'profile-fixups' into 1.0.x
* profile-fixups: (46 commits)
  * Extended profile - make cloned datefields work correctly with calendar popup * Validate URLs
  More style for profile edit.
  Extended profile - don't show empty company entry in view
  Extended profile - linkify related URLs added by the user
  Extended profile - fix some issues saving and displaying dates
  Extended profile - don't check end date if experience entry has current checked
  Extended profile - allow adding more than one website
  Small smattering of pixie dust
  Extended profile - fix regression whereby if there was only one item, you could still delete it!
  Remove supersizeme class as appropriate.
  Extended profile - hide add button when not needed (regression)
  Extended profile - add fancy JQuery UI confirm dialog when deleting items
  Extended profile - add fancy datepicker widgets
  Extended profile - prettier date formatting
  Extended profile - fix issue with JavaScript not executing in Firefox
  Extended profile - namespace JavaScript functions
  Extended profile - autocomplete for manager
  Hide all unnecessarylabels from profile edit view.
  Extended profile - make birthday save
  Extended profile - make websites save
  ...
2011-03-16 02:44:36 -07:00
Zach Copley
368cfd8fac * Extended profile - make cloned datefields work correctly with calendar popup
* Validate URLs
2011-03-16 02:41:32 -07:00
Samantha Doherty
365b7ab56e More style for profile edit. 2011-03-16 04:32:33 -04:00
Zach Copley
82023d388a Extended profile - don't show empty company entry in view 2011-03-16 01:27:18 -07:00
Zach Copley
17afe06805 Extended profile - linkify related URLs added by the user 2011-03-16 01:23:47 -07:00
Zach Copley
bb087a9650 Extended profile - fix some issues saving and displaying dates 2011-03-16 01:09:38 -07:00
Zach Copley
974d0c48f6 Extended profile - don't check end date if experience entry has current checked 2011-03-16 00:50:43 -07:00
Zach Copley
724dba668a Extended profile - allow adding more than one website 2011-03-16 00:34:00 -07:00
Zach Copley
b80b9f31fc Small smattering of pixie dust 2011-03-16 00:25:02 -07:00
Zach Copley
04c2198dc1 Merge branch 'profile-fixups' of gitorious.org:~zcopley/statusnet/zcopleys-clone into profile-fixups
* 'profile-fixups' of gitorious.org:~zcopley/statusnet/zcopleys-clone:
  Remove supersizeme class as appropriate.
2011-03-16 00:24:06 -07:00
Zach Copley
a715b133ff Extended profile - fix regression whereby if there was only one item, you could still delete it! 2011-03-16 00:23:34 -07:00
Samantha Doherty
665dd1de78 Remove supersizeme class as appropriate. 2011-03-16 03:09:06 -04:00
Zach Copley
d51625ab3d Extended profile - hide add button when not needed (regression) 2011-03-15 23:58:45 -07:00
Zach Copley
bda9d43c56 Extended profile - add fancy JQuery UI confirm dialog when deleting items 2011-03-15 23:51:28 -07:00
Zach Copley
b9065d7bc1 Extended profile - add fancy datepicker widgets 2011-03-15 23:02:05 -07:00
Zach Copley
40e1fc8246 Extended profile - prettier date formatting 2011-03-15 21:55:47 -07:00
Zach Copley
bde85a6685 Extended profile - fix issue with JavaScript not executing in Firefox 2011-03-15 21:23:34 -07:00
Zach Copley
b11a2faf54 Extended profile - namespace JavaScript functions 2011-03-15 19:33:05 -07:00
Zach Copley
9ea7946172 Merge branch 'profile-fixups' of gitorious.org:~zcopley/statusnet/zcopleys-clone into profile-fixups
* 'profile-fixups' of gitorious.org:~zcopley/statusnet/zcopleys-clone:
  Hide all unnecessarylabels from profile edit view.
2011-03-15 18:46:44 -07:00
Zach Copley
95d03e74e9 Extended profile - autocomplete for manager 2011-03-15 18:45:08 -07:00
Samantha Doherty
903ce7d10c Hide all unnecessarylabels from profile edit view. 2011-03-15 21:43:28 -04:00
Brion Vibber
73b5821fc3 Submirror wizard updates... commenting out Wordpress (not sure what to do with it), LinkedIn (can't find documentation on any public RSS/Atom feeds from it, it seems that a feed of your updates doesn't currently exist?), and StatusNet (we'd need to know what to do with it; could take webfinger-style addresses or such.) Also added a commented-out Facebook section; it seems that there may not be a current way to get at public updates via RSS/Atom either, or if it is it seems really inconsistent and undocumented. (You can get at your friends updates by jumping through some hoops, but it seems we'd want to mirror a single account's own update feed?) 2011-03-15 17:48:12 -07:00
Brion Vibber
ce05a78d08 SubMirror wizard work in progress: Twitter option now lets you type in a username and picks the feed. Should in theory work via superfeedr or other compatible hub 2011-03-15 17:15:25 -07:00
Brion Vibber
325cb4833d Merge branch '1.0.x' into feedsub-wizard 2011-03-15 16:17:48 -07:00
Zach Copley
e4eb6719a5 Extended profile - make birthday save 2011-03-15 15:35:00 -07:00
Brion Vibber
341bef5e01 tag -> search stuff: basic search subscription implementation in SearchSub 2011-03-15 15:34:06 -07:00
Brion Vibber
579fc11862 copy-paste TagSub to SearchSub :D 2011-03-15 14:58:09 -07:00
Brion Vibber
0bb2f14704 AJAX submit actions for tag subscribe/unsubscribe 2011-03-15 13:58:22 -07:00
Brion Vibber
119885d964 Stub TagSubPlugin: plugin guts with no UI to setup subs 2011-03-15 12:57:11 -07:00
Zach Copley
1ff1af0fc8 Merge branch 'profile-fixups' of gitorious.org:~zcopley/statusnet/zcopleys-clone into profile-fixups
* 'profile-fixups' of gitorious.org:~zcopley/statusnet/zcopleys-clone:
  Whole bunch of style-related changes, including some tasty hackery for the experience and education fields.
2011-03-15 10:10:41 -07:00
Zach Copley
a6ae9ddd41 Extended profile - make websites save 2011-03-15 10:10:18 -07:00
Samantha Doherty
b37c33dea2 Whole bunch of style-related changes, including some tasty hackery for the experience and education fields. 2011-03-15 13:08:41 -04:00
Zach Copley
4f217a3133 Merge branch '1.0.x' into profile-fixups
* 1.0.x:
  For good measure; trip short error mode in earlier on ajax shownotice
  Realtime plugin: fix i18n, thumbnails, location display, OStatus server display, micro-apps display.
  'ajax' param on shownotice action so we can pull items in full html version for realtime
  Whoops, need to reset the background color on the aside.
  Realtime work in progress: switch makeNoticeData to async -- next we'll load fresh copies from server, maintaining proper language and plugin enhancements.
  Check the site minifications etting for realtime plugin; debugging aid.
2011-03-15 09:11:31 -07:00
Zach Copley
7a7e0a2b69 Extended profile - change the name of divs used for sort order 2011-03-14 22:47:20 -07:00
Zach Copley
cd82ff2dcf Extended profile - make IMs display and save 2011-03-14 22:38:34 -07:00
Zach Copley
6d34818b5d Extended profile - make education entries save 2011-03-14 22:02:24 -07:00
Zach Copley
8559fbb2ca Extended profile - intialize controls for multiple education entries 2011-03-14 21:09:03 -07:00
Zach Copley
79c4af6073 Add in missing </li> 2011-03-14 21:07:14 -07:00
Zach Copley
bd238e9a4d Extended profile - HTML layout for education entries 2011-03-14 20:58:35 -07:00
Samantha Doherty
0ff7bf77e4 Couple quick fixes for profile view. 2011-03-14 22:40:31 -04:00
Zach Copley
c6a6d41dab Extended profile - change HTML output for displaying work experience 2011-03-15 02:09:22 +00:00
Zach Copley
0fd4b84eb8 Extended profile - better error handling for bad dates 2011-03-14 17:53:54 -07:00
Zach Copley
07ccb6a9f8 Extended profile - make experience save and display 2011-03-14 17:27:50 -07:00
Zach Copley
27c75dd4bb Extended profile - show and edit experience 2011-03-14 15:29:11 -07:00
Brion Vibber
90d35885ae Realtime plugin: fix i18n, thumbnails, location display, OStatus server display, micro-apps display.
Switch from manual local formatting of notices (which lacks all the server-side goodness) to calling into the server-side with an AJAX variant of shownotice.
2011-03-14 13:29:35 -07:00
Zach Copley
f11b788b5a Extended profile - add a date value for fields 2011-03-14 12:53:49 -07:00
Brion Vibber
1e36593a23 Realtime work in progress: switch makeNoticeData to async -- next we'll load fresh copies from server, maintaining proper language and plugin enhancements. 2011-03-14 12:32:39 -07:00
Brion Vibber
ed2d224df5 Check the site minifications etting for realtime plugin; debugging aid. 2011-03-14 12:22:49 -07:00
Zach Copley
2f8b7f3dea Merge branch '1.0.x' into profile-fixups
* 1.0.x: (26 commits)
  (update util.min.js for recent changes)
  JS optimization: move creation of inline reply placeholders to server-side so we don't have to create them client-side (which causes reflows and takes about 25-30ms on my test system) Using live instead of bind for the event handling, we don't have to play any games on the ones that we do add at runtime. Yay!
  JS performance: speeding up initialization by consolidating event handlers for reply buttons
  Use non-minified jQuery when $config['site']['minify'] is off; aids in debugging when something fails deep in jQuery-land.
  Update PersonalGroupNav with fixed highlighting checks.
  remove stray close div from empty search results doc bits
  durrrr s/textValue/textContent/
  Update PollPlugin Atom input
  Poll plugin: switching Atom & JSON output to use new hooks & methods, much nicer output. Also switched types, which may break old entries. Beware! Input not yet updated.
  Add event hooks for customizing ActivityObject output to Atom and JSON, and helpers for MicroAppPlugin.
  Localisation updates from http://translatewiki.net.
  Move translator documentation one line lower. Otherwise it will not be added to the POT file.
  i18n/L10n updates Translator documentation added
  i18n fixes: plugins should use _m(), not _().
  * Superfluous whitespace removed * Small L10n updates
  * update/add translator documentation. * remove superfluous whitespace. * minor updates to L10n/i18n.
  Couple of tiny theme changes for inline replies.
  Removing currently unused webfonts from theme.ini.
  New interim default avatar images.
  Updating favicon.
  ...
2011-03-14 01:57:04 -07:00
Zach Copley
04c8bf2743 Extended profile - finished basic pattern for adding/removing/saving multiple complex fields 2011-03-14 01:49:46 -07:00
Zach Copley
deb40602d2 Extended profile - more work on getting complex fields to save 2011-03-13 16:32:13 -07:00
Evan Prodromou
a63e1418a8 Merge remote branch 'origin/1.0.x' into 1.0.x 2011-03-13 11:49:31 -05:00
Brion Vibber
3c9561b3f0 Merge branch 'atomic-json' into 1.0.x 2011-03-11 12:47:11 -08:00
Brion Vibber
d5f5f76947 durrrr s/textValue/textContent/ 2011-03-11 12:45:55 -08:00
Brion Vibber
e1136bacae Update PollPlugin Atom input 2011-03-11 12:41:11 -08:00
Brion Vibber
a9d589dbdc Poll plugin: switching Atom & JSON output to use new hooks & methods, much nicer output. Also switched types, which may break old entries. Beware!
Input not yet updated.
2011-03-11 12:28:15 -08:00
Evan Prodromou
487b3be198 Merge remote branch 'origin/1.0.x' into 1.0.x 2011-03-11 13:27:11 -06:00
Siebrand Mazeland
69e11bb45e Localisation updates from http://translatewiki.net. 2011-03-11 19:33:52 +01:00
Siebrand Mazeland
843ace580d i18n/L10n updates
Translator documentation added
2011-03-11 19:05:28 +01:00
Siebrand Mazeland
a70914cd57 i18n fixes: plugins should use _m(), not _(). 2011-03-11 18:33:19 +01:00
Siebrand Mazeland
76bffe1a64 * Superfluous whitespace removed
* Small L10n updates
2011-03-11 18:31:22 +01:00
Luke Fitzgerald
43db20ca98 Merge in upstream protocol change
"passport response message changed, it might return Compact2 instead of PPToken2 since 2011/2/14."
2011-03-11 17:23:14 +00:00
Evan Prodromou
5976a8542b Merge remote branch 'origin/1.0.x' into 1.0.x 2011-03-11 08:37:05 -06:00
Zach Copley
08018a1f7b Merge branch '1.0.x' into profile-fixups 2011-03-10 17:16:54 -08:00
Zach Copley
78ecb17ba1 User directory - fix nav 2011-03-10 17:15:56 -08:00
Zach Copley
302f0236bd Make correct nav menus show 2011-03-10 17:13:34 -08:00
Zach Copley
8efd2cf04d Make phone number save and display from DB 2011-03-10 16:57:41 -08:00
Zach Copley
78dc4f3a3d Merge branch '1.0.x' into profile-fixups 2011-03-10 14:22:41 -08:00
Zach Copley
24d0094192 User Directory - set class current on "All" if there is no selected filter 2011-03-10 14:20:35 -08:00
Zach Copley
c456e998c7 Make phone numbers save 2011-03-10 14:14:21 -08:00
Brion Vibber
eccadb4a7b cleanup... Poll main & response events seem to sorta work over ostatus now 2011-03-10 13:56:54 -08:00
Brion Vibber
6416f5ea41 fix 2011-03-10 13:47:44 -08:00
Brion Vibber
97df2f394f typo.... maybe that coffee's wearing off? 2011-03-10 13:46:20 -08:00
Brion Vibber
e54eb9117f backwards 2011-03-10 13:45:31 -08:00
Brion Vibber
d6c8c61076 AS output/input for poll responses 2011-03-10 13:41:23 -08:00
Brion Vibber
e085ef5ef5 Work on turning poll responses into activities so we can send them over ostatus bridge. Not yet bridging. 2011-03-10 12:38:25 -08:00
Brion Vibber
0511800351 Provisional tweak for polls to go through atom feeds / ostatus
Had to fix some calls to MicroAppPlugin->saveNoticeFromActivity() which passed an OStatus_profile instead of a Profile...
Imported polls don't get data from upstream or send it back currently.
2011-03-10 11:35:04 -08:00
Brion Vibber
2567474ddd Work in progress: fixing Poll posting URLs, working on AS input 2011-03-10 11:22:08 -08:00
Evan Prodromou
39f8d2c728 date picker for event form 2011-03-10 11:25:34 -06:00
Evan Prodromou
39b308bf90 reformatting on RSVP.php 2011-03-10 10:14:09 -06:00
Zach Copley
5203fa7151 Make all simple fields save 2011-03-09 19:31:37 -08:00
Zach Copley
adcda00e76 * Remove evil transaction
* Fix text value retrieval method
2011-03-09 19:27:21 -08:00
Brion Vibber
b653b2fb64 Update TinyMCE plugin for reusable thingies; doesn't quite arrange properly in the layout, we'll have to figure that out still. 2011-03-09 18:29:10 -08:00
Zach Copley
3d61d003bc Fix property declaration 2011-03-09 18:16:02 -08:00
Brion Vibber
662ad0f7bb Update DirectionDetector for reusable notice forms.
Also tweaked it to trigger on cut/paste, and to reset when the form resets.
2011-03-09 18:11:08 -08:00
Brion Vibber
4915b0cb9e Update Autocomplete plugin for reusable notice forms in 1.0.x. It's fun!
Now pulls the fetch API URL from a dedicated <span> with a data attribute ('data-url', should pass HTML 5 validators for our future overlords)
2011-03-09 18:01:41 -08:00
Zach Copley
c6f9baf78c Merge branch '1.0.x' into profile-fixups 2011-03-09 18:01:36 -08:00
Zach Copley
0429a52c6e Update to use new Managed_dataobject 2011-03-09 18:00:24 -08:00
Brion Vibber
ec828a094c Update LinkPreview plugin for multiple notice forms.
* main notice form setup now encapsulated into SN.Init.NoticeForm(form) -- this can be monkeypatched by plugins to append their own setup code, as LinkPreview does
* LinkPreview now supports debugging with non-minified JS source when $config['site']['minify'] is false
* tweaked core & neo styles so 'notice-status' class gets same styles as attach-status, so we can more easily add mroe statusy things. (needs more consolidation with geo-status, etc)
* tweaked LinkPreview's preview area to use that style
2011-03-09 17:43:31 -08:00
Brion Vibber
4ea35f339d Fixes for Event plugin:
* RSVP cancel/delete now works
* caching fix for RSVP insert and delete (compound unique keys aren't properly handled for pkeyGet's caching right now; hacked it for this class for the moment)
* div nesting fix
* missing name/avatar on RSVP responses
2011-03-09 14:10:26 -08:00
Brion Vibber
e9cab215fe Event: fix for display problem -- need to leave this div open for now 2011-03-09 13:31:22 -08:00
Zach Copley
65f9b5d954 Attempt to save field (doesn't work right yet) 2011-03-09 11:27:29 -08:00
Evan Prodromou
1d29ba8315 Merge branch 'event' into 1.0.x 2011-03-09 12:56:06 -05:00
Evan Prodromou
35429c28e5 updates to make RSVPs work 2011-03-09 12:28:25 -05:00
Evan Prodromou
728869e311 show RSVPs for an event 2011-03-09 10:40:49 -05:00
Evan Prodromou
a4b3edaf40 Login actions don't show the notice form 2011-03-09 10:11:59 -05:00
Evan Prodromou
f00f5f20b8 add url to events 2011-03-09 10:07:30 -05:00
Evan Prodromou
53e67b5ed5 make new event work, sort of 2011-03-09 02:48:14 -05:00
Evan Prodromou
ca36dfecf9 more fixes for events 2011-03-09 02:37:55 -05:00
Evan Prodromou
f715821cf0 Kinda complete and kinda working-ish events 2011-03-09 02:37:55 -05:00
Evan Prodromou
0b30fb3971 Make event-specific stuff in EventPlugin 2011-03-09 02:37:55 -05:00
Evan Prodromou
24fd39d6ab new Event plugin 2011-03-09 02:37:55 -05:00
Zach Copley
794cb5609b Save basic profile data to the right place 2011-03-08 19:20:43 -08:00
Brion Vibber
1413ed911f Hackaround for http caching problem on poll pages; the notice doesn't change, but the results do, so don't use the notice's last-modifeid time as a caching epoch. 2011-03-08 16:06:30 -08:00
Brion Vibber
921eb1eb23 quickie bar chart for poll results 2011-03-08 16:04:32 -08:00
Brion Vibber
d990357be9 fix off-by-one error in poll results display 2011-03-08 15:44:51 -08:00
Brion Vibber
cbf16a4974 Bookmark and poll plugins' custom notice forms now do AJAX submit, with the resulting notice appearing in the timeline.
FormNoticeXHR now is triggered on any form labeled with class 'ajax-notice', so those other than the traditional notice form should work as long as they handle the AJAX submission and return a properly formatted notice.

Things to watch out for:
* to determine whether the resulting notice should show on the current timeline, the JS code needs to be able to check the author and such. Keeping the existing vcard bits helps for this!
* the notice form submission stuff clears out inputs from your form -- test to make sure this behaves correctly
* error messages returned from the thingy _should_ come through, but this needs more testing for consistency
* while form components that aren't in a custom form should just be ignored, this should be tested more. (eg there's no location or attachment box for poll or bookmark plugins)
* NoticeListItem isn't currently reachable via autoloader -- touch NoticeList explicitly before calling into it for now.
2011-03-08 15:10:30 -08:00
Zach Copley
3bbe481695 Merge branch '1.0.x' into profile-fixups 2011-03-08 14:10:06 -08:00
Zach Copley
8ffae63b38 Merge branch '1.0.x' into profile-fixups 2011-03-08 14:03:40 -08:00
Brion Vibber
28809035d0 Replace explicit FormXHR setup for a bunch of simple AJAX form submissions with adding the 'ajax' class on them.
This avoids having to add extra custom JS bits just to initialize forms using the common AJAX submission path.
2011-03-08 13:58:28 -08:00
Brion Vibber
90f1cfcfc0 Poll plugin: make the polling response form submit via AJAX and return the results.
Now, any form marked with 'ajax' class will get the simple FormXHR treatment. Should help cut down on code that just adds that into individual forms.
2011-03-08 13:45:51 -08:00
Brion Vibber
ba1ada2880 de-IDifying labels in notice form to fix issue with geo pin activating the wrong place when cloning the form
Note that changes to the attachment from <label for/><input id/> to <label><input></label> affect some of the existing styles which attempt to place them both in the same place based on having a common parent. Only 'neo' has been fully tested and fixed for this case, as the others all fail due to the new layout anyway. :)
2011-03-08 12:14:44 -08:00
Zach Copley
cfe3e83293 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
* '1.0.x' of gitorious.org:statusnet/mainline:
  Initial checkin of Poll plugin: micro-app to post mini polls/surveys from the notice form.
  Localisation updates from http://translatewiki.net.
  More doc comments on MicroApp stuff; some of the show-notice code & the ActivityStreams stuff is a bit wonky and may need smoothing out
  Doc comments for MicroAppPlugin
  mailboxes were wrongly overriding global menu
2011-03-07 21:35:48 -08:00
Zach Copley
99bd8c670c Fix a couple things 2011-03-07 21:34:57 -08:00
Brion Vibber
3438a78c02 Initial checkin of Poll plugin: micro-app to post mini polls/surveys from the notice form.
This version is fairly basic; votes do not (yet) show a reply, they just got in the table. No pretty graphs for the results yet, just text.
The ActivityStream output is temporary and probably should be replaced; the current structures for adding custom data aren't really ready yet (especially since we need to cover JSON and Atom formats, probably pretty differently)

Uses similar system as Bookmark for attaching to notices -- saves a custom URI for an alternate action, which we can then pass in and hook back up to our poll object. This can probably do with a little more simplification in the parent MicroAppPlugin class.

Currently adds two tables:
- poll holds the main poll info: id and URI to associate with the notice, then the question and a text blob with the options.
- poll_response records the selections picked by our nice fellows.

Hopefully no off-by-one bugs left in the selection, but I give no guarantees. ;)
Some todo notes in the README and in doc comments.
2011-03-07 21:28:36 -08:00
Zach Copley
be53b94bfd - Fix table name; add comments 2011-03-07 17:26:19 -08:00
Siebrand Mazeland
b9e2c72740 Localisation updates from http://translatewiki.net. 2011-03-08 02:18:32 +01:00
Zach Copley
68a3246f1c Fixup sphinx plugin to have additional sort orders 2011-03-07 17:18:30 -08:00
Brion Vibber
541613ce69 More doc comments on MicroApp stuff; some of the show-notice code & the ActivityStreams stuff is a bit wonky and may need smoothing out 2011-03-07 15:15:21 -08:00
Zach Copley
b431a3b216 Rearrange alphanav to better fit 3CL 2011-03-07 14:32:14 -08:00
Brion Vibber
9a837ee33b Doc comments for MicroAppPlugin 2011-03-07 13:36:15 -08:00
Zach Copley
4b24f09ab4 Merge branch '1.0.x' into directory
* 1.0.x: (68 commits)
  Avoid AJAX fetch delay for inline replies when possible; we clone a copy of the notice form skeleton at initialization, then insert it in place instead of fetching a new one.
  Fix bad reference
  lost a </div> in input_forms
  neo is the default
  First version of 3cl theme neo.
  cleaner is the new default theme (for now)
  store reply_to notices as comment activity objects
  fix object errors with bookmark notices
  save the object type when saving a new bookmark notice
  ActivityObject uses Notice's object_type by default
  Notice saves its object type
  show correct notice in output
  UR FACE
  wrapper div for primary nav
  Revert "abstraction for starting and ending a menu"
  Revert "primarynav uses menustart and menuend"
  primarynav uses menustart and menuend
  abstraction for starting and ending a menu
  remove adminpanelnav from adminpanelaction module
  Input form switcher works
  ...
2011-03-07 12:37:51 -08:00
Evan Prodromou
095e2a74d4 fix object errors with bookmark notices 2011-03-07 14:25:37 -05:00
Evan Prodromou
f5782e9e56 save the object type when saving a new bookmark notice 2011-03-07 14:25:05 -05:00
Evan Prodromou
7aa55f8200 made the input-form switcher work, kinda 2011-03-07 03:34:20 -05:00
Evan Prodromou
52952d13c0 first (non-working) move to microapp structure for bookmarks 2011-03-07 03:34:20 -05:00
Zach Copley
00c14ffa88 Better instructions, and better empty search results messages. 2011-03-06 22:08:19 -08:00
Zach Copley
b3e3264a4d Merge branch '1.0.x' into directory
* 1.0.x:
  Localisation updates from http://translatewiki.net.
  * fix i18n and L10n issues. * update translator documentation. * remove superfluous whitespace.
2011-03-06 20:35:06 -08:00
Shashi Gowda
c335db4bbc OStatus support for people tags 2011-03-07 00:45:34 +05:30
Siebrand Mazeland
7a9b989349 Localisation updates from http://translatewiki.net.
Location information removed from translation files with msgmerge --no-location to decrease size of files and reduce diff size. Unfortunately there does not appear to be a setting in msgmerge or msgattrib to remove the extracted comments ("#.") from translation files. If you do know of such a switch, please let me know!
2011-03-06 02:52:28 +01:00
Zach Copley
1256181d36 Merge branch '1.0.x' into directory
* 1.0.x:
  * translator documentation updated. * superfluous whitespace removed. * small refactoring in noticeform.php to allow proper translator hints.
  * translator documntation updated * superfluous whitespace remove * minor L10n and i18n updates
  Cleanup & minification for migration to reusable notice form in inline replies. Yay!
  Work in progress: inline reply form reusing the main reply form now inserts the successful result more or less right
  style fixes for new notice form being reused in reply area
  Reusable notice form fixes for geolocation
  Loading the original form instead of faking up our own. Sorta works but not pretty :D
  Kill some more hardcoded ids...
  More hardcoded id cleanup in notice form...
  'link' to 'links' in feed document
2011-03-05 01:57:50 -08:00
Zach Copley
5d22f969a1 * Integrate search input box
* Fix ordering
2011-03-05 01:55:52 -08:00
Zach Copley
7d76b55da1 fixup comments 2011-03-04 17:55:56 -08:00
Zach Copley
52df926b8d Only show profiles of local users 2011-03-04 17:25:58 -08:00
Brion Vibber
5358f78e82 Reusable notice form fixes for geolocation 2011-03-04 14:27:55 -08:00
Zach Copley
b89f390b33 Merge branch '1.0.x' into directory 2011-03-03 21:13:21 -08:00
Zach Copley
f157c523fd * Reformat list of profiles in a table
* Make table sortable
2011-03-03 21:12:24 -08:00
Brion Vibber
cd20190ba5 Remove hardcoded #notice_action-submit from JS/CSS (prep for reusable notice forms) 2011-03-03 17:48:16 -08:00
Brion Vibber
b58aa29168 Notice form cleanup: removing hardcoded id from counter references; prep for reusable notice forms. 2011-03-03 17:15:17 -08:00
Siebrand Mazeland
5fd9767e80 Localisation updates from http://translatewiki.net.
* Fix previous commit. Pot files were built against master instead of 1.0.x.
2011-03-03 18:39:12 +01:00
Siebrand Mazeland
0210b765ad Localisation updates from http://translatewiki.net.
Looks like some documentation patches from 0.9.x didn't make it into 1.0.x (see statusnet.pot diff). Have to check with Brion what went wrong there.
2011-03-03 18:21:17 +01:00
Zach Copley
3b186e1bae * Fix pagination
* Add some more elements for styling
* Add initial CSS
2011-03-02 20:21:15 -08:00
Brion Vibber
641018e950 Merge branch 'master' into 0.9.x 2011-03-02 13:52:22 -08:00
Brion Vibber
9ad00f726f Add unsubscribe option to resub-feed.php 2011-03-02 12:49:37 -08:00
Zach Copley
09c90edbb5 Merge branch '1.0.x' into directory 2011-03-01 19:36:11 -08:00
Zach Copley
cb49ea88d3 Initial go at a site directory plugin 2011-03-01 19:35:20 -08:00
Brion Vibber
764d069ccd Clean up threaded notices vs replies classes, and fixed realtime's threaded behavior to only run on threaded lists 2011-03-01 16:08:37 -08:00
Brion Vibber
9fd2ee86f3 Inline reply work for threaded lists in realtime 2011-03-01 16:04:11 -08:00
Brion Vibber
5d6b9936c2 Partial update of Realtime for threaded view; can now place replies into the proper subtimeline if it's already present, but not if it wasn't shown yet. 2011-03-01 15:45:44 -08:00
Brion Vibber
dfbbeb67c8 Makefile for Realtime's min.js 2011-03-01 15:33:10 -08:00
Zach Copley
b7d0746694 Merge branch '0.9.x' into 1.0.x
Conflicts:
	actions/confirmaddress.php
	actions/emailsettings.php
	actions/hostmeta.php
	actions/imsettings.php
	actions/login.php
	actions/profilesettings.php
	actions/showgroup.php
	actions/smssettings.php
	actions/urlsettings.php
	actions/userauthorization.php
	actions/userdesignsettings.php
	classes/Memcached_DataObject.php
	index.php
	lib/accountsettingsaction.php
	lib/action.php
	lib/common.php
	lib/connectsettingsaction.php
	lib/designsettings.php
	lib/personalgroupnav.php
	lib/profileaction.php
	lib/userprofile.php
	plugins/ClientSideShorten/ClientSideShortenPlugin.php
	plugins/Facebook/FBConnectSettings.php
	plugins/Facebook/FacebookPlugin.php
	plugins/NewMenu/NewMenuPlugin.php
	plugins/NewMenu/newmenu.css
2011-02-28 15:39:43 -08:00
Brion Vibber
babdc430f9 Switch Twitter bridge settings page to be a ProfileSettingsAction, as ConnectSettingsAction is gone 2011-02-28 12:22:21 -08:00
Brion Vibber
061c8d959b Merge branch 'extprofile' into 0.9.x 2011-02-28 10:45:53 -08:00
Brion Vibber
2bd9532ebe Merge branch 'master' into 0.9.x 2011-02-28 10:18:18 -08:00
Siebrand Mazeland
78eed32781 Localisation updates from http://translatewiki.net. 2011-02-26 00:34:44 +01:00
Brion Vibber
9ec395b07a Workaround for reply timeline since_id issue: save the notice.created value into reply.modified, so we can key off it as expected.
As a hack this removes the mysql_timestamp bit from the field settings on reply.modified so that our value actually gets saved. This *should* work ok as long as system timezone is set correctly, which we now set to UTC to match when connecting.
2011-02-25 13:22:13 -08:00
Evan Prodromou
1508193df4 fix layout of form with magic hoohaw 2011-02-25 13:18:28 -08:00
Evan Prodromou
62a5f270d6 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x 2011-02-25 12:56:40 -08:00
Evan Prodromou
2b995c943f allow access to confirm first for not-logged-in users 2011-02-25 12:56:21 -08:00
Brion Vibber
880b1b666e Merge branch 'master' into 0.9.x 2011-02-25 12:24:18 -08:00
Brion Vibber
59a413cf5e Merge branch 'master' into 0.9.x 2011-02-25 10:16:00 -08:00
Evan Prodromou
7c192dabe2 Let users who aren't allowed to login confirm their email separately 2011-02-25 08:01:41 -08:00
Zach Copley
77c280a48b Revert "FacebookBridge - Add lots of debug output (revert me)"
This reverts commit c44a622449.
2011-02-24 14:21:50 -08:00
Zach Copley
7d50189ec2 FacebookBridge - Don't hinder autoloading if the Facebook ID and secret aren't set 2011-02-24 13:57:21 -08:00
Zach Copley
de6d46ea4b FacebookBridge - dequeue messages that aren't bound for Facebook 2011-02-24 13:29:56 -08:00
Zach Copley
c44a622449 FacebookBridge - Add lots of debug output (revert me) 2011-02-24 12:59:37 -08:00
Zach Copley
65dbf485e4 FacebookBridge - make a huge fuss if we can't create a valid Facebookclient 2011-02-24 12:52:31 -08:00
Brion Vibber
8eca1b8dac Fix ticket #3057: apply HTML escaping on special characters in Twitter import
Changes the replacement of Twitter "entities" from in-place reverse ordering ('to preserve indices') to a forward-facing append-in-chunks that pulls in both the text and link portions, and escapes them all.
This unfortunately means first *de*-escaping the &lt; and &gt; that Twitter helpfully adds for us.... and any literal &blah;s that get written. This seems to match Twitter's web UI, however horrid it is.
2011-02-21 16:36:39 -08:00
Brion Vibber
2a42dac72a Partial implementation for ticket #2442: MobileProfile plugin should allow manual switching between regular and mobile rendering modes
http://status.net/open-source/issues/2442

Notes:
* Mapstraction causes JavaScript errors in XHTML mode, breaking our code if we're run later so the link doesn't work to get back to Desktop.
* not 100% sure how safe feature detection is here?
* Currently will be useless but visible links if no JS available; need to fall back to server-side for limited browsers
2011-02-21 16:10:07 -08:00
Brion Vibber
3fb4b92cd6 Fix ticket #3001: Twitter bridge was replacing original form of @-mentions with canonical form unexpectedly
Now using the original text form of @-mentions and #-tags, as in Twitter's own HTMLification.
Canonical forms are still used in generating links, where it's polite to match the canonical form.
2011-02-21 15:01:57 -08:00
Evan Prodromou
bf8a3c1931 disallow login for users without validated email 2011-02-21 16:20:10 -05:00
Samantha Doherty
e9184dd775 HTML and style cleanup for EmailSummary plugin. 2011-02-18 13:49:29 -05:00
Siebrand Mazeland
3e7e6138a8 Localisation updates from http://translatewiki.net. 2011-02-17 12:27:14 +01:00
Evan Prodromou
07bc802867 argument to send email summary to all users on all sites 2011-02-16 11:58:35 -05:00
Evan Prodromou
10bb94807b fix indentation in siteemailsummaryhandler 2011-02-15 16:28:20 -05:00
Evan Prodromou
f31db669b0 fix indentation in sendemailsummary.php 2011-02-15 16:27:51 -05:00
Evan Prodromou
845b1cff72 fix indentation in Email_summary_status.php 2011-02-15 16:26:44 -05:00
Evan Prodromou
59afc4aa56 fix indentation in EmailSummaryPlugin.php 2011-02-15 16:26:15 -05:00
Evan Prodromou
128bfd7011 fix indentation in usermailsummaryhandler.php 2011-02-15 16:25:37 -05:00
Evan Prodromou
ff502bb148 Get correct size for default avatar in email summary 2011-02-15 12:53:02 -05:00
Siebrand Mazeland
a86d293c93 Localisation updates from http://translatewiki.net. 2011-02-14 19:43:16 +01:00
Brion Vibber
c92358fa7b add --all and --suspicious options for update-profile-data.php 2011-02-11 12:23:03 -08:00
Brion Vibber
f30744c7c5 refactor for multi.... 2011-02-11 12:13:33 -08:00
Brion Vibber
f7b431d60b woops 2011-02-11 12:08:35 -08:00
Brion Vibber
91535365b3 Work in progress: update-profile-data.php to update ostatus profile info from the current feed 2011-02-11 11:55:23 -08:00
Evan Prodromou
dc424ab63a Merge branch 'master' of gitorious.org:statusnet/mainline 2011-02-10 22:23:06 -05:00
Brion Vibber
b09276635c Merge branch 'master' into 0.9.x 2011-02-10 12:04:13 -08:00
Brion Vibber
2bf8a68908 Fix for ticket #3039: TwitterBridge was incorrectly sending repeats of Twitter-bound messages if the repeater has sending of things to Twitter disabled.
A repeat/retweet is roughly equivalent to an active direct post, so should follow the posting rules, rather than always sending over as we do for fave notifications.
2011-02-10 10:53:24 -08:00
Zach Copley
857e35c175 Merge branch 'master' of gitorious.org:statusnet/mainline
* 'master' of gitorious.org:statusnet/mainline:
  Show aside primary on settings pages for all themes.
  correct error in README on default for deletion
2011-02-10 10:26:36 -08:00
Zach Copley
d9ace57625 FacebookBridge - remove unnecessary warning and noisy debugging statement 2011-02-10 10:24:38 -08:00
Samantha Doherty
8a87e9869f Show aside primary on settings pages for all themes. 2011-02-10 13:23:20 -05:00
Evan Prodromou
8fa44e58f9 Try not to wipe out good data with empty values in Ostatus_profile::updateProfile()
Output from 0.9.6 PuSH feeds seems to have a rump <author> but no
<activity:actor>. It was overwriting valid and useful data set up at
subscribe time.

This fix tries to avoid overwriting data. However, it may prevent
updates that delete data.

Bug: 3028
2011-02-10 09:39:40 -05:00
Brion Vibber
a76f067631 Partial revert of 073f3e99: restores the original non-hashbang URLs for twitter users as the remote profile.
Should fix issue #3027: twitter user avatars not getting imported.

Due to the change in URI, all twitter users that had been previously seen were getting new profile entries, which tried to save the same avatar. This would fail as Avatar.url has a unique index.
Note: now anything new seen in the last couple days in production will still potentially conflict.
2011-02-09 13:46:48 -08:00
Evan Prodromou
c273876298 Merge branch 'master' of gitorious.org:statusnet/mainline 2011-02-09 03:09:24 -05:00
Evan Prodromou
10500e7f85 ensure*() functions throw exceptions for errors 2011-02-09 03:08:52 -05:00
Brion Vibber
75bf756111 LOG_WARN -> LOG_WARNING 2011-02-08 23:34:37 -08:00
Zach Copley
98af8d2a19 FacebookBridge plugin - allow Facebook app ID and secret to be
initialized via config.php
2011-02-09 04:49:39 +00:00
Evan Prodromou
399977aebf Merge remote branch 'origin/pluginstatic' into testing 2011-02-08 13:39:17 -05:00
Brion Vibber
1c3fabbc27 Add a brief explanation of what group inbox is at the top of the page (instructions section), plus a message to show when there are no private messages in the inbox. 2011-02-07 12:39:40 -08:00
Brion Vibber
ac5e7b727a Merge branch 'testing' of gitorious.org:statusnet/mainline into testing 2011-02-07 12:20:12 -08:00
Brion Vibber
4883069177 Fix group regexes that got missed in Nickname::DISPLAY_FMT update: fixes bug where group linking happened, but not actual delivery, when using _underscores_ in the !group_name 2011-02-07 12:18:41 -08:00
Evan Prodromou
dbd496f901 hide feeds from group page if it's private-only 2011-02-07 14:24:35 -05:00
Evan Prodromou
204b5e8a63 Show a little indicator for private-only groups 2011-02-07 14:21:54 -05:00
Evan Prodromou
1d439ef5d8 Force notices to DMs when privacy = always 2011-02-07 12:58:42 -05:00
Evan Prodromou
80a4b9c76f Change category and copyright year 2011-02-07 12:28:58 -05:00
Evan Prodromou
e759b15a92 pagination for group inbox 2011-02-07 12:08:18 -05:00
Evan Prodromou
20824292c9 Rename PrivateGroup to GroupPrivateMessage to be clearer 2011-02-07 11:57:34 -05:00
Evan Prodromou
ee0bbdf89c Add group info to new group message email 2011-02-07 11:55:16 -05:00
Evan Prodromou
951df6b02f button on the group page to post a new message 2011-02-07 11:51:38 -05:00
Evan Prodromou
5db1479a95 Form for posting a group message on group inbox 2011-02-07 11:24:00 -05:00
Evan Prodromou
4a435e6670 Show group local nav on group inbox 2011-02-07 10:18:54 -05:00
Evan Prodromou
143cc4bdd0 Show private messages to groups in a list
Shows the messages to a private group in a list. New classes for
showing a group private message and list of group private messages.

New actions for showing a stream of group private messages and a
single group private message.
2011-02-07 09:46:26 -05:00
Evan Prodromou
842bc5708e Send a private group message with a d command 2011-02-04 15:51:59 -05:00
Brion Vibber
672eb17e94 Work in progress: partway through making profile_detail DB-accessible 2011-02-03 17:15:12 -08:00
Evan Prodromou
a002d57736 save group privacy settings 2011-02-03 16:39:52 -05:00
Evan Prodromou
8bf57019c1 autoload private group classes 2011-02-03 15:30:57 -05:00
Evan Prodromou
094bb9e1c3 redo the group dm schema, again 2011-02-03 15:28:41 -05:00
Evan Prodromou
99db745f9d Merge branch 'testing' into privategroup
Conflicts:
	lib/groupeditform.php
2011-02-03 12:56:55 -05:00
Evan Prodromou
67b83bcca8 FacebookBridge use Plugin::path() 2011-02-03 12:22:39 -05:00
Evan Prodromou
ffb7ca3e99 Realtime needs to load from own directory, not subclass's 2011-02-03 12:18:57 -05:00