eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity
14,761 Commits 8 Branches 3 Tags 310 MiB
4a30da924a
Commit Graph

3544 Commits

Author SHA1 Message Date
Evan Prodromou
527ed62f3f Merge branch '1.0.x' into testing 2011-06-10 17:46:44 -04:00
Evan Prodromou
f294ed0091 remember to send confirmation email for registration 2011-06-10 17:46:35 -04:00
Evan Prodromou
8b47400183 Merge branch '1.0.x' into testing 2011-06-10 16:51:07 -04:00
Evan Prodromou
c227045975 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-06-10 16:50:33 -04:00
Evan Prodromou
331d8a99ba Merge branch 'statusnetworkapi' into 1.0.x 2011-06-10 16:50:15 -04:00
Evan Prodromou
625e63a303 Make errors work correctly 2011-06-10 16:50:06 -04:00
Evan Prodromou
2d72a64841 First pass at complete global API 2011-06-10 15:51:30 -04:00
Zach Copley
36d619480a Rip out user, group and site design customization code 
Squashed commit of the following:

commit 0bcfb6535115ec0a11669420f8689aeedc417bc8
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 15:51:47 2011 -0400

    Remove design-related stuff from the API

commit 88da010256fbcaee1ff01d9507ea47d3225f2825
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 15:40:16 2011 -0400

    Mop up misc design related code

commit 11958b064745b797b4c9f9f4b7e8f65e4c82ce83
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 15:21:00 2011 -0400

    Remove Design DB_DataObject class and references to it in schema

commit f8540594728ce6ba4697eb21657ccb897a9fc127
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 13:15:54 2011 -0400

    Remove design-related actions and widgets

commit ddf7b4d425b88b58956b8be06047d2a3e0560bd2
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 13:10:57 2011 -0400

    Remove navigation / routing to design settings actions

commit e3f280f8780d99168edf37ef766956f281e9c5da
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 13:03:09 2011 -0400

    CurrentUserDesignAction -> Action

commit 6780b1a07e1375a7fa0fd48c8bf3109d9a12e33e
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 12:54:22 2011 -0400

    * GroupDesignAction -> GroupAction (new base class for group actions)

commit 2136377e895db274709a1d486f377f13946ccfd6
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 12:36:40 2011 -0400

    OwnerDesignAction -> Action
 2011-06-09 16:20:19 -04:00
Evan Prodromou
fdee419051 Merge branch '1.0.x' into testing 2011-06-09 10:33:36 -04:00
Evan Prodromou
ed61a217a2 clear up whitespace in sendemailsummary 2011-06-08 16:33:06 -04:00
Samantha Doherty
c6d6749d6f Only unbind privacy checkbox when actually on mobile profile, oops. 2011-06-08 15:59:05 -04:00
Evan Prodromou
c9756872bc Wrap email summary and better subject line 2011-06-08 15:23:41 -04:00
Evan Prodromou
ba219fa805 include a dummy non-empty value for sitesum queue items 2011-06-08 08:46:44 -04:00
Evan Prodromou
65005d35ce correct transport for usersum 2011-06-08 08:46:21 -04:00
Evan Prodromou
40cfc5490a fix the streams for email summary 2011-06-07 17:38:24 -04:00
Evan Prodromou
a10edb3183 Merge branch 'testing' into 1.0.x 
Conflicts:
	plugins/Directory/locale/mk/LC_MESSAGES/Directory.po
	plugins/Directory/locale/tl/LC_MESSAGES/Directory.po
 2011-06-07 16:04:49 -04:00
Evan Prodromou
59c980cea8 first pass at actions for initializing a network 2011-06-07 12:06:02 -04:00
Evan Prodromou
17294a4627 move email registration code to DomainStatusNetworkPlugin 2011-06-06 12:25:26 -04:00
Siebrand Mazeland
31a92ede44 Update translator documentation. 
i18n/L10n updates.
Whitespace update.
 2011-06-06 00:38:38 +02:00
Siebrand Mazeland
f007bcee16 Add translator documentation. 2011-06-06 00:37:10 +02:00
Siebrand Mazeland
9358a34384 Add translator documentation. 2011-06-06 00:36:50 +02:00
Siebrand Mazeland
ff33d0ff35 Add onPluginVersion(). 
Add translator documentation.
Whitespace update.
Add FIXME for global functions.
 2011-06-06 00:36:31 +02:00
