GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity
7,005 Commits 8 Branches 4 Tags 310 MiB
530673b3cd
Commit Graph

2643 Commits

Author SHA1 Message Date
Eric Helgeson
9f15febf88 Re added NICKNAME_FMT constant to router.php. 
Usefull for non-OMB (behind the firewall) users to allow different nicknames.
 2009-11-05 16:38:35 -05:00
Brion Vibber
066331bdf7 Merge commit 'refs/merge-requests/2006' of git://gitorious.org/statusnet/mainline into integration 2009-11-05 15:50:29 +01:00
Brion Vibber
2bb93438a1 Error page fix: use class static accessor correctly, suppress notices if we don't have the error code listed 2009-11-05 10:58:38 +01:00
Zach Copley
2fc01dc7d1 Remove debugging statements 2009-11-04 22:12:01 -08:00
Zach Copley
1ef1f59fe8 Fix for Ticket #1957 - API methods are not accessible when site is private (0.8->0.9 regression) 2009-11-04 22:03:41 -08:00
Zach Copley
527427d3e0 Implement update avatar via API (/api/account/update_profile_image.format) 2009-11-04 21:00:26 -08:00
Craig Andrews
a82df5fae8 Added a CheckPassword event 2009-11-04 13:06:55 -05:00
Shashi
b12caedb88 Widgetized user profile rendering. 2009-11-04 18:41:17 +05:30
Zach Copley
d03a57853e Don't try to pull up designs for non-existent users 2009-11-03 09:55:35 -08:00
Craig Andrews
b9d40f723b Added 'login' command that gives you a link that can be used to login to the website 2009-11-02 18:40:49 -05:00
Evan Prodromou
a2b8303925 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 
Conflicts:
	classes/User.php
 2009-11-02 18:13:04 -05:00
Brion Vibber
86560eeb3d Merge commit 'refs/merge-requests/1900' of git://gitorious.org/statusnet/mainline into integration 2009-11-02 10:16:06 -08:00
Craig Andrews
1cf67f4f71 allow <> to surround the url (like () or []) 2009-11-02 12:59:11 -05:00
Craig Andrews
8782f5fedf do not allow " in URLs - they are not legal URL characters 2009-11-02 12:53:02 -05:00
Craig Andrews
b179ab650a do not allow [ and ] - they are not legal URL characters 2009-11-02 12:53:02 -05:00
Brion Vibber
5581143bee Rebuilt HTTPClient class as an extension of PEAR HTTP_Request2 package, adding redirect handling and convenience functions. 
Caching support will be added in future work after unit tests have been added.

* extlib: add PEAR HTTP_Request2 0.4.1 alpha
* extlib: update PEAR Net_URL2 to 0.3.0 beta for HTTP_Request2 compatibility
* moved direct usage of CURL and file_get_contents to HTTPClient class, excluding external-sourced libraries
* adapted GeonamesPlugin for new HTTPResponse interface

Note some plugins haven't been fully tested yet.
 2009-11-02 09:14:15 -08:00
Brion Vibber
73b9e531bf Detect "no file" upload error and, for now at least, ignore it gracefully. 
This was triggering on non-AJAX form submissions for new notices, preventing them from being posted when they contained no attachments.
 2009-11-02 09:10:06 -08:00
Evan Prodromou
c991047fc4 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-11-02 11:23:41 -05:00
Evan Prodromou
3c4ac05cde remove <dl> stuff from profile list 2009-11-02 11:23:31 -05:00
Brion Vibber
b22fc5b74a Revert "Rebuilt HTTPClient class as an extension of PEAR HTTP_Request2 package, adding redirect handling and convenience functions." 
Going to restructure a little more before finalizing this...

This reverts commit fa37967858.
 2009-11-02 07:51:29 -08:00
Brion Vibber
fa37967858 Rebuilt HTTPClient class as an extension of PEAR HTTP_Request2 package, adding redirect handling and convenience functions. 
Caching support will be added in future work after unit tests have been added.

* extlib: add PEAR HTTP_Request2 0.4.1 alpha
* extlib: update PEAR Net_URL2 to 0.3.0 beta for HTTP_Request2 compatibility
* moved direct usage of CURL and file_get_contents to HTTPClient class, excluding external-sourced libraries

Note some plugins haven't been tested yet.
 2009-11-02 06:31:28 -08:00
Brion Vibber
8e64723813 Make unit tests work again by forcing a 'global' on $_have_a_config... 
Fix a typo in the error message when no config file found.
 2009-11-02 06:14:08 -08:00
Zach Copley
4abbf44068 Remove stale references to old apiaction parameter 2009-11-01 16:32:45 -08:00
Evan Prodromou
44ce8e2fcd Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-10-31 14:47:21 -04:00
Evan Prodromou
521bd68d7c revert revert on getfile 2009-10-31 14:43:01 -04:00
Evan Prodromou
4e9ec0d0e1 merge from testing 2009-10-31 14:36:04 -04:00
Evan Prodromou
4056a26017 Revert "Added getfile action" 
This reverts commit f58daa873b.
 2009-10-31 14:32:12 -04:00
Evan Prodromou
9f7d390ad1 update version to rc2 2009-10-31 12:18:38 -04:00
Sarven Capadisli
48f33f781a Using 'form_notice' class instead of 'form' to group both forms 2009-10-31 17:16:37 +01:00
Evan Prodromou
5e27d53947 Merge branch '0.8.x' into testing 2009-10-31 12:16:30 -04:00
Brenda Wallace
de7c12baef Merge commit 'mainline/0.9.x' into 0.9.x 2009-10-30 10:35:27 +13:00
Brenda Wallace
f1daca16e2 give some suggestions back to the user when no config file found, and a link to the installer 2009-10-30 10:03:25 +13:00
Brenda Wallace
d5951ebce6 Revert "give some suggestions back to the user when no config file found, and a link to the installer" 
This reverts commit 7f5fbee2e3.
 2009-10-30 10:02:37 +13:00
