Commit Graph

6542 Commits

Author SHA1 Message Date
Evan Prodromou
65a3ccd458 Merge branch 'master' into testing
Conflicts:
	lib/util.php
	tests/URLDetectionTest.php
2009-10-20 16:11:07 -04:00
Zach Copley
5e536a6614 Remove Twitter bridge stuff. The relevant info has been moved to
/plugins/TwitterBridge/README
2009-10-20 06:11:40 +00:00
Zach Copley
09dfb08a39 Merge branch '0.9.x' into TwitterBridgePlugin 2009-10-20 06:06:10 +00:00
Zach Copley
7539e26951 - Make Twitter bridge work with unqueuemanager
- Add README
2009-10-20 06:05:35 +00:00
Zach Copley
19b870c439 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-10-20 00:53:08 +00:00
Zach Copley
9cdd77625e Less intrusive, more reliable way for FB Connect plugin to modify the
primary nav in order to show FB mini-avatar and have the logout link
logout of FB as well as StatusNet.
2009-10-20 00:49:11 +00:00
Eric Helgeson
490dfc6f5a Better check if site,server is configured. 2009-10-19 20:08:20 -04:00
Evan Prodromou
f7a3b30f5b Revert "Revert "fixed up some invalid comment syntax - this is ANSI SQL""
This reverts commit c0eca0e59b.
2009-10-19 18:15:40 -04:00
Evan Prodromou
eb273da532 Revert "Revert "upgrade script for postgres""
This reverts commit d72748eb8e.

Conflicts:

	db/08to09_pg.sql
2009-10-19 18:13:41 -04:00
Evan Prodromou
fc61b71625 merge from testing 2009-10-19 18:12:00 -04:00
Brenda Wallace
66fca9e2a8 some typoes in comments that annoyed me, fixed now 2009-10-19 18:08:44 -04:00
Evan Prodromou
d72748eb8e Revert "upgrade script for postgres"
This reverts commit d46f2ee350.
2009-10-19 18:07:36 -04:00
Evan Prodromou
689b3ae73d Revert "added missing parts to postgres update, and the config+user_role tables to both upgrade scripts"
This reverts commit e9edb803bc.
2009-10-19 18:07:19 -04:00
Evan Prodromou
c0eca0e59b Revert "fixed up some invalid comment syntax - this is ANSI SQL"
This reverts commit 6704ddddf2.
2009-10-19 18:07:03 -04:00
Evan Prodromou
728a146ec0 new codename for 0.8.2 2009-10-19 17:30:08 -04:00
Evan Prodromou
fe1ae3a47e Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2009-10-19 17:00:36 -04:00
Evan Prodromou
035d4cf86e Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-10-19 15:36:26 -04:00
Eric Helgeson
9d0e37c4e8 Utilize NICKNAME_FMT constant when creating at replies 2009-10-19 13:11:55 -04:00
Eric Helgeson
acf2b19463 Ignoring Sent from my* line in mail (iPhone/Pre) 2009-10-19 12:52:25 -04:00
Brion Vibber
ce4ed6cca5 Merge branch 'i18n-work' into i18n-0.9.x 2009-10-19 09:34:37 -07:00
Brion Vibber
dfc1be67bb Merge branch '0.9.x' into i18n-0.9.x 2009-10-19 09:26:40 -07:00
Brion Vibber
39598582d9 Merge branch 'i18n-work' into i18n-0.9.x 2009-10-19 09:25:05 -07:00
Sarven Capadisli
d18f4a35ed Better alignment 2009-10-19 14:47:08 +00:00
Brion Vibber
e54d3e024e Merge branch 'i18n-work' of git@gitorious.org:~brion/statusnet/brion-fixes into i18n-work 2009-10-19 13:58:07 +00:00
Brion Vibber
b76aa87f49 Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into i18n-work 2009-10-19 13:56:18 +00:00
Sarven Capadisli
7d763740f1 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x-mobile 2009-10-18 15:12:43 +00:00
Sarven Capadisli
b0ddbe75a3 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-10-18 15:12:18 +00:00
Sarven Capadisli
eaaa01a171 Added an update counter in the document title. When window is in blur,
it will update the document title when new notices are received. The
counter will reset when window is blurred (after a focus) again.
2009-10-18 15:10:49 +00:00
Zach Copley
109a54c4f0 Changed config flag for importing friends' timeline and added some comments 2009-10-17 00:32:02 +00:00
Zach Copley
0bbc05c1d5 Merge branch '0.9.x' into TwitterBridgePlugin 2009-10-16 23:42:02 +00:00
Brion Vibber
d3bbf3ad24 Workaround for Facebook data store API behavior regression, fixes saving
of empty notice prefix text in facebook settings.

Filed bug upstream at http://bugs.developers.facebook.com/show_bug.cgi?id=7110

Per documentation, saving a pref value of "" or "0" will delete the pref key:
http://wiki.developers.facebook.com/index.php/Data.setUserPreference

which used to do what we want... Now Facebook throws back an error
"Parameter value is required" when we do this. Workaround appends a
space to empty string or "0" at save time, then trims the string when
we load it.

