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
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
e6e402cefd
Localisation updates from http://translatewiki.net .
2011-01-29 23:10:15 +01:00
e79034e163
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
2010-12-16 15:56:19 -08:00
cf824621b9
Localisation updates from http://translatewiki.net .
2010-12-16 16:30:30 +01:00
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
6bdce2b1e5
Localisation updates from http://translatewiki.net .
2010-11-30 21:35:25 +01:00
b26eccf33c
Merge branch '0.9.x' into 1.0.x
2010-10-28 16:26:34 -07:00
7a564276a9
Localisation updates from http://translatewiki.net .
2010-10-28 01:58:43 +02:00
255ba42ef1
use library function to determine if https should be used for recaptcha
2010-10-27 00:11:55 -04:00
ca489631db
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
actions/subscriptions.php
lib/router.php
lib/xmppmanager.php
lib/xmppoutqueuehandler.php
2010-10-25 13:08:57 -07:00
1545c1228b
Localisation updates from http://translatewiki.net .
2010-10-23 20:50:55 +02:00
3593f3f132
Merge branch '0.9.x' into 1.0.x
2010-10-19 15:18:07 -07:00
e6df1b19df
Localisation updates from http://translatewiki.net
2010-10-18 22:03:29 +02:00
5f81f6119b
Merge branch '0.9.x' into 1.0.x
2010-10-12 16:33:36 -07:00
5215423ea9
Localisation updates from http://translatewiki.net .
2010-10-09 16:15:48 +02:00
59119482ca
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
...
Conflicts:
actions/hostmeta.php
actions/imsettings.php
classes/User.php
lib/adminpanelaction.php
lib/channel.php
lib/default.php
lib/router.php
lib/util.php
2010-10-04 12:54:36 -07:00
458512aafd
Localisation updates from http://translatewiki.net
2010-10-03 22:46:38 +02:00
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
870be512d2
Update POT files for plugins.
2010-09-23 00:37:16 +02:00
8135f7d960
Update pot files for plugins.
2010-09-19 00:24:48 +02:00
596d2c212a
Update i18n/L10n.
2010-09-18 10:41:13 +02:00
db1d348135
Update/add pot files for plugins.
2010-09-15 01:16:45 +02:00
edb62db613
Locale error message, clean up {}, Verified under 1.0.x && php 5.3
2010-08-06 23:07:34 -05:00
a6408be566
Regression fix for Recaptcha on SSL registration page; their API is served on a different hostname for SSL.
2010-06-24 15:21:04 +00:00
2e98a48f2b
RecaptchaPlugin: fix for missing captcha on iPhone/Android.
...
MobileProfile serves pages out to iPhone and Android as application/xhtml+xml, which doesn't work with the default we we were loading recaptcha (as it used document.write). Switched to filling out a <div> from the AJAX API, which doesn't use document.write in the XHTML context.
Tested that view & submission works ok in following browsers:
Mobile: iPhone 3.1, Android 2.1, iPad 3.2 (this last doesn't trigger mobile theme tweaks)
Ubuntu 10.04: Firefox 3.6.3, Chrome 6
Mac 10.6: Safari 5/OS X 10.6.4
Windows 7: IE 8, Opera 10.56
2010-06-20 19:30:12 +00:00
67eeaa9cf4
Pull localization updates from 0.9.x branch
2010-05-03 12:27:44 -07:00
0ddfcc5521
Added Plugin Version info to recaptcha plugin
2010-01-18 18:33:09 -05:00
d7e2a29498
Removed unnecessary internal style
2010-01-06 11:31:06 +01:00
684e65e3de
Cleanup of recaptcha plugin remove xhtml hack
2009-12-07 14:53:17 -05:00
d31b1d774e
use the new htmloutputter->style() function
2009-12-04 20:20:44 -05:00
d080afebbe
Refactored Recaptcha plugin to use addPlugin()
...
Also nicer log messages
2009-11-16 11:44:31 -05:00
Siebrand Mazeland
Zach Copley
Brion Vibber
Craig Andrews
Eric Helgeson
Sarven Capadisli