Brenda Wallace
c0f8c0178a Merge commit 'mainline/0.9.x' into 0.9.x 2009-10-30 09:41:04 +13:00
Craig Andrews
c49564647a whitespace adjustments for doxygen 2009-10-29 16:27:23 -04:00
Craig Andrews
54696f7c46 Moved the public XRDS from the OpenID plugin to core 
Added 4 new events involved in XRDS: StartUserXRDS, EndUserXRDS, StartPublicXRDS, EndPublicXRDS
Added OpenID provider functionality (no delegation support [yet])
 2009-10-29 16:27:22 -04:00
Brenda Wallace
7f5fbee2e3 give some suggestions back to the user when no config file found, and a link to the installer 2009-10-30 09:17:19 +13:00
Evan Prodromou
49dd54315f show notice location in notice list 2009-10-29 16:16:02 -04:00
Evan Prodromou
5b0809f4a3 fix caching in location.php 2009-10-29 16:15:49 -04:00
Evan Prodromou
a6ed4e5bf7 a location method for getting an URL 2009-10-29 14:49:00 -04:00
Sarven Capadisli
f0abc0fe15 Updated bookmarklet. Created its own action 2009-10-29 13:18:51 +01:00
Evan Prodromou
2b5a5e02a4 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-10-28 22:58:58 -04:00
Zach Copley
e0dbc47f8e Fixed header comment. 2009-10-28 17:47:14 -07:00
Zach Copley
9ef05030fe Merge branch 'api-media-upload' into 0.9.x 
* api-media-upload:
  Rearanged a couple things & removed debugging statements
  Rework MailDaemon to use the MediaFile class for uploads
  Implement media upload in the API
  Extract media upload stuff into its own library class.
 2009-10-28 17:18:33 -07:00
Zach Copley
e5a2f895a0 Rearanged a couple things & removed debugging statements 2009-10-28 17:13:06 -07:00
Zach Copley
b9ce23d0c2 Rework MailDaemon to use the MediaFile class for uploads 2009-10-28 22:24:20 +00:00
Evan Prodromou
61ccf450de Merge branch '0.9.x' into location 2009-10-28 17:28:08 -04:00
Evan Prodromou
7647703881 rogue n in curlclient.php 2009-10-28 17:28:00 -04:00
Evan Prodromou
b73d6d18ba Merge branch '0.9.x' into location 2009-10-28 17:24:53 -04:00
Evan Prodromou
10df75f9a0 add StartInitializeRouter event 2009-10-28 16:07:57 -04:00
Zach Copley
2d0aba49d9 Implement media upload in the API 2009-10-27 21:45:56 -07:00
Craig Andrews
5fd7ed5b14 Display user avatar in the XMPP message 
Include notice id and conversation link the XMPP message

Thanks to Deepspawn for this idea and initial code
 2009-10-27 23:31:49 -04:00
Craig Andrews
5f42023f97 implement the nudge command 2009-10-27 22:45:00 -04:00
Craig Andrews
da16dc05a8 Added a new "reply" command 2009-10-27 22:30:21 -04:00
Zach Copley
93a6e83d5d Extract media upload stuff into its own library class. 2009-10-27 19:11:18 -07:00
Craig Andrews
922ee7b3b2 Implemented reply # command, allowing users to favorite specific notices by the notice id 2009-10-27 21:48:56 -04:00
Craig Andrews
0b4390e7f2 Make email domain checking optional, as some statusnet installations (such as those behind restrictive corporate firewalls, or on home systems on restrictive connections) cannot connect to any mail 
systems, and this check will always fail.
 2009-10-26 10:31:12 -04:00
Evan Prodromou
3c724ccd0d Merge branch '0.9.x' into location 2009-10-24 19:59:46 -04:00
Stephen Paul Weber
58b9ce5946 Better license check. 
Tokenise CC license parts and check for compatability.
Fallback is old directly-equal test.
 2009-10-23 21:22:26 -04:00
Zach Copley
6d6de3c1c7 Move Twitter and Facebook-specific mail notifications to their respective plugins 2009-10-23 23:38:45 +00:00
Zach Copley
2544310e73 Remove automatic enqueuing for Facebook 2009-10-23 23:34:48 +00:00
Zach Copley
34a21e7605 Merge branch '0.9.x' into facebook-app-plugin 2009-10-23 23:05:59 +00:00
Zach Copley
45a2253649 Merge branch '0.9.x' into facebook-app-plugin 2009-10-23 22:48:35 +00:00
Brion Vibber
b89878511f Fix three fatal errors when posting from 0.9.x: 
* OMB remote updates were trying to load nonexistent Laconica_OMB_Service_Consumer class -- fixed to StatusNet_OMB_Service_Consumer. Regression caused during libomb merge.
* Twitter processing was still being queued from core when no twitter plugin was present, which triggered an exception from UnqueueHandler; leftover code from before the plugin extraction.
* UnqueueHandler's exception caused a fatal error instead because it was missing the "new" keyword. Wouldn't have been seen when testing with the plugin enabled.
 2009-10-23 20:31:53 +00:00
