Commit Graph

5807 Commits

Author SHA1 Message Date
Sarven Capadisli
291c2ccd0b Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x-mobile 2009-10-14 09:58:58 +00:00
Sarven Capadisli
6b5810f5d5 Moved to location of the FBConnect JavaScript to the end of </body>. 2009-10-14 09:53:07 +00:00
Sarven Capadisli
ed2e49477d Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x-mobile 2009-10-14 08:29:21 +00:00
Brion Vibber
ffeef6520c Commit upstream updates to php-gettext after the 1.0.7 release (but in 2006! :P)
Fixes file magic checks on 64-bit systems.

http://bazaar.launchpad.net/~danilo/php-gettext/trunk/revision/17
http://bazaar.launchpad.net/~danilo/php-gettext/trunk/revision/18
http://bazaar.launchpad.net/~danilo/php-gettext/trunk/revision/19
2009-10-13 14:54:48 -07:00
Zach Copley
8be28f478d Fix syntax errors 2009-10-13 14:48:19 -07:00
Evan Prodromou
4f5badda94 remove inboxes option 2009-10-13 17:38:27 -04:00
Evan Prodromou
67c387c6a0 Merge branch '0.8.x' into 0.9.x
Conflicts:
	install.php
2009-10-13 17:25:54 -04:00
Evan Prodromou
181de862ef Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-10-13 17:21:41 -04:00
Sarven Capadisli
9fb8d4e9bb Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x-mobile 2009-10-13 21:15:30 +00:00
Brion Vibber
bf4626ddf6 Update Polish translations from Raven's bug tracker submission:
http://status.net/trac/ticket/1411
2009-10-13 12:22:03 -07:00
Brion Vibber
7ea73ccad6 Merge branch '0.8.x' of gitorious.org:statusnet/mainline into 0.8.x 2009-10-13 11:57:58 -07:00
Brion Vibber
304b3cfff8 Pull all localization updates from the current Pootle incarnation before we rebuild it:
* el_GR - Greek localization updates
* he_IL - one additional Hebrew message, removed two fuzzies that gettext doesn't like
* is_IS - added new Icelandic localization file from Pootle
* nb_NO - Norwegian Bokmål updates
* zh_CN - a few Chinese message updates
2009-10-13 11:55:16 -07:00
Eric Helgeson
c4028f1d07 define LACONICA for compatibility on scripts
fixup_conversations.php fixes
2009-10-13 13:34:28 -04:00
Brion Vibber
659a04b556 Include long-form attachment URL in notice if URL shortening is disabled.
Previously, the attachment URL would simply be dropped when shortening returned false instead of a short URL... the attachment was present if you clicked through to notice details but didn't appear in the timeline, making it nigh-impossible to see the attachment.
2009-10-13 10:32:52 -07:00
Brion Vibber
0b4b8079d8 Merge branch '0.8.x' of gitorious.org:statusnet/mainline into 0.8.x 2009-10-13 10:01:57 -07:00
Brion Vibber
2c5aeb11b1 Include long-form attachment URL in notice if URL shortening is disabled.
Previously, the attachment URL would simply be dropped when shortening returned false instead of a short URL... the attachment was present if you clicked through to notice details but didn't appear in the timeline, making it nigh-impossible to see the attachment.
2009-10-13 16:54:57 +00:00
Brion Vibber
834ac7aa11 Merge branch '0.8.x' of git@gitorious.org:~brion/statusnet/brion-fixes into 0.8.x 2009-10-13 16:45:26 +00:00
Eric Helgeson
7a265ada48 Fix typo's in installer 2009-10-13 12:13:11 -04:00
Sarven Capadisli
e6c4dceb5a Updated Profile view. Works better in Opera Mini, Webkits 2009-10-13 15:22:05 +00:00
Brion Vibber
7021dd9341 Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x 2009-10-13 08:21:55 -07:00
Sarven Capadisli
dff412a3b1 Styles for entity actions 2009-10-13 14:56:58 +00:00
Sarven Capadisli
a74bb63add Added styles for the Profile page 2009-10-13 13:42:58 +00:00
Sarven Capadisli
4dd36a7874 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x-mobile 2009-10-13 11:46:09 +00:00
Sarven Capadisli
1624373760 Updated default theme to use the CSS Sprites method for common icons 2009-10-13 11:44:56 +00:00
Sarven Capadisli
861e0f0227 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x-mobile 2009-10-13 11:06:57 +00:00
Craig Andrews
5eaf9f7d2e Added a new plugin that requires a user to have a validated email address before being allowed to post notices 2009-10-12 21:21:00 -04:00
Zach Copley
870b091693 Added in credits. 2009-10-12 16:36:00 -07:00
Zach Copley
4efbe32f6a Use site's name for basic auth realm 2009-10-12 15:12:20 -07:00
Zach Copley
da9d02b038 Make apigroupcreate.php pass phpcs 2009-10-12 14:46:22 -07:00
Zach Copley
7fcaffdf86 Took out some unnecessary intializations 2009-10-12 14:07:00 -07:00
Brion Vibber
18df82ba23 Merge branch '0.8.x' of git://gitorious.org/~brion/statusnet/brion-fixes into 0.8.x 2009-10-12 21:01:34 +00:00
Zach Copley
e071a8cbff Moved group create API into its own action
Merge branch '0.9.x' into refactor-api

