Commit Graph

2593 Commits

Author SHA1 Message Date
Evan Prodromou
e150d920a5 silently skip email for subs from sandboxed user 2009-11-16 14:11:14 -05:00
Evan Prodromou
e9321a1806 more rights denied to silenced and sandboxed 2009-11-16 19:46:08 +01:00
Evan Prodromou
f1efb845e4 don't allow sandboxed users to post public notices 2009-11-16 19:22:22 +01:00
Evan Prodromou
d2145a5b7f Move rights check to profile and add right for new notices
Added a right for new notices, realized that the hasRight() method
should be on the profile, and moved it.

Makes this a less atomic commit but that's the way it goes sometimes.
2009-11-16 19:03:59 +01:00
Evan Prodromou
0580e824f0 use return-to method for UserProfile widget 2009-11-16 17:54:50 +01:00
Evan Prodromou
968058c68b getting arguments for return-to processing 2009-11-16 17:54:34 +01:00
Craig Andrews
0e7dd81a6c Added a "groups" command 2009-11-16 11:23:00 -05:00
Craig Andrews
73b4d770a2 Changed to StatusNet consistent terminology 2009-11-16 11:17:14 -05:00
Evan Prodromou
4f9f3665f7 add routes for silence, sandbox, delete user 2009-11-16 17:06:35 +01:00
Evan Prodromou
a723cc979b correct constructor for DeleteUserForm 2009-11-16 17:06:12 +01:00
Evan Prodromou
ee5c9a5c90 give UnsilenceForm correct superclass 2009-11-16 17:05:39 +01:00
Evan Prodromou
9cc0d65240 give UnsandboxForm correct superclass 2009-11-16 17:05:31 +01:00
Evan Prodromou
d968b5b4f1 give SilenceForm proper superclass 2009-11-16 17:05:03 +01:00
Evan Prodromou
ff88ef407a make block actions use profileformaction superclass 2009-11-16 14:40:04 +01:00
Evan Prodromou
64677fc09a common superclass for actions that operate on a profile and return 2009-11-16 14:28:58 +01:00
Craig Andrews
f04dbc8fa2 Add "followers" and "following" commands 2009-11-16 00:19:47 -05:00
Evan Prodromou
d24ed193e7 add forms for silence, sandbox, delete user 2009-11-15 16:00:29 +01:00
Evan Prodromou
c9475c76a8 define rights around how to silence, sandbox, and delete a user 2009-11-15 15:59:10 +01:00
Evan Prodromou
e3b53565bb unblockform uses profileactionform 2009-11-15 15:57:59 +01:00
Evan Prodromou
d5032fc3a3 blockform uses profileactionform 2009-11-15 15:57:52 +01:00
Evan Prodromou
e9225fabdd common superclass for forms that operate on a profile 2009-11-15 15:57:37 +01:00
Brion Vibber
133ca0ef6b Fix regression from 9f372da3da: typo in refactoring caused fatal error on unrecognized message source 2009-11-14 13:10:47 -08:00
Evan Prodromou
fe18063bd2 Revert "Ask users if they wish to send statistics to SNI, default is off."
This reverts commit 7efea1115f.

Conflicts:

	install.php
