Commit Graph

471 Commits

Author SHA1 Message Date
Zach Copley e767436176 Some changes to the OpenID DataObjects to make them emit the exact same
.ini info as what used to be in statusnet.ini before OpenID was pulled
out into a plugin.
2009-11-26 02:22:53 +00:00
Zach Copley 58e1d9a68b OpenID plugin should set 'user_openid.display' as unique key 2009-11-26 01:27:39 +00:00
Zach Copley 1b46d17f4e Have OpenID plugin DataObjects emit their own .ini info 2009-11-25 23:54:53 +00:00
Zach Copley 2b6cf0d8b6 Revert "Allow plugin DB_DataObject classes to not have to use the .ini file by overriding keys(), table(), and sequenceKey() for them"
This reverts commit a373d07ae0.

Conflicts:

	classes/statusnet.ini
	lib/schema.php
	plugins/Authentication/AuthenticationPlugin.php
	plugins/OpenID/OpenIDPlugin.php
	plugins/UserFlag/UserFlagPlugin.php
2009-11-25 23:54:36 +00:00
Zach Copley 3b2f39e1e1 Catch uncaught exception 2009-11-25 18:07:00 +00:00
Zach Copley aeb933355d Fixed bug where reply-sync bit wasn't getting saved 2009-11-25 01:37:00 +00:00
Zach Copley 824e347e55 Forgot to render the nav menu when on FB Connect login tab 2009-11-25 01:13:21 +00:00
Zach Copley ace4b7dc09 Facebook plugin no longer takes over Login and Connect settings nav menus 2009-11-25 00:46:34 +00:00
Zach Copley 3556861596 Fix SSL options for Twitter bridge HTTP requests 2009-11-24 19:12:57 +00:00
Craig Andrews 3db551ed5a Undo part of c6e4feb815 so that blacklisted notices are not displayed in realtime 2009-11-20 13:58:13 -08:00
Brion Vibber afe5e71c4e Quick fix for Safari XHTML error... the map doesn't currently work with Safari, but this gets the whole page parsing again! 2009-11-20 12:04:27 -08:00
Brion Vibber 1ca022464a Fix double-escaped HTML in mapstraction notice popups 2009-11-20 10:17:14 -08:00
Brion Vibber 46c5a52810 fix notice bug 2009-11-20 10:08:13 -08:00
Brion Vibber b189c9500c Initial functional version of feed subscription plugin, currently supporting only PuSH-enabled feeds. 2009-11-20 09:42:19 -08:00
Evan Prodromou d645db38ae Merge branch 'master' of git@gitorious.org:statusnet/mainline 2009-11-20 08:00:34 -08:00
Evan Prodromou 85ec057422 use caching in geonames plugin 2009-11-20 07:58:28 -08:00
Zach Copley e640561ccd Add routing rules for FB app in front of other rules 2009-11-20 11:11:18 +00:00
Sarven Capadisli f8b76ebc11 Updated form markup 2009-11-20 05:50:46 +00:00
Sarven Capadisli c6e4feb815 These changes didn't go into master (from 0.9-release) 2009-11-20 05:28:10 +00:00
Zach Copley 003b25ee56 Merge branch '0.9-release'
* 0.9-release:
  Changed DEFINE name to avoid conflicts
2009-11-19 20:51:20 -08:00
Sarven Capadisli e1fcac0e09 Changed DEFINE name to avoid conflicts 2009-11-20 04:49:35 +00:00
Zach Copley e3de04f8cd Merge branch '0.9-release'
* 0.9-release:
  Reduced entity_profile width in pop up
2009-11-19 20:18:35 -08:00
Zach Copley 4b98edf75f Merge branch '0.9-release'
* 0.9-release: (874 commits)
  Removed call to NewDirectMessage() until IE return is fixed i.e.,
  Don't show flag user button your own profile
  Fixed HXR response for flag user
  Using the right form class name
  Using common_redirect
  Left a form_data class of a <ul> in the user admin panel
  Added validation to fields in user admin panel
  Added a user admin panel
  Added mobile logos for default and identica themes
  Changed gif to png
  Changed this to action. THANKS zach!
  Doing content negotiation only once
  Add execute bit to pingqueuehandler
  Localisation updates for !StatusNet from !translatewiki.net
  Use the browser's geolocation API to set the location on the notice form
  Add geometa library, and include it.
  Add location form elements to the noticeform, and save their values on submission
  Use the $user object nickname, as login name doesnt have to == nickname anymore with plugins such as ldap/etc
  Revert "Re added NICKNAME_FMT constant to router.php."
  Moved most path and server settings to a new paths admin panel
  ...