* 0.9.x:
  Implemented create group api
  fix FBConnect so it doesn't muffle EndPrimaryNav
  don't write session if it's unchanged
  Fixed facebook connect primary nav to hide search option when site is private and user is not logged in
  Fixed facebook connect primary nav to obey sms/twitter/openid settings
  Fixed facebook connect login nav to obey openid settings
  Fixed facebook connect nav to obey sms/twitter disabled
  Fixed twitter defaulting to disabled
  Revert "Open tags should have closing tags"
  Don't show search suggestions for private sites
  Fixed E_NOTICE when returnto isn't set
  Fixed E_NOTICE when the "lite" parameter isn't included in the request
  Fixed E_NOTICE - GroupList expects an owner object in the constructor, not an array of search terms
  Returning false seems to fix IE from reclaiming window focus. I think
  Aligning notice attach label from right instead of left
  Fixed IE background image alignment for attach, favour and disfavour
  Fixed nudge and direct message background image alignment
  Using 'CSS sprites' for common icons for the identica theme. Default
  Open tags should have closing tags

Conflicts:
	actions/twitapigroups.php
	actions/twitapistatuses.php
2009-10-12 12:31:14 -07:00
Brion Vibber
712db3a897 Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x 2009-10-12 11:10:06 -07:00
Sarven Capadisli
0e333200a4 Added missing $this 2009-10-12 13:06:16 +00:00
Sarven Capadisli
d65702b301 Only output attachment if the mobile device is interested 2009-10-12 13:05:19 +00:00
Sarven Capadisli
410883d146 Ran phpcs and fixed a few errors and warnings 2009-10-12 12:58:51 +00:00
Sarven Capadisli
44a5cd2805 Added function to set a list of features the mobile device supports
and output accordingly e.g., if device is not known to have an open
file system or unable to make use of input type="file" don't output
that feature
2009-10-12 12:46:53 +00:00
Sarven Capadisli
7af1c83f4e Fixed typo, added ipod 2009-10-12 12:30:00 +00:00
Sarven Capadisli
0947ca8b93 Init mp-handheld stylesheet. For now, it is reusing mp-screen. Future
updates will handle media queries
2009-10-12 12:29:19 +00:00
Sarven Capadisli
8513ce94d2 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x-mobile 2009-10-12 10:56:23 +00:00
Craig Andrews
f719720e8a Merge remote branch 'statusnet/0.8.x' into 0.9.x
Conflicts:
	lib/common.php
2009-10-11 13:39:10 -04:00
Craig Andrews
006cfc528e Merge commit 'refs/merge-requests/1723' of git://gitorious.org/statusnet/mainline into 0.8.x 2009-10-11 13:21:18 -04:00
Craig Andrews
6f12ed5f91 Merge commit 'refs/merge-requests/1730' of git://gitorious.org/statusnet/mainline into 0.8.x 2009-10-11 13:20:02 -04:00
Craig Andrews
1f21e5ee79 Merge commit 'refs/merge-requests/1738' of git://gitorious.org/statusnet/mainline into 0.8.x 2009-10-11 13:17:59 -04:00
Craig Andrews
96d32fb8d0 Implemented create group api 2009-10-11 13:13:15 -04:00
Brion Vibber
3f27f3138e Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x 2009-10-10 19:36:14 -07:00
Zach Copley
061af8fa06 CamelCase all function names in the API code 2009-10-09 17:53:35 -07:00
Zach Copley
b08d16ef2b These same params are used in most API actions; moved to base API class 2009-10-09 17:32:53 -07:00
Zach Copley
57dfad64be Missed some of the references to the old TwitterApiAction - removed 2009-10-09 17:21:22 -07:00
Zach Copley
559918826a Remove more redundant $formats 2009-10-09 17:11:40 -07:00