Craig Andrews
c93b9b9523 Merge commit 'refs/merge-requests/1815' of git://gitorious.org/statusnet/mainline into 0.9.x 2009-10-23 11:15:25 -04:00
Zach Copley
1b4f9f2c09 Merge branch '0.9.x' into facebook-app-plugin 2009-10-22 21:12:51 +00:00
Evan Prodromou
9608cc6143 Merge branch '0.9.x' into location 2009-10-22 16:23:42 -04:00
Evan Prodromou
e73631f614 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-10-22 16:21:05 -04:00
Evan Prodromou
65c45986c6 HTTPResponse has default empty headers 2009-10-22 16:20:56 -04:00
Evan Prodromou
69357c4916 error in order of arguments to array_key_exists in location.php 2009-10-22 16:19:56 -04:00
Evan Prodromou
9c983c3830 extract Geonames stuff to a plugin 2009-10-22 15:44:36 -04:00
Brion Vibber
c6d1039901 Add some doc comments to QueueHandler 2009-10-22 10:11:04 -07:00
Jeffery To
f58daa873b Added getfile action 2009-10-22 12:46:54 +08:00
Evan Prodromou
7b227fd1c0 start getting locations from remote services 2009-10-21 22:47:19 -04:00
Evan Prodromou
b6b245dc0b start of a location class 2009-10-21 22:43:41 -04:00
Evan Prodromou
4e639b8769 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-10-21 22:41:42 -04:00
Evan Prodromou
0df85711d6 reformat default.php 2009-10-21 22:41:23 -04:00
Zach Copley
6199d31acc Remove facebook broadcast from unqueuemanager. That's now 
added by an event.
 2009-10-21 01:18:36 +00:00
Zach Copley
78e5a5980a Extract out Facebook app stuff into a plugin 2009-10-20 16:32:30 -07: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
Eric Helgeson
490dfc6f5a Better check if site,server is configured. 2009-10-19 20:08:20 -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
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
Brion Vibber
39598582d9 Merge branch 'i18n-work' into i18n-0.9.x 2009-10-19 09:25:05 -07: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
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
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
Evan Prodromou
90de6eae5a add more events to profile list 2009-10-15 06:01:26 -04:00
Trever Fischer
1241e651ae Added support for profile designs to the twitter API 2009-10-15 05:16:37 -04:00
Evan Prodromou
4f5badda94 remove inboxes option 2009-10-13 17:38:27 -04:00
Zach Copley
b4b992bca7 Merge branch '0.9.x' into pluginize-twitter-bridge 
* 0.9.x: (247 commits)
  Added in credits.
  Use site's name for basic auth realm
  Make apigroupcreate.php pass phpcs
  Took out some unnecessary intializations
  Implemented create group api
  CamelCase all function names in the API code
  These same params are used in most API actions; moved to base API class
  Missed some of the references to the old TwitterApiAction - removed
  Remove more redundant $formats
  Remove dead code
  Move all basic auth output and processing to base classes
  $format is used by every API action. Set it in the base class.
  Delete action/api.php and rename lib/twitterapi.php to lib/api.php
  New actions for blocks via 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
  ...
 2009-10-13 09:36:26 -07: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
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
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
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
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
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
Jeffery To
daaa1d4790 Don't show search suggestions for private sites 2009-10-08 12:49:30 +08:00
Zach Copley
08de0f1ebd New individual actions for dealing with groups via API 2009-10-07 17:20:08 -07:00
Jeffery To
838c13063a Fixed E_NOTICE when returnto isn't set 2009-10-07 17:28:30 +08:00
Zach Copley
170b009865 New action for group timelines via API 2009-10-06 17:26:45 -07:00
Zach Copley
8d284ca82c New action for tag timelines in the API 2009-10-06 15:39:13 -07:00
Zach Copley
f7688bec0d Better Twitter date output 2009-10-05 17:11:32 -07:00
Zach Copley
475bdf6fba New actions for the account methods we have implemented 2009-10-05 17:10:30 -07:00
Zach Copley
dd0d907231 New actions for favorites via the API 2009-10-05 13:50:01 -07:00
Zach Copley
2b7d8d0c29 Merge branch '0.9.x' into refactor-api 
* 0.9.x: (23 commits)
  Added hook to wrap the notice form data block
  Unnecessary selector bit
  Removed obsolete iphone theme (pre v0.7)
  remove spurious readme from Orbited
  need to show scripts at end of body in RealtimePlugin
  Some changes required from Orbited debugging
  Update OrbitedPlugin to work with RealtimePlugin framework
  updated OrbitedPlugin to use RealtimePlugin
  remove unused files for OrbitedPlugin
  rename plugin
  copy Comet plugin to Orbited
  move scripts to just before </body>, add event for scripts that need to be in <head>
  reformat Notice.php
  added all them doxygens
  Using CDATA for autofocus script
  more doxygen
  added doxygen
  indent fix
  better handling of y response in deleteuser.php
  script to permanently delete a user
  ...
 2009-10-05 10:05:43 -07:00
Zach Copley
ee207ffd8b Routes for friendships actions 2009-10-05 10:04:35 -07:00
Sarven Capadisli
7a33125a6c Added hook to wrap the notice form data block 2009-10-05 14:17:55 +00:00
Evan Prodromou
9c460d591e move scripts to just before </body>, add event for scripts that need to be in <head> 2009-10-04 03:14:39 -04:00
Evan Prodromou
c5047fd90a Merge branch '0.8.x' into 0.9.x 
Conflicts:
	classes/Profile.php
 2009-10-04 03:07:37 -04:00
Sarven Capadisli
5528c0cd3d Using CDATA for autofocus script 2009-10-03 22:06:51 +00:00
Zach Copley
4e1b95db28 Merge branch '0.9.x' into refactor-api 
* 0.9.x:
  make lib/schema.php phpcs-clean
 2009-10-02 17:25:10 -07:00
