Commit Graph

6905 Commits

Author SHA1 Message Date
Evan Prodromou
99b23782ef let Geonames clients use commercial Web service 2009-12-04 15:30:43 -05:00
Brion Vibber
4afe07f0c3 Merge commit 'refs/merge-requests/108' of git://gitorious.org/statusnet/mainline into 0.9.x 2009-12-04 12:23:33 -08:00
Zach Copley
0177b386d8 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-12-04 20:18:42 +00:00
Zach Copley
cff12603cf Make imported Twitter notices show up via real time plugins. 2009-12-04 20:17:42 +00:00
Evan Prodromou
e7e9dfceb4 remove unnecessary debugging code from mapstraction output 2009-12-04 14:36:24 -05:00
Evan Prodromou
a92228c713 Update Mapstraction to properly scrape data from notice-list pages
Refactored the JavaScript for Mapstraction use so it scrapes data from
the HTML of the page it's on, if possible, and otherwise generates a
JSON array.
2009-12-04 14:31:19 -05:00
Evan Prodromou
2c07d4a530 utility function to output inline JavaScript 2009-12-04 13:39:51 -05:00
Craig Andrews
01b089d9be Added minify plugin 2009-12-04 12:36:00 -05:00
Craig Andrews
40afc7e987 Add 4 new events: StartCssLinkElement, EndCssLinkElement, StartScriptElement, EndScriptElement 2009-12-04 01:57:14 -05:00
Zach Copley
d2b42577de Was deleting wrong subscription during block. Now deletes the blockee's sub if it exists. 2009-12-03 17:44:34 -08:00
Zach Copley
2acdfff58b Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
* '0.9.x' of gitorious.org:statusnet/mainline:
  Remove unnecessary pass by reference indicators
  refactor the common parts of usermap and allmap into a common base class
  Load notice data using javascript from the html on the page instead of writing json representations of the notices on each page
2009-12-03 17:13:54 -08:00
Zach Copley
aef4cc0a59 Make it impossible to block (and thus unsubscribe from your
self-subscription) via the API.  Additionally, make it impossible
to block yourself or unsubscribe from yourself, period.

I also made User use the subs.php helper function for unsubscribing
during a block.

Hopefully, these changes will get rid of the problem of people
accidentally deleting their self-subscriptions once and for all
(knock on wood).
2009-12-03 17:06:58 -08:00
Craig Andrews
35ff3961e8 Remove unnecessary pass by reference indicators 2009-12-03 19:59:31 -05:00
Craig Andrews
567bd6c0c2 Merge branch 'mapsimprovement' into 0.9.x 2009-12-03 19:45:29 -05:00
Craig Andrews
43a1a35524 refactor the common parts of usermap and allmap into a common base class 2009-12-03 19:43:02 -05:00
Brion Vibber
c89b10ffe4 Code style cleanup: dropped some unnecessary =& reference assignments where they're used only out of habit for PHP 4-style object semantics 2009-12-03 12:58:48 -08:00
Craig Andrews
e3caec9d8a Load notice data using javascript from the html on the page instead of writing json representations of the notices on each page
Clicking on a geo link pops up a map (round 2)
2009-12-02 21:24:41 -05:00
Zach Copley
9e0f89ba4f Merge branch 'fix-default-design' into 0.9.x
* fix-default-design:
  Reload the admin design panel page to show the new CSS when the
  Only pick up new default site colors if the theme has NOT changed.