Siebrand Mazeland
9a59d44208 Add translator documentation. 
L10n update.
Whitespace update.
 2011-06-06 00:35:40 +02:00
Siebrand Mazeland
c11a549071 Add translator documentation. 2011-06-06 00:35:12 +02:00
Siebrand Mazeland
2b3b11fca6 Add translator documentation. 2011-06-06 00:34:57 +02:00
Siebrand Mazeland
c3f081c583 Localisation updates from http://translatewiki.net. 2011-06-05 21:15:31 +02:00
Siebrand Mazeland
acc4d8b1c3 Use language specific truncation symbol. 
Add translator documentation.
 2011-06-05 20:51:50 +02:00
Siebrand Mazeland
49eb66c57e Update translator documentation. 
Whitespace updates.
i18n/L10n updates.
 2011-06-05 20:42:11 +02:00
Siebrand Mazeland
8807705bb4 Update translator documentation and whitespace. 2011-06-05 20:23:13 +02:00
Siebrand Mazeland
4110266b68 Update translator documentation. 
i18n/L10n fixes.
Whitespace updates.
 2011-06-05 20:15:01 +02:00
Siebrand Mazeland
8ce0acca33 Add translator documentation. 2011-06-05 19:59:50 +02:00
Siebrand Mazeland
158140a118 Add translator documentation. 
Whitespace updates.
i18n fixes.
 2011-06-05 19:58:11 +02:00
Siebrand Mazeland
fdca686298 Update translator documentation. 
Update whitespace.
 2011-06-05 19:46:45 +02:00
Siebrand Mazeland
59006ffee1 Update translator documentation. 2011-06-05 19:40:25 +02:00
Siebrand Mazeland
eb0fb9c2b7 Add todo. URLs are outdated. 2011-06-05 19:39:59 +02:00
Siebrand Mazeland
0cca861ea7 Update translator documentation. 
L10n fixes.
Whitespace updates.
 2011-06-05 19:33:41 +02:00
Siebrand Mazeland
b4efd97c62 Add translator documentation. 2011-06-05 19:30:04 +02:00
Siebrand Mazeland
b0e80d1e28 Fix xgettext translator comment. 2011-06-05 19:27:42 +02:00
Siebrand Mazeland
9e78c631fb Fix plural issue. 
Fix translator documentation.
 2011-06-05 19:23:35 +02:00
Siebrand Mazeland
7c5fb37e59 Localisation updates from http://translatewiki.net. 2011-06-05 11:50:05 +02:00
Siebrand Mazeland
834ed4365d Fix i18n. 
Update translator documentation.
 2011-06-05 11:44:01 +02:00
Siebrand Mazeland
a4e807ea46 Add translator documentation. 2011-06-05 11:35:11 +02:00
Siebrand Mazeland
9f9f940833 Add translator documentation. 
Change a few double quotes to single quotes.
 2011-06-05 11:30:46 +02:00
Siebrand Mazeland
9baa02fc7c Add translator documentation. 2011-06-05 11:22:56 +02:00
Siebrand Mazeland
3dcdf2ef03 Update translator documentation. 2011-06-05 11:12:34 +02:00
Siebrand Mazeland
9758134d1a Update translator documentation. 
Update whitespace.
L10n/i18n updates.
 2011-06-05 11:06:47 +02:00
Evan Prodromou
e1791525e8 initialize schema_version table after install 2011-06-02 13:58:53 -04:00
Evan Prodromou
7f1a30dc40 allow setting some initial tags on a new network 2011-06-01 10:53:46 -04:00
Evan Prodromou
f4e17c1bdf Merge branch '1.0.x' into testing 2011-05-31 17:16:45 -04:00
Brion Vibber
712ba64fa6 Apply upstream fix to MSN library for darkip 
Upstream fix
http://code.google.com/p/phpmsnclass/source/diff?spec=svn52&old=47&r=52&format=unidiff&path=%2Ftrunk%2Fphpmsnclassv2%2Fmsn.class.php
 2011-05-31 11:46:50 -07:00