Zach Copley
daa8b47306 New actions for direct messaging through the API 2009-10-02 17:23:48 -07:00
Evan Prodromou
87858a11f4 make lib/schema.php phpcs-clean 2009-10-02 15:02:33 -04:00
Zach Copley
eaef9b689a New action for /users/show 2009-10-02 10:31:13 -07:00
Zach Copley
1e0c36afb5 Renamed and moved stuff around to better match Twitter's API organization 2009-10-01 18:19:59 -07:00
Zach Copley
9a1dbee0fd A new action for /statuses/destroy 2009-10-01 17:35:28 -07:00
Zach Copley
b3bbaecf47 Merge branch '0.9.x' into refactor-api 
* 0.9.x:
  change DB so OpenIDPlugin manages OpenID tables
  Some bug fixes
  check the schema
  add some more methods to Schema
  Added hook for Aside container
  Revert "Outputting UTF-8 charset in document header irrespective of mimetype."
  FOAF for Groups.
  use schema tool to create a table
  statusize schema-related modules
  test script for schema code
  make table def method of schema code work
  start a module for schema management
 2009-10-01 16:17:43 -07:00
Zach Copley
b0ddb971e6 New action for /statuses/update 2009-10-01 16:15:52 -07:00
Evan Prodromou
544c58d263 Some bug fixes 
The $tomod variable wasn't set, and the ColumnDef constructor
didn't work without any args. These are fixed.
 2009-10-01 15:43:08 -04:00
Evan Prodromou
d103522ff3 check the schema 2009-10-01 15:11:12 -04:00
Evan Prodromou
b980f5e45b add some more methods to Schema 2009-10-01 15:00:54 -04:00
Evan Prodromou
a41ed1a66a Merge branch '0.9.x' into schema 2009-10-01 11:30:04 -04:00
Sarven Capadisli
acc7897238 Added hook for Aside container 2009-10-01 12:27:02 +00:00
Sarven Capadisli
cc776478e2 Revert "Outputting UTF-8 charset in document header irrespective of mimetype." 
This reverts commit 353f58c231.

Even though outputting UTF-8 by default at all times is a good thing,
it shouldn't be forced in startHTML().
 2009-10-01 10:07:09 +00:00