2009-12-02 18:09:24 -08:00
Zach Copley
56b3e13d4a Reload the admin design panel page to show the new CSS when the
design gets reset.
2009-12-02 18:05:19 -08:00
Zach Copley
bb2311ea18 Only pick up new default site colors if the theme has NOT changed. 2009-12-02 17:50:51 -08:00
Zach Copley
bf63734359 Merge branch 'fix-default-design' into 0.9.x 2009-12-03 00:54:46 +00:00
Zach Copley
f55b0e9b3d Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-12-03 00:54:30 +00:00
Zach Copley
4f359d2a8b Delete design when user chooses to restore default design, instead
of saving a design with site defaults.
2009-12-02 16:44:23 -08:00
Siebrand Mazeland
3e38d376a9 Localisation updates for !StatusNet from !translatewiki.net !sntrans 2009-12-03 00:38:22 +01:00
Siebrand Mazeland
5edc27be6e Do not rebuild/add .mo files by default
FIXME: should be made a command line parameter.
2009-12-03 00:28:00 +01:00
Sarven Capadisli
ad8d6c8fbf If an XHR notice is sent form a page that has no timeline, show a
message like 'Notice sent'
2009-12-02 23:41:58 +01:00
Sarven Capadisli
62d5f05669 Revert "If the page doesn't have .notices, silently skip the notice XHR response"
This reverts commit 7b550f386a.
2009-12-02 23:25:38 +01:00
Sarven Capadisli
5963c140d6 Revert "Clear/reset the XHR notice form on pages where there is no timeline"
This reverts commit d318976342.
2009-12-02 23:25:17 +01:00
Zach Copley
39f3e69bb5 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-12-02 22:18:55 +00:00
Sarven Capadisli
d318976342 Clear/reset the XHR notice form on pages where there is no timeline 2009-12-02 23:16:27 +01:00
Zach Copley
02bbebcd65 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-12-02 22:14:11 +00:00
Sarven Capadisli
7b550f386a If the page doesn't have .notices, silently skip the notice XHR response 2009-12-02 23:13:15 +01:00
Zach Copley
fcf1c4e53f Remove useless debugging statement 2009-12-02 19:33:08 +00:00
Sarven Capadisli
5f0c6f3eaa Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-12-02 19:35:57 +01:00
Sarven Capadisli
68f83211a5 Moved form control styles (i.e., border and radius) out of base 2009-12-02 19:35:17 +01:00
Evan Prodromou
4205d25d22 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-12-02 11:07:57 -05:00
Evan Prodromou
ba4fd15abd add pluginhandler to list of daemons to shut down 2009-12-02 11:07:44 -05:00
Sarven Capadisli
14eeef4ac4 Using box-shadow only on the current navigation item 2009-12-02 13:45:54 +01:00
Sarven Capadisli
2f0acd88e8 Updated theme readme 2009-12-02 11:22:30 +01:00
Brion Vibber
a3a2168292 Fix regression in password settings: users have been unable to change their passwords since introduction of ChangePassword event (later StartChangePassword) November 5 in commit d6ddb84132
Logic was inversed; new password was only being saved if a plugin claimed the event; so when no auth plugin was present to take it, passwords never got saved.
2009-12-01 15:44:07 -08:00
Brion Vibber
15a9c86979 Ticket 2048: make OMB posting HTTP timeout configurable as $config['omb']['timeout']; defaults to 5 seconds instead of 20-second default in Yadis library 2009-12-01 14:50:18 -08:00
Brion Vibber
8b63717bf9 ticket 1100: add Drupal source link 2009-12-01 12:55:55 -08:00
Brion Vibber
95663e70df Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x 2009-12-01 12:55:55 -08:00
Brion Vibber
46e14c762a Fix makefile wildcards for locale compilation (now works on Ubuntu 8.04) 2009-12-01 20:48:24 +00:00
Brion Vibber
e28e8cc1d7 typo fix: '$this' now spelled correctly. Looks like this'll fix acceptance of 'source' param for direct messages posted to API
@fixme: there's duplication of reserved sources list between at least this and apistatusesupdate module
2009-12-01 12:31:21 -08:00
Zach Copley
7591439451 Add missing rule for /api/users/show.:format 2009-12-01 10:02:22 -08:00
Zach Copley
4003e51b91 Revert "Fix problem where screen_name and user_id parameters are being"
The problem this was trying to fix is actually caused by a missing
routing rule.  Silly me.

This reverts commit 2451192415.
2009-12-01 09:57:47 -08:00
Zach Copley
d32af91f25 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
* '0.9.x' of gitorious.org:statusnet/mainline:
  make checkschema.php executable (which makes sense, cause the README says to run it :-) )
2009-12-01 09:42:29 -08:00
Zach Copley
a36612866e Fix bad function call 2009-11-30 14:55:02 -08:00
Craig Andrews
b5451353e0 make checkschema.php executable (which makes sense, cause the README says to run it :-) ) 2009-11-30 17:00:00 -05:00