Samantha Doherty
a026608953 Only use mobile doctype on actual mobile devices. 2011-05-31 12:14:26 -04:00
Evan Prodromou
412adfb587 Merge branch '1.0.x' into testing 2011-05-30 15:37:46 -04:00
Samantha Doherty
70f01b2b34 Remove privacy checkbox replacement from Mobile Profile. 2011-05-27 11:50:49 -04:00
Evan Prodromou
b34e267e53 Merge branch '1.0.x' into testing 
Conflicts:
	plugins/EmailRegistration/scripts/cancelemailregistration.php
 2011-05-23 18:20:18 -04:00
Evan Prodromou
fd847c29c5 Make emailregistration more invitation-friendly 2011-05-23 17:45:41 -04:00
Evan Prodromou
86a7889012 render question description in QnA plugin 2011-05-23 12:33:16 -04:00
Evan Prodromou
f1772b75d5 render question description in QnA plugin 2011-05-23 12:30:34 -04:00
Evan Prodromou
3f3babbcf2 Merge remote-tracking branch 'origin/1.0.x' into 1.0.x 2011-05-23 12:29:08 -04:00
Siebrand Mazeland
def0483c5e Small change to kick syntax highlighter into shape. 2011-05-20 16:58:02 +02:00
Siebrand Mazeland
e48c26e156 Update translator documentation, i18n and L10n. 2011-05-20 16:57:05 +02:00
Siebrand Mazeland
3501ad6c77 Add FIXME for missing i18n. 2011-05-20 16:56:12 +02:00
Siebrand Mazeland
1d1a929718 Update translator documentation and L10n. 2011-05-20 16:03:53 +02:00
Evan Prodromou
9c4c2c710f remove stray newlines that were causing problems with the build 2011-05-20 06:08:42 -07:00
Evan Prodromou
b9f8e6e8cc fail quickly if we can't find a for DomainStatusNetwork 2011-05-19 15:30:38 -04:00
Samantha Doherty
2a0dc2291d Toggle to show and hide local nav. 2011-05-18 11:08:31 -04:00
Samantha Doherty
e3acf5b72b Remove primary nav and notice form overrides, and extra notice forms, from MobileProfile. 2011-05-18 10:13:06 -04:00
Zach Copley
73251c7629 Script to cancel an email registration 2011-05-16 13:37:55 -07:00
Zach Copley
4718063a78 Script to cancel an email registration 2011-05-16 13:25:26 -07:00
Zach Copley
125141a0c6 Make the effects for adding/removing invites less jerky 2011-05-11 17:20:24 -07:00
Zach Copley
4a04291c16 Make add/remove item buttons work the same way they do on the extended profile form 2011-05-11 16:29:35 -07:00
Zach Copley
607fa56449 Don't add the user's domain to invitee domains unless it's on the whitelist 2011-05-11 16:19:51 -07:00
Zach Copley
84c8ffc28a Show confirm dialog when deleting an invite (if the user has already entered an email address) 2011-05-11 16:00:35 -07:00
Zach Copley
04a593487a Change whitelist invite form's add new item control to be consistent with similar controls elsewhere 2011-05-11 14:33:22 -07:00
Samantha Doherty
d0c850f380 Quick fix for extended profile js buttons 2011-05-11 16:57:42 -04:00
Zach Copley
368b25fb34 When showing the email invite dropdowns, pre-select the user's own domain as the first option 2011-05-10 14:47:05 -07:00
Zach Copley
8597856b56 Fancier invitation form for whitelisted domains 
Squashed commit of the following:

commit 1c0766e8f9d9e962ec553e2fb35bd2f944ffb4b0
Author: Zach Copley <zach@status.net>
Date:   Mon May 9 17:00:51 2011 -0700

    Make the invites from the fancier invite form save

commit 9ea45b7cf38eda8dad1d82e87b3400413a532079
Author: Zach Copley <zach@status.net>
Date:   Fri May 6 16:14:40 2011 -0700

    .js to let the user add (and remove) additional invitees from their domain

commit b2a02339bd11d02c7cba24629dde359e22de32b6
Author: Zach Copley <zach@status.net>
Date:   Thu May 5 15:44:49 2011 -0700

    Load special whitelist invite .js when loading the invite page

commit 132fed7550b40cd1d46ee506fd83974a116bce32
Author: Zach Copley <zach@status.net>
Date:   Wed May 4 18:35:49 2011 -0700

    Remove settings class from whitelist inviter form