Zach Copley
8b8e0c95af Add route for /statuses/show 2009-09-30 17:08:52 -07:00
Toby Inkster
c5be2962ad FOAF for Groups. 2009-09-30 13:59:18 -04:00
Zach Copley
5bab0288af Merge branch '0.9.x' into refactor-api 
* 0.9.x: (39 commits)
  Timeout a little incase the notice item from XHR response is
  Relocated the button for pop up window for notice stream
  Script no longer needed for Realtime plugin
  Better check to see if the XML prolog should be outputted for XML
  Outputting UTF-8 charset in document header irrespective of mimetype.
  Switched Doctype to XHTML 1.0 Strict (which best reflects the current
  Twitter API returns server errors in preferred format
  move HTTP error code strings to class variables
  remove string-checks from code using Notice::saveNew()
  change string return from Notice::saveNew to exceptions
  stop overwriting created timestamp on group edit
  Forgot to add home_timeline to the list of methods that only require
  Forgot to add home_timeline to the list of methods that only require
  moderator can delete another user's notice
  show delete button when user has deleteOthersNotice right
  let hooks override standard user rights
  user rights
  Merge DeleteAction class into DeletenoticeAction
  Fix some bugs in the URL linkification, and fixed the unit test.
  Fix URL linkification test cases for addition of 'title' attribution with long URL in f3c8fccc
  ...
 2009-09-30 10:32:05 -07:00
Zach Copley
e307adfbfc New actions for /statuses/friends and /statuses/followers + social graph methods 2009-09-30 10:22:26 -07:00
Sarven Capadisli
7bd65a7b86 Merge branch '0.8.x' into 0.9.x 2009-09-30 10:54:17 +00:00
Sarven Capadisli
1e7df7fbab Better check to see if the XML prolog should be outputted for XML 
documents i.e., if best mimetype is */*xml, then use the XML prolog.
 2009-09-30 10:53:04 +00:00
Sarven Capadisli
353f58c231 Outputting UTF-8 charset in document header irrespective of mimetype. 2009-09-30 10:51:59 +00:00
Sarven Capadisli
eb85f16f77 Switched Doctype to XHTML 1.0 Strict (which best reflects the current 
grammar in use)
 2009-09-30 10:37:46 +00:00
Evan Prodromou
fe7848e8b8 Merge branch '0.8.x' into 0.9.x 
Conflicts:
	actions/twitapistatuses.php
 2009-09-29 18:03:10 -04:00
Evan Prodromou
5309910b9b Twitter API returns server errors in preferred format 2009-09-29 17:57:31 -04:00
Evan Prodromou
5252c43804 move HTTP error code strings to class variables 2009-09-29 17:43:45 -04:00
Evan Prodromou
89ac81c344 remove string-checks from code using Notice::saveNew() 2009-09-29 17:25:52 -04:00
Evan Prodromou
3afcdc18f7 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-09-27 21:15:14 -04:00
Evan Prodromou
ee236e68df show delete button when user has deleteOthersNotice right 2009-09-27 21:11:45 -04:00
Evan Prodromou
6c069312e2 user rights 2009-09-27 21:11:45 -04:00
Evan Prodromou
a8d1b7e9c2 Merge DeleteAction class into DeletenoticeAction 
The DeleteAction class checked for notice information, and only had
one subclass: DeletenoticeAction. I couldn't figure out any other
class that would subclass it, so I combined the two into a single class.
 2009-09-27 21:10:17 -04:00
Zach Copley
d392cbed7d Route aliases: replies -> mentions and home_timeline -> friends_timeline 2009-09-27 17:23:11 -07:00
Zach Copley
eac388a3cb Forgot to commit the routes for the new actions 2009-09-27 17:17:03 -07:00
Zach Copley
37bdc060c5 phpcs on apifriendstimeline.php, apiauth.php and apibareauth.php 2009-09-27 15:33:46 -07:00
Craig Andrews
fc2426d7ce Fix some bugs in the URL linkification, and fixed the unit test. 2009-09-27 16:52:15 -04:00
Evan Prodromou
f9bb35369a Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-09-27 10:11:10 -04:00
Zach Copley
ccc7caf932 Merge branch 'refactor-api' of git@gitorious.org:~zcopley/statusnet/zcopleys-clone into refactor-api 2009-09-25 16:59:51 -07:00
Zach Copley
de5ff19713 Moved basic auth stuff into its own classes 2009-09-25 16:58:35 -07:00
Sarven Capadisli
d3d9913be0 Added hook for notice item. After <li> and Before </li>. Allows 
authors to include aside data to their notice items
 2009-09-25 12:47:14 +00:00
Evan Prodromou
ced6bb1c4e Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-09-24 22:26:51 -04:00
Evan Prodromou
ecb75561af Move configuration defaults to new module and variable 
Moved the default values of $config to $default. The code for
setting up $default is moved to lib/default.php.
 2009-09-24 22:25:30 -04:00
Zach Copley
150cf8c045 Merge branch '0.9.x' into refactor-api 
* 0.9.x: (88 commits)
  Left a couple debugging statements in (removed)
  Output If-Modified-Since header for all RSS 1.0 feeds (again)
  Revert "move scripts to just before </body>, add event for scripts that need to be in <head>"
  Implemented join and leave groups api methods
  implemented etag and last modified
  Fixed broken Piwik plugin - was not using the supplied site code
  move scripts to just before </body>, add event for scripts that need to be in <head>
  some UI fixes
  Using timeline string instead of title for WindowName because IE doesn't
  Added JavaScript to initialize the poped Window
  Some layout and rendering adjustment for Realtime plugin
  Created addPop() for Realtime plugin and added param to include iconurl
  move some stuff around for realtime
  hack around address hack in util.js
  Add some more realtime feeds
  Do realtime popup with PHP instead of Javascript
  JavaScript fixes for IE
  Revert "Added realtime streams for all and showstream timelines"
  Revert "Fixed indenting"
  Revert "Made it slighly more compact with less jQuery selection"
  ...
 2009-09-24 18:18:26 -07:00
Zach Copley
ed9ba9d945 Reorganize, make bare auth work, output If-Modified-Since header 2009-09-24 18:13:46 -07:00
Zach Copley
e566219299 Output If-Modified-Since header for all RSS 1.0 feeds (again) 2009-09-24 15:10:55 -07:00
Evan Prodromou
93b7e60115 Merge branch '0.8.x' into 0.9.x 
Conflicts:
	EVENTS.txt
 2009-09-24 17:24:15 -04:00
Evan Prodromou
78cec7ab87 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 
Conflicts:
	install.php
	lib/noticeform.php
 2009-09-24 17:22:51 -04:00
Craig Andrews
49bce941a9 Merge remote branch 'statusnet/0.8.x' into 0.9.x 
Conflicts:
	EVENTS.txt
	actions/requesttoken.php
	classes/File.php
	install.php
	lib/action.php
	lib/noticeform.php
 2009-09-24 17:15:54 -04:00
Evan Prodromou
d7e43c732e Revert "move scripts to just before </body>, add event for scripts that need to be in <head>" 
This reverts commit a5ed805aea.

It shouldn't have gone on the stable branch.
 2009-09-24 17:14:04 -04:00
Evan Prodromou
a5ed805aea move scripts to just before </body>, add event for scripts that need to be in <head> 2009-09-23 23:23:13 -04:00
Evan Prodromou
3449843f83 use schema tool to create a table 2009-09-23 22:24:35 -04:00
Zach Copley
49b701f9ec Started refactoring API into individual actions 2009-09-23 13:45:51 -07:00
Evan Prodromou
8284b3cb82 Merge branch '0.8.x' into 0.9.x 
Conflicts:
	actions/requesttoken.php
	classes/File.php
	install.php
	lib/noticeform.php
 2009-09-23 09:45:22 -04:00
Evan Prodromou
bef4a8b6ba Revert "When viewing a page in https, all links to non-actions (links to CSS, JS, etc) should be https. Fixes the mixed content warnings that browsers display." 
This reverts commit 20997619b3.

The commit doesn't take into account having different servers (theme
server, avatar server) and being able to set HTTPS for some but not all.
 2009-09-23 09:34:55 -04:00
Evan Prodromou
42ba05de5f revert output buffering (costly) for ETags (low priority) 2009-09-23 09:33:40 -04:00
Evan Prodromou
e206324f24 statusize schema-related modules 2009-09-23 09:20:04 -04:00
Evan Prodromou
f31653ca5b make table def method of schema code work 2009-09-23 09:17:01 -04:00
Evan Prodromou
4f833531dd start a module for schema management 2009-09-23 09:17:01 -04:00
Craig Andrews
2cabfba767 Allow some punctuation instead of just spaces before @user, !group, and #tag 2009-09-22 19:34:10 -04:00
Craig Andrews
f3c8fcccc1 Link hrefs are the short url, and title is the long url 2009-09-22 11:12:55 -04:00
Craig Andrews
ebb52efeb4 Make link href the long url so users can tell where links are going 2009-09-21 22:48:19 -04:00
Evan Prodromou
98924a80d7 'easy' way to handle notices at queue time 2009-09-21 14:39:22 -04:00
Evan Prodromou
eb41d9e5da add a hook for the unqueuemanager 2009-09-21 14:23:35 -04:00
Evan Prodromou
5b91223ce4 add a hook at point of enqueuing notices 2009-09-21 14:14:55 -04:00
Brion Vibber
3c89d31b18 Fixes for posting shortened URLs or uploads 
* If no shortener plugin is enabled, fall back to using the long URL instead of trying to load nonexistent ur1.ca plugin and throwing 'Class  does not exist'
* Fix bad call to call_user_func_array() in callback_helper() which broke all shortening
 2009-09-21 21:34:59 +12:00
Brion Vibber
0125f29324 Don't trigger E_NOTICE when looking for commands in the notice input 
explode() only returns one item if there was no space, leading to an E_NOTICE about an undefined array index in the list($a,$b) pattern.
 2009-09-21 16:45:09 +12:00
Sarven Capadisli
44820d296d No need to call farbtastic.go.js because it was moved to userdesign.go.js 2009-09-20 13:44:22 +02:00
Sarven Capadisli
0fa2bbe581 Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.8.x 2009-09-20 12:55:34 +02:00
Zach Copley
8aad3154a7 Make statuses/home_timeline return the same thing as statuses/friends_timeline to support apps trying to use the new retweet API method. 2009-09-19 18:41:28 -07:00
Zach Copley
74296fa12c Make statuses/home_timeline return the same thing as statuses/friends_timeline to support apps trying to use the new retweet API method. 2009-09-19 18:34:07 -07:00
Craig Andrews
6af71f2cd2 Show context link if this notice starts a conversation 2009-09-18 17:37:59 -04:00
Sarven Capadisli
4b7881c64e Removed trailing single space in author @title 2009-09-18 19:32:51 +02:00
Zach Copley
0190785b73 Merge branch '0.9.x' into pluginize-twitter-bridge 
* 0.9.x: (57 commits)
  Updated csarven emails to csarven@status.net and removed dupes
  statusize new HTTP classes
  dedupe evans
  change all evans to evan@status.net
  add post to curlclient
  fix user-agent for curlclient
  add get to curl client
  add cURL client with HEAD method
  add user agent and correct version check to httpclient
  statusize OpenID plugin
  add http client config value
  update httpclient class
  move httputil to httpclient
  Start a common library for HTTP client stuff
  check correct define (not backwards compatible)
  Fixed broken list items in installer output
  Got rid of a bunch of ugly warnings
  Add Jiminy to notice sources
  Make it impossible to delete self-subscriptions via the API
  Fix bad merge d7ae0ed4fd
  ...
 2009-09-16 12:40:22 -07:00
Evan Prodromou
15a2b69777 statusize new HTTP classes 2009-09-15 22:31:52 -04:00
Evan Prodromou
6f531745ca change all evans to evan@status.net 2009-09-15 22:28:59 -04:00
Evan Prodromou
2f97531a49 add post to curlclient 2009-09-15 22:14:15 -04:00
Evan Prodromou
f8a8c14b55 fix user-agent for curlclient 2009-09-15 22:05:57 -04:00
Evan Prodromou
6b7f09eba6 add get to curl client 2009-09-15 21:55:36 -04:00
Evan Prodromou
9a9a0ae56f add cURL client with HEAD method 2009-09-15 21:50:19 -04:00
Evan Prodromou
8ceb4196f3 add user agent and correct version check to httpclient 2009-09-15 21:22:47 -04:00
Evan Prodromou
3380b49aec add http client config value 2009-09-15 21:12:59 -04:00
Evan Prodromou
ae20d073ce update httpclient class 2009-09-15 21:12:59 -04:00
Evan Prodromou
20dd0db704 move httputil to httpclient 2009-09-15 21:12:59 -04:00
Evan Prodromou
d44bc16ee9 Start a common library for HTTP client stuff 2009-09-15 21:12:59 -04:00
Craig Andrews
d7e13e847d 304 responses should not have a Content-Length header. 2009-09-15 17:17:36 -04:00
Evan Prodromou
48565a2cdc Revert "Several fixes to make RabbitMQ a player." 
This reverts commit c04987018c.
 2009-09-15 17:08:27 -04:00
Adrian Lang
5bad7040b1 Fix bad merge d7ae0ed4fd 2009-09-14 22:08:17 +02:00
Craig Andrews
b9e4b6dd49 Generate ETags for pages which don't specify themselves. 2009-09-13 17:30:50 -04:00
Craig Andrews
20997619b3 When viewing a page in https, all links to non-actions (links to CSS, JS, etc) should be https. Fixes the mixed content warnings that browsers display. 
Fixes http://status.net/trac/ticket/1552
 2009-09-13 01:24:57 -04:00
Craig Andrews
0a1d2635c1 Set a Vary header with accept-encoding and cookies. 
Fixes http://status.net/trac/ticket/17
 2009-09-13 01:01:31 -04:00
Craig Andrews
7cd80b29c4 NoticeForm's constructor's inreplyto argument should be optional (defaulting to null) 2009-09-12 17:06:46 -04:00
Craig Andrews
b75ed37eeb Show username in subject of emails 
Fixes http://status.net/trac/ticket/1862
 2009-09-12 16:58:04 -04:00
Craig Andrews
57feeb566a Add a parameter named 'inreplyto' to the 'notice/new' page, so urls can inclue 'inreplyto' id's. Also add 'inreplyto' to the urls sent in emails. 2009-09-11 22:37:37 -04:00
Marcel van der Boom
c04987018c Several fixes to make RabbitMQ a player. 
* extlib/Stomp.php
    -spaces for tabs (we're on PEAR, right?)
    - send: initialize the $properties parameter as array() instead of null
      this prevents unsetting $headers if $properties was not set
      (besides that, it's the proper way to initialize an array)
    - subscribe: insert FIXME's on ActiveMQ specifics
    - ack: make sure the content-length header is set *and* is zero.
      I have seen the header set to '3' there but could not find where it
      came from, this is at least safe.
    - disconnect: typo in $headers variable
    - readFrame: use fgets() instead of gets() so that RabbitQ, which is more protocol strict can also play
  * extlib/Stomp/Frame.php
    - spaces for tabs
    - add note on possibly protocol violating linefeed
  * extlib/Stomp/Message.php
    - space for tabs
    - add content-length header for message
  * lib/stompqueuemanager.php
    - use the notice for logging, not the frame
 2009-09-11 20:50:53 -04:00
Craig Andrews
292bb7c4d8 Allow @ signs in the path, querystring, and fragment parts of URLs 2009-09-10 21:19:38 -04:00
Craig Andrews
2a56245614 Re-use enclosure decision logic to decide if a link gets a paperclip/lightbox popup. 2009-09-10 21:13:30 -04:00
Craig Andrews
584ea1b23c Revert "If a shortened URL begins with http://, don't include it in the shortened url. Saves 7 characters, which is pretty awesome for 140 character max length notices." 
This reverts commit e2848eb862.

Downstream consumers of our notices (such as Friendfeed, Facebook, etc) don't have sophisticated URL detection, so a notice that reads: "check out ur1.ca/1" won't be linked. So the http:// prefix is
mandatory.
 2009-09-10 12:13:43 -04:00
Craig Andrews
cd650b090a Merge remote branch 'laconica/0.8.x' into 0.9.x 2009-09-09 22:58:19 -04:00
Craig Andrews
e2848eb862 If a shortened URL begins with http://, don't include it in the shortened url. Saves 7 characters, which is pretty awesome for 140 character max length notices. 2009-09-09 22:57:15 -04:00
Craig Andrews
d7ae0ed4fd Merge remote branch 'laconica/0.8.x' into 0.9.x 
Conflicts:
	lib/omb.php
 2009-09-09 22:52:38 -04:00
Craig Andrews
aecdba1ded :: isn't a valid IPv6 address for our purposes 2009-09-09 16:57:11 -04:00
Zach Copley
876f56254d Moved basic auth client into plugin dir 2009-09-08 16:07:01 -07:00
Zach Copley
9d87313eae Merge branch '0.9.x' into pluginize-twitter-bridge 
Conflicts:
	plugins/TwitterBridge/twitterauthorization.php
 2009-09-08 16:02:57 -07:00
CiaranG
afe1b8ec3d Use a non-error-generating array key check to a) improve performance and b) not fill the log file with crud 2009-09-08 11:27:37 +01:00
brenda
f218d7fd58 more info in error message, to help next person who has to debug locales 2009-09-05 16:12:50 +12:00
Sarven Capadisli
8399e4c2e6 Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x 2009-09-04 16:00:25 +00:00
Sarven Capadisli
b237dc21ba Updated layout for filter by tag form 2009-09-04 15:59:27 +00:00
Craig Andrews
80b7e54ca2 Added additional characters as allowed in URLs. 2009-09-04 11:30:29 -04:00
Sarven Capadisli
277b464054 Created autofocus method to give focus to an element (primarily a form 
control) on page onload.

Updated some of the pages to use autofocus.
 2009-09-03 19:42:50 +00:00
Craig Andrews
beae3db413 Pluginize the URL shorteners 2009-09-03 14:58:50 -04:00
Craig Andrews
a535ccdc4e Merge remote branch 'laconica/0.8.x' into 0.9.x 
Conflicts:
	lib/common.php
	lib/twitter.php
 2009-09-02 16:42:15 -04:00
Zach Copley
f049d669d9 Better error handling 2009-09-02 00:51:49 +00:00
Zach Copley
f86fed357c Better error handling 2009-09-02 00:50:41 +00:00
Brion Vibber
f949c2c9d9 Typo fix in error case: we probably wanted to call sprintf() not sprint() 2009-09-01 18:02:03 -04:00
Brion Vibber
4c812bf8a9 Convert !group tags to #hash tags when bridging outgoing notices to Twitter 
http://status.net/trac/ticket/1672
 2009-09-01 18:01:09 -04:00
Carlos Perilla
5668959399 Let users join and drop group membership from xmpp 2009-09-01 17:52:08 -04:00
Zach Copley
6adc50b97f Fix error in log msg format specifier 2009-09-01 19:44:10 +00:00
Zach Copley
ddc9555921 Stop requeuing notices not bound for Twitter. 2009-09-01 19:08:18 +00:00
Zach Copley
e0e30552cf Stop requeuing notices not bound for Twitter. 2009-09-01 19:00:18 +00:00
Craig Andrews
951a787877 Fix attachment saving 2009-08-31 15:36:03 -04:00
Sarven Capadisli
33d2ae6af3 Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x 2009-08-31 17:53:54 +00:00
Sarven Capadisli
9f372da3da Removed <dl> structure from MailboxAction::showMessage. Same as 
committ e0b877b26c.
 2009-08-31 17:52:45 +00:00
Craig Andrews
20423af689 Allow :'s in the path, query string, and fragment parts of the url (Mediawiki URLs often do this) 2009-08-31 10:33:37 -04:00
Brenda Wallace
c8c87fc603 some typoes in comments that annoyed me, fixed now 2009-08-31 11:51:33 +12:00
Brenda Wallace
b54a25c895 some typoes in comments that annoyed me, fixed now 2009-08-31 11:02:47 +12:00
Zach Copley
87ae90c903 Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x 2009-08-29 06:20:50 +00:00
Zach Copley
c02e8a4687 Fix error in log msg format specifier 2009-08-29 06:20:19 +00:00
Evan Prodromou
a44c064397 Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x 2009-08-28 13:35:48 -07:00
Evan Prodromou
b562ff1f2c change version to 0.8.2dev 2009-08-28 13:35:28 -07:00
Craig Andrews
3368452ebf Add % and ~ as valid characters in the path, querystring, and fragment parts of URLs 2009-08-28 16:18:45 -04:00
Craig Andrews
6e570a8440 Added 2 new events: StartApiRss and StartApiAtom 2009-08-28 14:42:51 -04:00
Evan Prodromou
b4ca06edb2 fix 'callback_helper' 2009-08-28 08:43:28 -07:00
Evan Prodromou
e04e009ddb stutuses -> statuses 2009-08-28 06:13:47 -07:00
Zach Copley
ca30cc2d59 Merge branch 'twitter-basic-auth' into 0.8.x 2009-08-28 07:03:32 +00:00
Zach Copley
36c104fb34 Make SyncTwitterFriends and TwitterStatusFetcher daemons use both HTTP Basic Auth as well as OAuth 2009-08-28 07:02:27 +00:00
Zach Copley
36b6ef8d05 Abstract the Twitter basic auth stuff into its own client class 2009-08-28 06:00:30 +00:00
Zach Copley
51adf00bd8 Renable basic auth posting to Twitter for users who already have a bridge setup 2009-08-28 04:36:47 +00:00
Evan Prodromou
c0d03fc279 make URL analyzer save new info on URLs 2009-08-27 20:23:31 -07:00
Evan Prodromou
34ce75c71d remove duplicate save of Notice and streamline attachment detection 2009-08-27 20:09:07 -07:00
Evan Prodromou
0056b635c6 reformat curry() to make my editor happy 2009-08-27 20:06:03 -07:00
Craig Andrews
6ff00c9404 Implement the is_member and membership group api's 2009-08-27 22:55:32 -04:00
Evan Prodromou
a08c76a434 Merge branch '0.9.x' of git@gitorious.org:laconica/mainline into 0.9.x 
Conflicts:
	classes/laconica.ini
 2009-08-27 14:52:32 -07:00
Evan Prodromou
bbb830e14c Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x 2009-08-27 14:18:51 -07:00
Evan Prodromou
5d09b6b3f0 Merge branch '0.8.x' into 0.9.x 
Conflicts:
	EVENTS.txt
	actions/finishremotesubscribe.php
	actions/postnotice.php
	actions/public.php
	actions/remotesubscribe.php
	actions/showstream.php
	actions/updateprofile.php
	actions/userauthorization.php
	classes/laconica.ini
	lib/common.php
	lib/oauthstore.php
	lib/omb.php
 2009-08-27 11:16:45 -07:00
Evan Prodromou
a84c4e3518 add api/laconica for backwards compatibility 2009-08-27 09:34:32 -07:00
Craig Andrews
2dd5a5f86d Do not used named capturing groups 
I'm not sure all php 5.2's are compiled with a PCRE library that supported named captures.
 2009-08-27 12:06:45 -04:00
Evan Prodromou
089148d286 update version in, and add codename to, lib/common 2009-08-27 08:02:41 -07:00
Evan Prodromou
f1fda6c050 Merge branch '0.8.x' into 0.9.x 2009-08-27 07:56:19 -07:00
Craig Andrews
eb667d09d9 allow oEmbed resources to be facebook attachments 2009-08-26 22:09:46 -04:00
Craig Andrews
3e362233ee Merge commit 'laconica/0.8.x' into 0.9.x 2009-08-26 21:56:59 -04:00
Craig Andrews
b7beac36c2 Support multiple attachments per facebook update 2009-08-26 21:54:57 -04:00
Craig Andrews
6d60d74093 Display linked oembed resources as enclosures if they are of non-html mime types 2009-08-26 15:40:51 -04:00
Evan Prodromou
b04bc29c3a change hidden label for site content license link 2009-08-26 10:51:44 -04:00
Evan Prodromou
6d0a26a407 define LACONICA_VERSION for backwards compatibility 2009-08-26 10:43:44 -04:00
Evan Prodromou
df86aa7214 define LACONICA and accept LACONICA for backwards compatibility 2009-08-26 10:41:36 -04:00
Zach Copley
937a05fb5d Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x 2009-08-26 14:35:25 +00:00
Evan Prodromou
434abed511 add back in /etc/laconica/* for compatibility 2009-08-26 10:34:50 -04:00
Zach Copley
cbdf8e51aa Facebook app wasn't loading the theme css 2009-08-26 14:34:41 +00:00
Evan Prodromou
379c80e26e add *Laconica* events back in for backwards compatibility 2009-08-26 10:33:04 -04:00
Evan Prodromou
c5cf2c4c94 Merge branch '0.8.x' into testing 2009-08-26 10:27:53 -04:00
Evan Prodromou
fd53fba114 more logging in xmppqueuehandler 2009-08-26 05:50:20 -04:00
Evan Prodromou
e1b5ca85f9 more log output in queue handlers 2009-08-26 05:46:41 -04:00
Evan Prodromou
e3a53251c0 last scrub of Laconica -> StatusNet 2009-08-26 03:33:43 -04:00
Zach Copley
5efe588174 Moved the rest of the Twitter stuff into the TwitterBridge plugin 2009-08-26 00:59:06 +00:00
Evan Prodromou
3567b9d708 global search and replace for laconica -> statusnet 2009-08-25 18:53:24 -04:00
Evan Prodromou
865b716f09 change LACONICA to STATUSNET 2009-08-25 18:42:34 -04:00
Evan Prodromou
ae883ceb9b change controlyourself.ca to status.net 2009-08-25 18:19:04 -04:00
Evan Prodromou
d35b2d3f3c change laconi.ca to status.net 2009-08-25 18:16:46 -04:00
Evan Prodromou
4737563b95 a distributed -> the distributed 2009-08-25 18:14:12 -04:00
Evan Prodromou
c8b8f07af1 change Laconica and Control Yourself to StatusNet in PHP files 2009-08-25 18:12:20 -04:00