2009-11-14 17:38:10 +01:00
brenda
2147ac510f don't offer install.php on check-fancy requests
this time, E_STRICT compliant
2009-11-14 16:52:39 +13:00
Sarven Capadisli
1bac324072 Moved class="pagination" to child element and removed element 2009-11-13 12:26:24 +00:00
Sarven Capadisli
12d3c44480 Added hAtom for profile and group lists 2009-11-13 12:13:38 +00:00
Siebrand Mazeland
21603f0225 Fix typo (!. -> !) 2009-11-13 11:28:54 +01:00
Craig Andrews
f60a55d9ec blasted, that should not be there 2009-11-12 20:15:10 -05:00
Craig Andrews
ed690615de Added a User_username table that links the external username with a StatusNet user_id
Added EmailAuthenticationPlugin
Added ReverseUsernameAuthenticationPlugin
Changed the StartChangePassword and EndChangePassword events to take a user, instead of a nickname
User::allowed_nickname was declared non-static, but used as if it was static, so I made the declaration static
2009-11-12 20:12:36 -05:00
Brion Vibber
d8fe5224cb Fix for bug 1974: drop unnecessary define_syslog_variables() call from common.php
The call was moved to this spot in commit 3ea1119e50 (previously init'd later in another func) but doesn't seem to be needed anyway. None of our code uses the variables that this function defines, just the constants -- which are already predefined without the call.

The function is deprecated in PHP 5.3 and gone in 6, so we may as well toss it now.
2009-11-12 09:02:00 -08:00
Eric Helgeson
7efea1115f Ask users if they wish to send statistics to SNI, default is off.
Users may not know about this setting and are unaware they are sending stats.
This allows them to make that decision.
2009-11-11 18:45:21 -05:00
Craig Andrews
59e8896212 Add the [noticeid] to the end of text only jabber messages 2009-11-11 18:03:07 -05:00
Craig Andrews
074b9faee0 Remove alt text on avatar url (so pidgin doesn't show it)
surround notice_id with [], looks nicer
2009-11-11 18:00:58 -05:00
Craig Andrews
1c4bacf7bc Remove registerUrlShortener() (no longer used) 2009-11-11 16:51:10 -05:00
Craig Andrews
014d6b1d19 Redid how URL shorteners work. This way is much more like how Evan wants events to work (and more like how the rest of SN works). 2009-11-11 14:04:44 -05:00
Brion Vibber
7f8dbb8e45 Fix bug 1963: Web UI throws warnings during previously open login session after user account is deleted
common_logged_in() returned bogus results because it checks against null specifically, but common_current_user() was sticking 'false' into $_cur because that's what User::staticGet() returned from a failed lookup. Now we skip over a failed lookup here, so we keep null and all is well.
2009-11-11 10:38:11 -08:00
Evan Prodromou
494a06f388 add designadminpanel to admin panel tabset 2009-11-11 01:44:24 -05:00
Evan Prodromou
bcb0447eda add designadminpanel to router 2009-11-11 01:43:56 -05:00
Evan Prodromou
935410e8dc Merge branch '0.9.x' into adminpanel 2009-11-11 00:22:42 -05:00
Zach Copley
db64b61296 Merge branch '0.9.x' into finish-account-api
* 0.9.x:
  Added a events for the settings menu items
  Bringing Sphinx search support up to code: broken out to a plugin, now supports multiple sites on a single server.
  Changed to Evan's event style and added an AuthPlugin superclass
  add geo output to statuses in json, xml, atom, rss in API
  Localisation updates from translatewiki.net (2009-11-10)
  Localisation updates from translatewiki.net
  Update pot
  add lat and long parameters to api/statuses/update
  change credential check to work more like other events
  fixup output of object attributes in db error code
  Performance fix for subscription/subscriber lists based on feedback from ops.
  Adjusting indexes to make favorites query more efficient, based on feedback from ops.
  Revert untested code; spews PHP notice warnings on every page view: "just sent a http 200 for the check-fancy from install.php"
  Added hook for the Group navigation items
  Updated block @title text (shouldn't say from group)
  Updated group block markup
  Revert "Remove more contractions"
2009-11-10 15:25:43 -08:00
Craig Andrews
91332cdadc Added a events for the settings menu items 2009-11-10 17:54:55 -05:00
Zach Copley
4e4ba24c00 Implement /api/account/update_delivery_device.format 2009-11-10 14:36:41 -08:00
Brion Vibber
53c86c43c4 Bringing Sphinx search support up to code: broken out to a plugin, now supports multiple sites on a single server.
Upgrade notes:
* Index names have changed from hardcoded 'Identica_people' and 'Identica_notices' to use the database name and actual table names. Must reindex.

New events:
* GetSearchEngine to override default search engine class selection from plugins

New scripts:
* gen_config.php generates a sphinx.conf from database configuration (with theoretical support for status_network table, but it doesn't seem to be cleanly queriable right now without knowing the db setup info for that. Needs generalized support.)
* Replaced old sphinx-indexer.sh and sphinx-cron.sh with index_update.php

Other fixes:
* sphinx.conf.sample better matches our live config, skipping unused stopword list and using a more realistic indexer memory limit

Further notes:
* Probably doesn't work right with PostgreSQL yet; Sphinx can pull from PG but the extraction queries currently look like they use some MySQL-specific functions.
2009-11-10 13:44:40 -08:00
Evan Prodromou
1f5f5474f1 Merge branch '0.9.x' into adminpanel 2009-11-10 16:27:23 -05:00
Evan Prodromou
651cbf0681 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-11-10 16:15:20 -05:00
Evan Prodromou
cb64cfb44c add geo output to statuses in json, xml, atom, rss in API 2009-11-10 16:15:05 -05:00
Siebrand Mazeland
da372c4d88 Localisation updates from translatewiki.net
* adding Arabic localisation
2009-11-10 22:03:11 +01:00
Evan Prodromou
923fa068a6 change credential check to work more like other events 2009-11-10 14:45:19 -05:00
Evan Prodromou
7ae10c27b0 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
	lib/util.php
2009-11-10 14:26:49 -05:00
Evan Prodromou
8d5c2b3129 fixup output of object attributes in db error code 2009-11-10 14:06:30 -05:00
Brion Vibber
486dbe6aef Revert untested code; spews PHP notice warnings on every page view: "just sent a http 200 for the check-fancy from install.php"
Notice: Undefined index: p in /Library/WebServer/Documents/mublog/lib/common.php on line 41

This reverts commit 223fee2ad1.
2009-11-10 07:57:58 -08:00
Brion Vibber
333c376c95 Merge remote branch 'statusnet/0.9.x' into 0.9.x 2009-11-10 06:44:53 -08:00
Sarven Capadisli
069d3f2b2f Added hook for the Group navigation items 2009-11-10 13:52:47 +00:00
Zach Copley
cae06a49ea Merge branch '0.9.x' into finish-account-api
* 0.9.x: (26 commits)
  just sent a http 200 for the check-fancy from install.php
  Add a new event: CanUserChangeField
  shorten flag notification and include a class
  Added flag icon for UserFlag plugin
  Fixed notice option alignment in IE
  add a method to Theme class to list available themes
  Updated Realtime plugin to use the util's NoticeReply object
  Localisation updates from translatewiki.net (2009-11-08)
  Update pot again
  Rebuild pot file *without* --join-existing to get rid of the cruft. Not sure why "--join-existing" must be in. Only thing I can think of is manual additions, which I could not find.
  Revert "More precise field label"
  Remove more contractions
  Revert "* [Cc]an't -> [Cc]annot"
  Revert "More specifics on 'address'"
  * [Cc]an't -> [Cc]annot
  Revert "* check usage of 'people' in UI and change it to 'users' or something else in most places"
  add utilities for calculating local and installation theme root dirs
  Harmonise UI message "No such user."
  Restructure theme.php to define a class Theme
  entity_action responses look more inactive now
  ...
2009-11-10 00:43:58 -08:00
Zach Copley
dbb86f9486 Output profile background image info in the API user objects 2009-11-10 00:30:56 -08:00
Zach Copley
312c745884 Implement /api/account/update_profile.format 2009-11-09 23:13:59 -08:00
Zach Copley
322a4c3ed1 Implement /api/account/update_profile_colors.format 2009-11-09 22:24:32 -08:00
Brenda Wallace
223fee2ad1 just sent a http 200 for the check-fancy from install.php 2009-11-10 15:53:07 +13:00
Craig Andrews
3be1205714 Add a new event: CanUserChangeField 2009-11-09 17:43:37 -05:00
Brion Vibber
088081675f Revert "Remove more contractions"
This reverts commit 5ab709b739.

Missed this one yesterday...
2009-11-09 20:01:46 +01:00
Evan Prodromou
348b155376 add nav menu for admin panel 2009-11-09 13:40:37 -05:00
Evan Prodromou
a4905c03ba add site admin to global primary nav 2009-11-08 22:31:19 -05:00
Evan Prodromou
691beefd0f Merge branch '0.9.x' into adminpanel 2009-11-08 21:41:43 -05:00
Evan Prodromou
aa0d9a8615 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-11-08 21:23:25 -05:00
Evan Prodromou
76b0e6e6f4 Merge branch '0.9.x' into adminpanel 2009-11-08 21:23:09 -05:00
Evan Prodromou
f086dddf43 add a method to Theme class to list available themes 2009-11-08 21:18:57 -05:00
Zach Copley
5c091dab9b Implement /api/account/update_profile_background_image.format 2009-11-08 15:29:04 -08:00
Siebrand Mazeland
b10f362ede Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x 2009-11-08 23:33:58 +01:00
Siebrand Mazeland
5ab709b739 Remove more contractions
* doesn't
* won't
* isn't
* don't
2009-11-08 23:32:15 +01:00
Brion Vibber
fc5002015b Revert "* [Cc]an't -> [Cc]annot"
This reverts commit 0ab17f382b.
2009-11-08 23:28:51 +01:00
Brion Vibber
ec6a38a627 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x 2009-11-08 23:27:24 +01:00
Siebrand Mazeland
104a47e4a2 Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x 2009-11-08 23:22:50 +01:00
Siebrand Mazeland
0ab17f382b * [Cc]an't -> [Cc]annot
* [Cc]ould't -> [Cc]ould not
2009-11-08 23:22:38 +01:00
Brion Vibber
a034fb0b82 Revert "* check usage of 'people' in UI and change it to 'users' or something else in most places"
This reverts commit 81b4a381d9.
IMO "user" is a bit impersonal and we shouldn't go changing the tone of the UI willy-nilly when we're updating localisations.
2009-11-08 23:22:13 +01:00
Evan Prodromou
cbae1b0c8b add utilities for calculating local and installation theme root dirs 2009-11-08 17:16:50 -05:00
Siebrand Mazeland
221b779e88 Harmonise UI message "No such user." 2009-11-08 23:10:44 +01:00
Evan Prodromou
111f6a775d Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-11-08 17:06:41 -05:00
Evan Prodromou
b7e2e3fd2b Restructure theme.php to define a class Theme
For various reasons, it's nicer to have a class for theme-file paths
and such. So, I've rewritten the code for determining the locations of
theme files to be more OOPy.

I changed all the uses of the two functions in the module (theme_file
and theme_path) to use Theme::file and Theme::path respectively.

I've also removed the code in common.php that require's the module;
using a class means we can autoload it instead.
2009-11-08 17:04:46 -05:00
Siebrand Mazeland
99ebb56529 !. => ! 2009-11-08 22:39:02 +01:00
Siebrand Mazeland
81b4a381d9 * check usage of 'people' in UI and change it to 'users' or something else in most places
* change some contractions to full text in UI messages
2009-11-08 22:26:13 +01:00
Evan Prodromou
d0466da80b add site admin panel 2009-11-07 23:17:52 -05:00
Evan Prodromou
dd9fa0e683 only load user once, reload settings in admin panel 2009-11-07 23:16:34 -05:00
Evan Prodromou
46cd7b9636 Merge branch '0.9.x' into adminpanel 2009-11-07 22:26:14 -05:00
Evan Prodromou
1de9496c7f fix constant for deleteothersnotice 2009-11-07 22:26:03 -05:00
Evan Prodromou
ee99a8ef50 superclass for adminpanel actions 2009-11-07 19:18:22 -05:00
Evan Prodromou
589185ce87 uppercase right constants 2009-11-07 19:16:15 -05:00
Evan Prodromou
31bbdacbf3 add a method to Action to check session token 2009-11-07 18:51:57 -05:00
Evan Prodromou
d10ee1763b ->action -> ->out in UserProfile 2009-11-07 13:18:09 -05:00
Evan Prodromou
742317c0da fix userprofile widget so it correctly provides an action 2009-11-07 13:16:29 -05:00
Zach Copley
b522c401e6 Better workaround for PHP returning empty $_POST and $_FILES when
POST length > post_max_size in php.ini. I also added this check to
avatar upload, which was failing with huge files.
2009-11-06 17:21:08 -08:00
Sarven Capadisli
0994fa31d6 Added missing closing span tag 2009-11-06 15:28:58 +01:00
Sarven Capadisli
87543292d1 Fixed some group list styles 2009-11-06 15:26:13 +01:00
Sarven Capadisli
1c72461394 Removed dl "stuff" 2009-11-06 15:03:35 +01:00
Sarven Capadisli
4eea7f55ef Check if it is empty instead of '' 2009-11-06 13:32:04 +01:00
Sarven Capadisli
6f2aa1394b Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-11-06 12:54:20 +01:00
Sarven Capadisli
85647719a3 Updated styles for profile list re: commit
3c4ac05cde
2009-11-06 12:51:28 +01:00
Brion Vibber
793a4ef4d5 kill tabs 2009-11-06 12:15:08 +01:00
Brion Vibber
e909d0a639 Add Icelandic to the language support list so the localization can actually be used :) 2009-11-06 11:51:28 +01:00
Sarven Capadisli
7ce49e4bcf Removed .uid from group profiles in a list 2009-11-06 11:30:41 +01:00
Craig Andrews
1845c8c773 Added an AutoRegister event
LDAP plugin can do autoregistration
2009-11-05 16:40:41 -05:00
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