Conflicts:
	js/util.js
	locale/it_IT/LC_MESSAGES/statusnet.mo
	locale/mk_MK/LC_MESSAGES/statusnet.mo
	locale/mk_MK/LC_MESSAGES/statusnet.po
	locale/pt_BR/LC_MESSAGES/statusnet.mo
	locale/vi_VN/LC_MESSAGES/statusnet.mo
	plugins/InfiniteScroll/infinitescroll.js
	plugins/Realtime/realtimeupdate.js
2009-11-19 20:12:46 -08:00
Sarven Capadisli b51df36189 Reduced entity_profile width in pop up 2009-11-20 04:09:40 +00:00
Zach Copley 50827d5e81 Don't show flag user button your own profile 2009-11-19 19:56:24 -08:00
Zach Copley 3d2a2d4173 Fixed HXR response for flag user 2009-11-19 19:29:55 -08:00
Sarven Capadisli 2eed928837 Using the right form class name 2009-11-20 03:06:12 +00:00
Sarven Capadisli 30f660b05c Using common_redirect 2009-11-20 02:12:09 +00:00
Sarven Capadisli 5a3267900d Changed gif to png 2009-11-19 20:59:21 +00:00
Sarven Capadisli 78c6056133 Changed this to action. THANKS zach! 2009-11-19 20:52:42 +00:00
Sarven Capadisli 3ff5dd6989 Doing content negotiation only once 2009-11-19 20:47:05 +00:00
Evan Prodromou 507c7e1e6b take out void setLabel() call in Mapstraction 2009-11-19 13:24:03 -05:00
Evan Prodromou 2723bee69f add username and timestamp to map popup 2009-11-19 13:20:55 -05:00
Evan Prodromou 640bb39891 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-11-19 12:37:26 -05:00
Sarven Capadisli 318dd70de8 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-11-19 17:35:45 +00:00
Evan Prodromou ea561b88d1 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-11-19 12:35:19 -05:00
Evan Prodromou 2daa31f142 show maps on inbox and personal page 2009-11-19 12:34:56 -05:00
Sarven Capadisli 60391d0b96 Brought the plugin up to date with recent 0.9.x changes e.g.,
Theme::path
2009-11-19 17:13:51 +00:00
Craig Andrews 4463768bae tobyink's location RDF patch 2009-11-19 12:00:25 -05:00
Evan Prodromou ae710f20d8 add markers for each notice and show the bounding box correctly 2009-11-19 11:51:15 -05:00
Evan Prodromou 7e8ce8fe8d Merge branch '0.9.x' into mapstraction 2009-11-19 11:30:35 -05:00
Evan Prodromou 844a28aa9d put out provider JS correctly 2009-11-19 11:21:51 -05:00
Craig Andrews c721884b52 Should be using onHandleQueuedNotice instead of onEndNoticeSave 2009-11-19 11:08:13 -05:00
Evan Prodromou ecc1bd6130 first steps towards usermaps 2009-11-19 10:51:46 -05:00
Evan Prodromou b657e49ec7 Merge branch '0.9.x' into mapstraction 2009-11-19 09:04:56 -05:00
Craig Andrews cac5a417f2 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x 2009-11-18 17:04:42 -05:00
Craig Andrews a00141a180 You cannot use static that way - using another approach to save reuse the default ldap connection 2009-11-18 16:58:06 -05:00
Craig Andrews 6d69d89cfe Reuse ldap connections for the default config 2009-11-18 16:46:16 -05:00
Craig Andrews 6a505da981 do not required that roles_to_groups be specified 2009-11-18 16:41:38 -05:00
Craig Andrews a882d093bc Blasted missing a $this! 2009-11-18 16:12:55 -05:00