commit a38437351b505594aead5da86af9a5ed089666b6
Author: Zach Copley <zach@status.net>
Date:   Wed May 4 18:21:18 2011 -0700

    Make a fancier form for whitelist domain invites

commit 710d4f41edf412871a9c1fbf33af317226485325
Author: Zach Copley <zach@status.net>
Date:   Wed May 4 17:34:09 2011 -0700

    Add some more events to the invitation page

commit 2449e4e0c1bf11568968cfc3ea2d8e69db2d875e
Author: Zach Copley <zach@status.net>
Date:   Wed May 4 17:12:36 2011 -0700

    Refactor invite action a bit
 2011-05-09 17:07:36 -07:00
Siebrand Mazeland
bd7f74f0a5 Fix i18n issues. 
Update translator documentation.
Whitespace updates.
 2011-05-08 10:12:05 +02:00
Zach Copley
fc62a8f980 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-05-05 15:00:16 -07:00
Zach Copley
94c858d1e1 * Show group descriptions in group directory 
* Truncate descriptions and bios in directory list when > 140c
 2011-05-05 14:57:38 -07:00
Evan Prodromou
e863903263 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-05-05 14:45:50 -07:00
Evan Prodromou
78a9d4966e set the permissions properly for installer 2011-05-05 14:38:19 -07:00
Siebrand Mazeland
d4aef7a007 Localisation updates from http://translatewiki.net. 2011-05-05 23:24:49 +02:00
Evan Prodromou
763229aede Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x 2011-05-05 12:09:10 -07:00
Siebrand Mazeland
30bb740642 Hardcode newline outside of message to avoid issues with translations as fixed by Evan in Commit:6868bf461a5186be3eac619b73cc6550c6048f93. 2011-05-05 12:41:10 +02:00
Evan Prodromou
c7511094db Merge branch '1.0.x' into testing 2011-05-04 18:45:23 -07:00
Zach Copley
c4aef15a15 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-05-04 16:13:42 -07:00
Zach Copley
f4a06719b1 Fix WSOD with EmailRegistration plugin's confirmation form 2011-05-04 16:12:49 -07:00
Evan Prodromou
67690b44c5 Merge branch '1.0.x' into testing 2011-05-04 15:00:50 -07:00
Evan Prodromou
c97048d01b merge 0.9.x into 1.0.x 2011-05-04 14:59:39 -07:00
Evan Prodromou
900b9ab498 Merge branch '1.0.x' into testing 2011-05-04 13:05:06 -07:00
Evan Prodromou
7e1ae44fad source for registration email confirmation 2011-05-04 12:25:34 -07:00
Evan Prodromou
aef62ccbcc Option for custom template for confirmation email 2011-05-04 11:37:32 -07:00
Evan Prodromou
1b5bd8991b use a template for confirmation email 2011-05-04 11:37:03 -07:00
Evan Prodromou
b432cc72c9 optionally send welcome email in installforemail.php 2011-05-04 11:10:21 -07:00
Evan Prodromou
914de296a1 send a confirmation email when registering by script 2011-05-04 11:05:38 -07:00
Evan Prodromou
784da5d231 Make EmailRegistration respect registration flags 
The email registration code wasn't respecting site-closed or
site-inviteonly flags. This is fixed.
 2011-05-02 19:12:29 -07:00
Evan Prodromou
fde6e672cf Fix error in domainstatusnetworkinstaller that cleared tags table 
An error in the domainstatusnetworkinstaller cleared the tags table,
losing any information about sites on the service. (We discovered this
in production on StatusNet OnDemand). Conjunction of these factors: 1)
the installer code was using an insert()'ed object with an
auto-incrementing key, which because the statusnet.ini was incorrect,
wasn't getting updated. 2) It then called setTag() on that object,
which deletes all tags matching the id, then adds in the new ones. 3)
Because the ID was null, DB_DataObject deleted all rows in the table.

I've made a work-around that re-fetches the status_network object
based on its (unique) nickname, which gets the correct ID, which
should work for tags. Confirmed that it works. Still need to fix the
underlying problems, however.
 2011-05-02 18:51:09 -07:00
