GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity
7,036 Commits 8 Branches 4 Tags 309 MiB
Commit Graph

7036 Commits

Author SHA1 Message Date
Craig Andrews 4c8bed8ba0 Use inlineScript() everywhere inline scripts are written 2009-12-04 19:41:51 -05:00
Craig Andrews aab7344002 Merge branch 'minify' into 0.9.x 2009-12-04 18:44:26 -05:00
Zach Copley 1fd7e5e379 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-12-04 22:43:34 +00:00
Zach Copley 4881be47c7 Don't depend on a User being available when looking up Design and timezone 
for a profile (because some profiles are remote, etc.)
 2009-12-04 22:42:09 +00:00
Evan Prodromou 5c973876ac Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-12-04 16:30:33 -05:00
Evan Prodromou 098426cee9 configurable expiry for cached Geonames data defaults to 90 days 2009-12-04 16:25:05 -05:00
Zach Copley eb0a5977ff Don't try to broadcast the notice if something went wrong. 2009-12-04 20:39:50 +00:00
Evan Prodromou 41f10b742c remove duplicate log() function from RealtimePlugin 2009-12-04 15:34:41 -05:00
Evan Prodromou e074fe6599 add logging utilities to Plugin class 2009-12-04 15:34:25 -05:00
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
Zach Copley bf4ed35a90 Merge branch '0.9.x' 
* 0.9.x: (141 commits)
  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.
  Delete design when user chooses to restore default design, instead
  Localisation updates for !StatusNet from !translatewiki.net !sntrans
  Do not rebuild/add .mo files by default
  If an XHR notice is sent form a page that has no timeline, show a
  Revert "If the page doesn't have .notices, silently skip the notice XHR response"
  Revert "Clear/reset the XHR notice form on pages where there is no timeline"
  Clear/reset the XHR notice form on pages where there is no timeline
  If the page doesn't have .notices, silently skip the notice XHR response
  Remove useless debugging statement
  Moved form control styles (i.e., border and radius) out of base
  add pluginhandler to list of daemons to shut down
  Using box-shadow only on the current navigation item
  Updated theme readme
  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
  Ticket 2048: make OMB posting HTTP timeout configurable as $config['omb']['timeout']; defaults to 5 seconds instead of 20-second default in Yadis library
  ticket 1100: add Drupal source link
  Fix makefile wildcards for locale compilation (now works on Ubuntu 8.04)
  typo fix: '$this' now spelled correctly. Looks like this'll fix acceptance of 'source' param for direct messages posted to API
  ...

Conflicts:
	js/util.js
	locale/ar/LC_MESSAGES/statusnet.po
	locale/bg/LC_MESSAGES/statusnet.po
	locale/ca/LC_MESSAGES/statusnet.po
	locale/cs/LC_MESSAGES/statusnet.po
	locale/de/LC_MESSAGES/statusnet.po
	locale/el/LC_MESSAGES/statusnet.po
	locale/en_GB/LC_MESSAGES/statusnet.po
	locale/es/LC_MESSAGES/statusnet.po
	locale/fi/LC_MESSAGES/statusnet.po
	locale/fr/LC_MESSAGES/statusnet.po
	locale/ga/LC_MESSAGES/statusnet.po
	locale/he/LC_MESSAGES/statusnet.po
	locale/is/LC_MESSAGES/statusnet.po
	locale/it/LC_MESSAGES/statusnet.po
	locale/ja/LC_MESSAGES/statusnet.po
	locale/ko/LC_MESSAGES/statusnet.po
	locale/mk/LC_MESSAGES/statusnet.po
	locale/nb/LC_MESSAGES/statusnet.po
	locale/nl/LC_MESSAGES/statusnet.po
	locale/nn/LC_MESSAGES/statusnet.po
	locale/pl/LC_MESSAGES/statusnet.po
	locale/pt/LC_MESSAGES/statusnet.po
	locale/pt_BR/LC_MESSAGES/statusnet.po
	locale/ru/LC_MESSAGES/statusnet.po
	locale/statusnet.po
	locale/sv/LC_MESSAGES/statusnet.po
	locale/te/LC_MESSAGES/statusnet.po
	locale/tr/LC_MESSAGES/statusnet.po
	locale/uk/LC_MESSAGES/statusnet.po
	locale/vi/LC_MESSAGES/statusnet.po
	locale/zh_CN/LC_MESSAGES/statusnet.po
	locale/zh_TW/LC_MESSAGES/statusnet.po
	plugins/Realtime/realtimeupdate.js
 2009-12-03 12:51:21 -08:00
Zach Copley 7ed3328c47 Revert "If an XHR notice is sent form a page that has no timeline, show a" 
This reverts commit 987d59c242.
 2009-12-03 06:06:42 +00: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 15fafb7162 Reload the admin design panel page to show the new CSS when the 
design gets reset.
 2009-12-02 18:10:53 -08:00
Zach Copley 55a488326e Only pick up new default site colors if the theme has NOT changed. 2009-12-02 18:10:39 -08: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 008f51db4d Delete design when user chooses to restore default design, instead 
of saving a design with site defaults.
 2009-12-03 00:56:53 +00: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
Zach Copley 987d59c242 If an XHR notice is sent form a page that has no timeline, show a 
message like 'Notice sent'

Conflicts:

	js/util.js
 2009-12-02 15:32:26 -08: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