eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity
14,530 Commits 8 Branches 3 Tags
a51d2ece50ebb2eed4321c08d76cacbd053b3149
Commit Graph

107 Commits

Author SHA1 Message Date
Brion Vibber
9df856e667 Merge branch '0.9.x' into merge 
Conflicts:
	README
	actions/hostmeta.php
	classes/File_redirection.php
	lib/common.php
	lib/designsettings.php
	lib/router.php
	lib/util.php
	lib/xmppmanager.php
	plugins/OStatus/OStatusPlugin.php
 2010-12-07 10:50:05 -08:00
Siebrand Mazeland
6bdce2b1e5 Localisation updates from http://translatewiki.net. 2010-11-30 21:35:25 +01:00
Brion Vibber
8161bf0797 Merge branch 'namecase' into 0.9.x 2010-11-29 16:47:51 -08:00
Brion Vibber
dc350b5463 Work in progress on nickname validation changes. lib/nickname.php appears to have been destroyed by NetBeans and will be rewritten shortly. Sigh. 2010-11-29 14:15:25 -08:00
Siebrand Mazeland
ed0e91c7a1 Localisation updates from http://translatewiki.net. 2010-11-29 20:28:28 +01:00
Evan Prodromou
b6af5a25ba don't try to initialize the mapstraction canvas if it doesn't exist 2010-11-12 11:48:17 -05:00
Evan Prodromou
fdf3a23da7 don't try to initialize the mapstraction canvas if it doesn't exist 2010-11-12 11:46:45 -05:00
Siebrand Mazeland
ca6d7f1042 Localisation updates from http://translatewiki.net. 2010-11-05 01:25:50 +01:00
Brion Vibber
b716d01a41 Merge branch '0.9.x' into 1.0.x 2010-11-03 16:09:49 -07:00
Brion Vibber
6e03456753 Migrate some more code from manually constructing "fullname (nickname)" to using Profile->getFancyName(). Encapsulates common logic and allows for localization of the parens. 2010-11-03 13:10:42 -07:00
Brion Vibber
b26eccf33c Merge branch '0.9.x' into 1.0.x 2010-10-28 16:26:34 -07:00
Siebrand Mazeland
7a564276a9 Localisation updates from http://translatewiki.net. 2010-10-28 01:58:43 +02:00
Craig Andrews
9f9126e524 Load MS Virtual Earth javascript over https when browsing in https 2010-10-27 00:09:43 -04:00
Siebrand Mazeland
e6df1b19df Localisation updates from http://translatewiki.net 2010-10-18 22:03:29 +02:00
Siebrand Mazeland
5215423ea9 Localisation updates from http://translatewiki.net. 2010-10-09 16:15:48 +02:00
Siebrand Mazeland
007866d340 Localisation updates from http://translatewiki.net 2010-10-05 00:59:47 +02:00
Brion Vibber
f58008ebaf Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x 2010-10-04 15:22:02 -07:00
Brion Vibber
d6b3d7fb1a Fix unescaped dollar signs in double-quoted strings due to localization updates (%1$s etc) 2010-10-04 14:24:04 -07:00
Siebrand Mazeland
458512aafd Localisation updates from http://translatewiki.net 2010-10-03 22:46:38 +02:00
Siebrand Mazeland
08054e85fe Localisation updates from http://translatewiki.net. 2010-10-01 22:34:59 +02:00
Siebrand Mazeland
ec7ab3af4d Localisation updates from http://translatewiki.net 
* first export of L10n for languages other than English. Could use some testing/QA.
 2010-09-28 01:09:29 +02:00
Siebrand Mazeland
870be512d2 Update POT files for plugins. 2010-09-23 00:37:16 +02:00
Siebrand Mazeland
8135f7d960 Update pot files for plugins. 2010-09-19 00:24:48 +02:00
Siebrand Mazeland
34f95c26fd * FIXME/CHECKMEs added for (possible) bad i18n 
* translator hints added
* superfluous whitespace removed
 2010-09-18 15:10:49 +02:00
Siebrand Mazeland
db1d348135 Update/add pot files for plugins. 2010-09-15 01:16:45 +02:00
Brion Vibber
d88b208edc Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x 
Conflicts:
	plugins/OpenID/openid.php
 2010-06-07 10:19:40 -07:00
Brion Vibber
634752f0d2 Mapstraction plugin fix: set icon dimensions (24x24 px); Google Maps provider otherwise defaults to stretching them to a funny shape instead of showing square avatars. 2010-06-01 18:41:17 +00:00
Brion Vibber
b0c589de9a Ticket #2330: fix Google Maps provider for Mapstraction plugin 2010-06-01 18:29:01 +00:00
Craig Andrews
6317f7d92b Assigning my copyrights to the Free Software Foundation 2010-05-27 18:27:33 -04:00
Brion Vibber
67eeaa9cf4 Pull localization updates from 0.9.x branch 2010-05-03 12:27:44 -07:00
Siebrand Mazeland
5ad2d0c30c Update gettext localisation files. 2010-04-30 01:45:54 +02:00
Brion Vibber
3ac3bc32fc Some localization cleanup and doc to aid in customization: 
* added locale/en/LC_MESSAGES/statusnet.po to make it easier to start customizing English texts
* added notes to locale/README about customizing and how to disable languages you haven't customized
* renamed PO templates from *.po to *.pot to match general conventions and reduce confusion for people trying to find which file they're supposed to edit
 2010-04-05 13:19:16 -07:00