Evan Prodromou
1e2d317b9c remove action-specific from RequireValidatedEmail 2011-05-02 11:21:37 -07:00
Evan Prodromou
6464c77505 fix warning for logs 2011-04-29 12:48:41 -07:00
Evan Prodromou
6868bf461a whitespace problems in directory translations 2011-04-29 11:11:04 -07:00
Siebrand Mazeland
e573d4b3a4 Simplify message. 2011-04-29 19:23:13 +02:00
Siebrand Mazeland
558a512ac7 Update translator documentation. 
Update L10n.
Update whitespace.
 2011-04-29 19:22:44 +02:00
Siebrand Mazeland
4651c9d94a Fix L10n/i18n. 
Some remaining people tag -> list.
Favor -> like
Update translator documentation.
Whitespace updates.
 2011-04-29 18:59:47 +02:00
Siebrand Mazeland
c13fbfb2d2 Update i18n, 
Add onPluginVersion().
Add translator documentation.
Update whitespace.
 2011-04-29 17:11:22 +02:00
Siebrand Mazeland
1ec1f9378a Whitespace updates. 
Translator documentation.
 2011-04-29 12:30:30 +02:00
Zach Copley
cb6b5b2cc6 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 
* '1.0.x' of gitorious.org:statusnet/mainline:
  more verbose, better checks for installforemail
  Check for unavailable site nicknames in DomainStatusNetwork
  Status_network::setupDB() sets up related tables too
  Class to store unavailable status network names
  First version of installer for domain-based status networks
  Ignore empty email whitelist string
  Don't redefine 'STATUSNET' in installer
  move registeremailuser.php back to email registration
  Move common domain-to-network mapping to the plugin module
  move external libs for domains here
  move domain status network scripts
  Revert "Add DomainStatusNetwork plugin"
  add DomainStatusNetwork plugin
  Add DomainStatusNetwork plugin
  utility functions for setting config options in memory
  get a free site nickname by email or domain
  TLD utilities
  script to determine site nickname by domain
  lookup a statusnetwork by tag
 2011-04-28 15:54:13 -07:00
Zach Copley
cd0d7be251 Add registration events to EmailregisterAction 2011-04-28 15:53:17 -07:00
Evan Prodromou
83819737d7 more verbose, better checks for installforemail 2011-04-28 15:30:59 -07:00
Evan Prodromou
ddead1e611 Check for unavailable site nicknames in DomainStatusNetwork 2011-04-28 15:30:23 -07:00
Evan Prodromou
02c5d68bed Merge branch 'emailsitesetup' into 1.0.x 2011-04-28 12:44:21 -07:00
Evan Prodromou
f24af19b79 First version of installer for domain-based status networks 
New installer class for domain-based status networks. (XXX: this should
probably be generalized for all multi-home systems). New script to run that
installer.
 2011-04-28 12:39:59 -07:00
Evan Prodromou
b63c0c3c72 Ignore empty email whitelist string 2011-04-28 12:39:23 -07:00
Craig Andrews
d9d9a10b6f Fix infinite scroll to work on 1.0.x 
add on_next_only configuration option
 2011-04-28 13:26:15 -04:00
Evan Prodromou
1946eba7f4 move registeremailuser.php back to email registration 2011-04-27 14:54:21 -07:00
Evan Prodromou
b6bad0232e Move common domain-to-network mapping to the plugin module 2011-04-27 14:48:26 -07:00
Zach Copley
bfc3cc9461 Fix URLs to reflect change in reCAPTCHA API 2011-04-27 19:48:25 +00:00
Zach Copley
2d420b4661 Fix URLs to reflect change in reCAPTCHA API 2011-04-27 19:40:43 +00:00
Evan Prodromou
20e588d212 move external libs for domains here 2011-04-27 14:38:47 -04:00
Siebrand Mazeland
0df111025f Update translator documentation. 
L10n/i18n fixes.
Update whitespace.
 2011-04-27 20:37:44 +02:00
Siebrand Mazeland
940af215b4 Remove locale files. Plugin no longer has a UI. 
Whitespace update.
 2011-04-27 19:31:02 +02:00
Siebrand Mazeland
5d72b600a1 Localisation updates from http://translatewiki.net. 2011-04-27 14:53:02 +02:00
Siebrand Mazeland
1bc62a8545 Fix typo. Spotted by Peter17. 2011-04-27 14:13:49 +02:00
Evan Prodromou
32cb8b1304 move domain status network scripts 2011-04-26 17:48:01 -04:00
Evan Prodromou
6576dbdf43 Revert "Add DomainStatusNetwork plugin" 
This reverts commit 4479e7efc7.
 2011-04-26 16:52:04 -04:00
