Commit Graph

457 Commits

Author SHA1 Message Date
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
Craig Andrews
b417e4d24f rename isMemberOfGroup to be more consistent with other LDAP functions 2009-11-18 15:53:22 -05:00
Craig Andrews
a215ce6ed6 correct login checking logic 2009-11-18 15:53:07 -05:00
Craig Andrews
297f320e6f attributes['username'] is required 2009-11-18 15:40:27 -05:00
Craig Andrews
9ed70a5b11 Add some functions that were previously undefined 2009-11-18 14:49:42 -05:00
Craig Andrews
44c7813ac1 Add login_group configuration option so only members of a certain group can login 2009-11-18 14:35:44 -05:00
Craig Andrews
d07df8a796 Added Authorization plugin
Added LDAPAuthorization plugin
2009-11-18 14:19:43 -05:00
Sarven Capadisli
63d3e07ce4 Check for dupe from insertNoticeItem() 2009-11-18 19:15:55 +00:00
Sarven Capadisli
c1efb8aa7f Took out CSS from JS and placed it in its own file. 2009-11-18 17:59:44 +00:00
Craig Andrews
1d6bacc681 Improved parameter checking 2009-11-18 12:57:37 -05:00
Sarven Capadisli
ef542afbe5 Added counter beside the play button. When paused, it will update the
counter on new received notices. Counter is removed when play is clicked
2009-11-18 17:23:04 +00:00
Sarven Capadisli
4823463e3f Relatively positioning notice_primary 2009-11-18 16:00:40 +00:00
Sarven Capadisli
6d3d78c793 Styled realtime_actions 2009-11-18 15:57:45 +00:00
Sarven Capadisli
5014b748e4 Added play/pause button for realtime notices. While on pause, it will
store the notices and on play it will add them to the notice list
2009-11-18 15:41:07 +00:00
Evan Prodromou
fa35dab226 Merge branch '0.9.x' into mapstraction 2009-11-18 09:20:31 -05:00