Commit Graph

5745 Commits

Author SHA1 Message Date
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
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
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
1624373760 Updated default theme to use the CSS Sprites method for common icons 2009-10-13 11:44:56 +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
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
Zach Copley
931e19073d Remove dead code 2009-10-09 17:01:37 -07:00
Zach Copley
743c844084 Move all basic auth output and processing to base classes 2009-10-09 16:57:22 -07:00
Zach Copley
f746993c2b $format is used by every API action. Set it in the base class. 2009-10-09 14:42:01 -07:00
Zach Copley
bb08611def Delete action/api.php and rename lib/twitterapi.php to lib/api.php 2009-10-09 14:22:18 -07:00
Zach Copley
09f4d1ef23 New actions for blocks via API 2009-10-09 13:35:54 -07:00
Evan Prodromou
76ac7c358a add lots of events to customize the profile page 2009-10-09 16:14:20 -04:00
Evan Prodromou
44a59bbc2d add some hooks for the profile page 2009-10-09 15:28:12 -04:00
Evan Prodromou
bf1c662990 Merge branch '0.8.x' into 0.9.x 2009-10-09 14:07:45 -04:00
Evan Prodromou
e9d7f18f0c fix FBConnect so it doesn't muffle EndPrimaryNav 2009-10-09 14:06:08 -04:00
Evan Prodromou
88e7092d23 don't write session if it's unchanged 2009-10-09 10:39:56 -04:00
Jeffery To
c597aba342 Fixed facebook connect primary nav to hide search option when site is private and user is not logged in 2009-10-09 11:52:03 +08:00
Jeffery To
d13b0c385d Fixed facebook connect primary nav to obey sms/twitter/openid settings 2009-10-09 11:50:04 +08:00
Jeffery To
b8f8c41c18 Fixed facebook connect login nav to obey openid settings 2009-10-09 11:31:55 +08:00
Jeffery To
11e36b18cc Fixed facebook connect nav to obey sms/twitter disabled 2009-10-09 11:25:31 +08:00
Jeffery To
2dc66035ba Fixed twitter defaulting to disabled 2009-10-09 11:16:04 +08:00
Zach Copley
ada84698f2 New action for test/help API method 2009-10-08 15:59:00 -07:00
Zach Copley
62059fec83 New actions for statusnet config and version API methods 2009-10-08 15:45:45 -07:00
Evan Prodromou
a6d4adc398 Revert "Open tags should have closing tags"
This reverts commit aeca8807db.

We specifically DON'T have closing tags so we don't get errors with
whitespace after the closing tag.

I realize this is less of an issue with scripts, but we should still
not use closing tags.
2009-10-08 11:41:39 -04:00