Evan Prodromou
74e8409fad add DomainStatusNetwork plugin 2011-04-26 16:51:49 -04:00
Evan Prodromou
4479e7efc7 Add DomainStatusNetwork plugin 2011-04-26 16:51:05 -04:00
Evan Prodromou
57d1a3dcc0 get a free site nickname by email or domain 2011-04-26 16:17:24 -04:00
Evan Prodromou
c79a53f341 TLD utilities 2011-04-26 16:16:25 -04:00
Evan Prodromou
260f6ccdf2 script to determine site nickname by domain 2011-04-26 16:16:10 -04:00
Siebrand Mazeland
7ad9f23b12 Update translator documentation. 
Break lines in README at or before 80 characters.
i18n fixes.
Whitespace updates.
 2011-04-25 22:44:24 +02:00
Siebrand Mazeland
a4c5a0a229 Update indentation, whitespace and line breaks. 2011-04-25 22:44:22 +02:00
Siebrand Mazeland
3bcff2fa86 Use profile->getBestName() instead of more complex i18n unfriendly construction. 
Update translator documentation.
Number parameters where more than one is used.
L10n updates.
Update README file to break lines at or just before 80 characters.
Remove PHP4-ism "?>"
Update indentation.
Update whitespace.
 2011-04-25 22:44:21 +02:00
Siebrand Mazeland
a2e4a1803c Harmonize message for 'User has no profile.' and update translator documentation. 2011-04-25 22:44:19 +02:00
Siebrand Mazeland
f7b45f15fa Add plugin file to ensure these files are picked up by scripts/update_po_templates.php. 2011-04-24 20:51:08 +02:00
Siebrand Mazeland
9300803e88 Follow-up Commit:f70569ddb5b109bdc18fce033bf38bf00247871d 
* Fix incorrect parameter in sprintf(). Spotted by Giftpflanze.
 2011-04-24 20:30:58 +02:00
Siebrand Mazeland
f70569ddb5 Fix incorrect parameter in sprintf(). Spotted by Giftpflanze. 
Update translator documentation.
 2011-04-24 19:53:28 +02:00
Siebrand Mazeland
e6d053ac41 Update translator documentation. 
L10n/i18n updates.
Whitespace updates.
Break long lines in README files.
 2011-04-24 19:28:26 +02:00
Evan Prodromou
f79d59a081 Merge branch '1.0.x' into testing 2011-04-21 16:16:07 -04:00
Evan Prodromou
a821ec4963 don't show empty tag links for bookmarks 2011-04-21 16:13:47 -04:00
Brion Vibber
f0ea629990 AJAX notice form setup for the expanded bookmark form. 2011-04-21 12:35:33 -07:00
Evan Prodromou
9a62b7b18f better error-handling when it's Ajax 2011-04-21 15:25:29 -04:00
Evan Prodromou
963d052653 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-04-21 15:23:22 -04:00
Siebrand Mazeland
2f48f0f914 Localisation updates from http://translatewiki.net. 2011-04-21 20:54:12 +02:00
Evan Prodromou
8dd8b58b45 don't use thumbnail if it's not there 2011-04-21 14:53:17 -04:00
Siebrand Mazeland
5e97047f8f Update translator documentation. 
i18n fixes.
Whitespace updates.
 2011-04-21 20:26:58 +02:00
Evan Prodromou
63009f1e1b Merge branch '1.0.x' into testing 2011-04-21 13:37:15 -04:00
Evan Prodromou
36d56232c6 a little better notice hiding 2011-04-21 13:37:05 -04:00
Evan Prodromou
7aa3565162 trim invite and confirm addresses 2011-04-21 11:11:46 -04:00
Evan Prodromou
c475e58e64 be more tolerant of whitespace in email addresses 2011-04-21 10:51:58 -04:00
Evan Prodromou
10cffa8afa Move business logic of email registration to plugin 
Moved the main business logic of email registration to the
EmailRegistrationPlugin. That lets us register from a script, from the
emailregister account, or (hopefully) from the signup page.
 2011-04-21 10:15:51 -04:00