Brion Vibber
7bd0b8e17e Pull latest .po files from 0.9.x to testing 2010-03-04 10:20:10 -08:00
Zach Copley
e650794300 Remove unnecessary requires 2010-02-25 22:06:31 -08:00
Evan Prodromou
4f62d685d0 Mapstraction PluginVersion 2010-01-08 00:38:20 -08:00
Brion Vibber
4b5e977a7b New _m() gettext wrapper with smart detection of plugin domains. Plugin base class registers your gettext files if present at initialization. 
update_pot.sh replaced with update_po_templates.php which can do core, plugins, or all (default).
Top-level Makefile added to build .mo files for plugins as well as core.

As described on list:
http://lists.status.net/pipermail/statusnet-dev/2009-December/002869.html
 2009-12-08 12:17:11 -08:00
Evan Prodromou
e7e9dfceb4 remove unnecessary debugging code from mapstraction output 2009-12-04 14:36:24 -05:00
Evan Prodromou
a92228c713 Update Mapstraction to properly scrape data from notice-list pages 
Refactored the JavaScript for Mapstraction use so it scrapes data from
the HTML of the page it's on, if possible, and otherwise generates a
JSON array.
 2009-12-04 14:31:19 -05:00
Craig Andrews
35ff3961e8 Remove unnecessary pass by reference indicators 2009-12-03 19:59:31 -05:00
Craig Andrews
43a1a35524 refactor the common parts of usermap and allmap into a common base class 2009-12-03 19:43:02 -05:00
Craig Andrews
e3caec9d8a Load notice data using javascript from the html on the page instead of writing json representations of the notices on each page 
Clicking on a geo link pops up a map (round 2)
 2009-12-02 21:24:41 -05:00
Zach Copley
9dc888894b Merge branch 'master' into 0.9.x 
* master: (67 commits)
  Ticket 2038: fix bad bug tracker link
  Fix regression in group posting: bug introduced in commit 1319002e15. Need to use actual profile object rather than an id on a variable that doesn't exist when checking blocks :D
  Log database errors when saving notice_inbox entries
  Drop the username from the log id for now; seems to trigger an error loop in some circumstances
  request id on logs... pid + random id per web request + username + method + url
  Add OpenID ini info back into statusnet.ini as a stopgap until we can
  Some changes to the OpenID DataObjects to make them emit the exact same
  OpenID plugin should set 'user_openid.display' as unique key
  Remove relationship: user_openid.user_id -> user.id. I don't think this
  Have OpenID plugin DataObjects emit their own .ini info
  Revert "Allow plugin DB_DataObject classes to not have to use the .ini file by overriding keys(), table(), and sequenceKey() for them"
  Catch and report exceptions from notice_to_omb_notice() instead of letting the OMB queue handler die.
  Fix regression in remote subscription; added hasRole() shadow method on Remote_profile.
  Fix fatal error on OMB subscription for first-timers
  Remove annoying log msg
  Drop error message on setlocale() failure; this is harmless, since we actually have a working locale set up.
  Catch uncaught exception
  Fixed bug where reply-sync bit wasn't getting saved
  Forgot to render the nav menu when on FB Connect login tab
  Facebook plugin no longer takes over Login and Connect settings nav menus
  ...

Conflicts:
	db/08to09_pg.sql
	db/statusnet_pg.sql
	locale/pt_BR/LC_MESSAGES/statusnet.mo
	plugins/Mapstraction/MapstractionPlugin.php
 2009-11-30 10:28:58 -08:00
Craig Andrews
83ba93e945 Change the format of the lat/lon output on a notice in HTML 2009-11-20 17:40:38 -05:00
Brion Vibber
afe5e71c4e Quick fix for Safari XHTML error... the map doesn't currently work with Safari, but this gets the whole page parsing again! 2009-11-20 12:04:27 -08:00
Brion Vibber
e7663ce38f fix notice bug 2009-11-20 13:57:35 -05:00
Brion Vibber
1ca022464a Fix double-escaped HTML in mapstraction notice popups 2009-11-20 10:17:14 -08:00
Brion Vibber
46c5a52810 fix notice bug 2009-11-20 10:08:13 -08:00
Craig Andrews
09d67d6f80 Fix js error on non-map containing pages 2009-11-20 11:16:39 -05:00
Craig Andrews
dc90e90fd2 Load notice data using javascript from the html on the page instead of writing json representations of the notices on each page 
Clicking on a geo link pops up a map
 2009-11-19 19:13:55 -05:00
Evan Prodromou
507c7e1e6b take out void setLabel() call in Mapstraction 2009-11-19 13:24:03 -05:00