The input string was already trimmed at pref save time, so this won't
alter any user-visible behavior.

Thanks to ^demon in #mediawiki for pointing out the behavior regression
after testing the identi.ca Facebook app!
2009-10-16 14:49:46 -07:00
Brion Vibber
e48efd3222 Workaround for Facebook data store API behavior regression, fixes saving
of empty notice prefix text in facebook settings.

Filed bug upstream at http://bugs.developers.facebook.com/show_bug.cgi?id=7110

Per documentation, saving a pref value of "" or "0" will delete the pref key:
http://wiki.developers.facebook.com/index.php/Data.setUserPreference

which used to do what we want... Now Facebook throws back an error
"Parameter value is required" when we do this. Workaround appends a
space to empty string or "0" at save time, then trims the string when
we load it.

The input string was already trimmed at pref save time, so this won't
alter any user-visible behavior.

Thanks to ^demon in #mediawiki for pointing out the behavior regression
after testing the identi.ca Facebook app!
2009-10-16 14:48:56 -07:00
Brion Vibber
4855cb58da Workaround for Facebook data store API behavior regression, fixes saving
of empty notice prefix text in facebook settings.

Filed bug upstream at http://bugs.developers.facebook.com/show_bug.cgi?id=7110

Per documentation, saving a pref value of "" or "0" will delete the pref key:
http://wiki.developers.facebook.com/index.php/Data.setUserPreference

which used to do what we want... Now Facebook throws back an error
"Parameter value is required" when we do this. Workaround appends a
space to empty string or "0" at save time, then trims the string when
we load it.

The input string was already trimmed at pref save time, so this won't
alter any user-visible behavior.

Thanks to ^demon in #mediawiki for pointing out the behavior regression
after testing the identi.ca Facebook app!
2009-10-16 14:46:53 -07:00
Brion Vibber
b3c29800fb Drop a debug info line that isn't really needed 2009-10-16 11:49:27 -07:00
Brion Vibber
c3b1f9e77d Use short language names for locales for now; this seems to be most compatible with both native gettext (tested on Ubuntu 8.10) and php-gettext (tested on Mac OS X 10.6). 2009-10-16 11:23:50 -07:00
Brion Vibber
21e17e3738 Fix a logic error in php-gettext's setlocale() check; if setlocale() failed to return, we fall back to checking LANG environment variable. Now actually works when doing a setlocale *check* instead of a *set*.
Submitting fix upstream, but as the package is currently unmaintained it may not make it in.
2009-10-16 11:19:52 -07:00
Brion Vibber
531c0738da Workaround for not fully natively set up locales with native gettext...
Set "en_US" locale first, then the locale we want for our user.
This seems to initialize gettext properly somehow, which I could see when the languages would come up briefly on settings save when changing from a supported language.
Definitely works for ga_ES on my Ubuntu system (8.10 intrepid), hopefully reasonably consistent.
2009-10-16 17:42:27 +00:00
Brion Vibber
4ef0665408 Galician translation (out of date but functional... unless you have locale issues of course)
.po file from http://status.net/trac/ticket/481 last updated by mvazquez
2009-10-16 16:29:50 +00:00
Brion Vibber
d0bf06c65c More i18n cleanup, updating and fixing broken locales...
Removed some non-matching fuzzy entries in mk, tr, zh_TW that prevented .mo regeneration by triggering "fatal errors" from msgfmt
Rebuilt all .mo files, fixing total breakage for four languages:
* it
* mk
* pt_BR
* vi
2009-10-16 16:16:46 +00:00
Brion Vibber
03de1bd13d Removed unnecessary country specifiers from message directories.
We sometimes need to specify a country when setting a locale but the system knows how to grab the generic dir, and that seems to play better with translation tools such as transifex
2009-10-16 16:03:23 +00:00
Sarven Capadisli
42f3aff9eb Slight adjustment to local navigation padding 2009-10-15 15:02:53 +00:00
Sarven Capadisli
afa00b558f Reduced some margin-bottoms 2009-10-15 14:59:21 +00:00
Sarven Capadisli
09bafa13b1 Minor adjustment to site name spacing 2009-10-15 14:52:49 +00:00
Sarven Capadisli
414ca4e83f Adjusted global and local navigation spacing and size. Fixed logo's
view in Opera Mini
2009-10-15 14:46:49 +00:00
Sarven Capadisli
63d2476d74 More margin for logo 2009-10-15 14:22:46 +00:00
Sarven Capadisli
9c90fd05f7 Set width only to textarea 2009-10-15 14:20:42 +00:00
Sarven Capadisli
70a39c5b7b Better layout for form_settings 2009-10-15 14:05:43 +00:00
Sarven Capadisli
d7efe87e77 Better widths for notice options (improves Opera Mini's rendering) 2009-10-15 13:08:57 +00:00
Sarven Capadisli
94c7b2b43a Changed textarea @cols value for smaller screens 2009-10-15 12:47:59 +00:00
Sarven Capadisli
ed85dc2700 Updated comments 2009-10-15 11:25:38 +00:00