Evan Prodromou
2e93d5e551 Script to register a user by email address 2011-04-21 10:11:20 -04:00
Evan Prodromou
7e6cffe4cf Correct formats for event list items 2011-04-20 10:59:31 -04:00
Evan Prodromou
0e4029ecb6 Fixup rendering of event and RSVP 2011-04-20 10:57:46 -04:00
Evan Prodromou
1ab8004d78 Move Event and RSVP rendering to listitem classes 2011-04-20 10:52:57 -04:00
Evan Prodromou
e5961efc27 Merge branch 'betterbookmarknotice' into 1.0.x 2011-04-20 06:35:14 -04:00
Evan Prodromou
12723f2dc6 better output for bookmark list item 2011-04-20 06:34:27 -04:00
Siebrand Mazeland
cb8eb4d307 Localisation updates from http://translatewiki.net. 2011-04-20 10:19:58 +02:00
Evan Prodromou
6ee2adee4c add some wrapper markup for bookmarklistitem 2011-04-19 17:56:23 -04:00
Evan Prodromou
ea95f7b7b0 move long name to shorter name for bookmarklistitem 2011-04-19 17:38:56 -04:00
Evan Prodromou
25a037ba9c Revert "autoload bookmarknoticelistitemadapter" 
This reverts commit f880e6498d.
 2011-04-19 17:28:24 -04:00
Evan Prodromou
501ecb33cc Revert "hard-require the adapter" 
This reverts commit 8b0f45d0a7.
 2011-04-19 17:28:03 -04:00
Evan Prodromou
8b0f45d0a7 hard-require the adapter 2011-04-19 16:53:34 -04:00
Evan Prodromou
f880e6498d autoload bookmarknoticelistitemadapter 2011-04-19 16:26:00 -04:00
Siebrand Mazeland
0d892e7610 i18n fixes. 
Whitespace updates.
Update translator documentation.
 2011-04-19 21:54:56 +02:00
Evan Prodromou
7b397823d0 Move bookmark rendering to notice list item adapter 
Move the tricky stuff with Bookmarks to a notice list item adapter.
 2011-04-19 15:52:57 -04:00
Evan Prodromou
138ca38b6f Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x 
Conflicts:
	plugins/EmailRegistration/emailregister.php
 2011-04-18 20:19:25 -04:00
Zach Copley
bc66211565 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 
* '1.0.x' of gitorious.org:statusnet/mainline:
  Update translator documentation.
 2011-04-18 16:51:49 -07:00
Zach Copley
76ea9384a3 Remove billions of debugging statements and extra space 2011-04-18 16:49:32 -07:00
Zach Copley
ee799927e6 Fixed new answer textarea label 2011-04-18 16:49:32 -07:00
Zach Copley
c79d90be27 Only remove reply placeholders if the dummy answer field is visible 2011-04-18 16:49:32 -07:00
Zach Copley
5721bb146a Add a 'closed' class to questions that have been closed 2011-04-18 16:49:32 -07:00
Zach Copley
68f6076831 OMG I think ajax works right now 2011-04-18 16:49:32 -07:00
Zach Copley
583b903559 More work trying to understand util.js and get my ajax working right 2011-04-18 16:49:00 -07:00
Zach Copley
d1443a6bd9 Getting some traction here on better QnA Ajax 2011-04-18 16:47:33 -07:00
Zach Copley
a610836e1c Better QnA ajax insert - work in progress 2011-04-18 16:47:01 -07:00
Zach Copley
6bf29ff684 QnA - Work on getting questions and answers to appear correctly inline 2011-04-18 16:46:11 -07:00
Evan Prodromou
997b0933ea Don't use bogus event in emailregistration 
I was trying to be smart by calling the same registration event as 'register'
when doing EmailRegistration. However, that event is so low-bandwidth that plugins
go fingerpoken in all the attributes and call methods on the passed-in action and
things like that.

So, now we just fall back to using the low-level stuff, catch any
exceptions, and feel happy. Some stuff might not work, but it's
generally anti-spam stuff more suited to public sites.
 2011-04-18 19:33:12 -04:00
Siebrand Mazeland
2c105e5575 Update translator documentation. 2011-04-19 01:13:28 +02:00
Evan Prodromou
d3215adfa1 Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x 2011-04-18 12:54:23 -04:00
Samantha Doherty
e8e6d494d2 This util.min.js is pining for the fjords. 2011-04-18 12:42:00 -04:00
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