Brion Vibber
|
2196d00b1b
|
Merge branch '0.9.x' into 1.0.x
Conflicts:
lib/command.php
|
2010-09-02 15:04:25 -07:00 |
|
Brion Vibber
|
e365e709c5
|
Merge branch 'master' into testing
|
2010-09-02 14:58:11 -07:00 |
|
Evan Prodromou
|
925381707b
|
show notice title on shownotice page
|
2010-09-02 17:16:10 -04:00 |
|
Brion Vibber
|
c24458a9f0
|
Ticket #2638: allow themes to specify a base theme to load with 'include' setting in a theme.ini file
|
2010-09-02 14:11:52 -07:00 |
|
Evan Prodromou
|
82b1d6daef
|
Merge branch 'swat0' into 0.9.x
|
2010-09-02 16:58:55 -04:00 |
|
Evan Prodromou
|
7517409bf1
|
Merge branch 'testing' into 0.9.x
|
2010-09-02 16:56:52 -04:00 |
|
Brion Vibber
|
4cbbfdab84
|
Fix for #2635: use ssl-sometimes settings for Twitter settings & auth pages
|
2010-09-02 10:55:26 -07:00 |
|
Evan Prodromou
|
ebcd8644a5
|
Revert "debugging replyToID"
This reverts commit bb9353f6e0.
|
2010-09-01 18:22:54 -04:00 |
|
Evan Prodromou
|
bb9353f6e0
|
debugging replyToID
|
2010-09-01 17:59:49 -04:00 |
|
Evan Prodromou
|
27626c3abf
|
Correctly check for user's id in replies in user salmon post
|
2010-09-01 17:10:29 -04:00 |
|
Evan Prodromou
|
ab88123373
|
correctly return oprofile from Ostatus_profile::ensureProfileURI()
|
2010-09-01 17:05:11 -04:00 |
|
Evan Prodromou
|
2d4e0693c8
|
save URIs of remote profiles marked for attention
|
2010-09-01 16:17:18 -04:00 |
|
Evan Prodromou
|
3baff9aa98
|
Handle profile-from-uri hook to return ostatus profile if there's a match
|
2010-09-01 16:16:38 -04:00 |
|
Evan Prodromou
|
c82b1cda82
|
send a salmon slap to mentioned person when we reply to a notice
|
2010-09-01 14:35:43 -04:00 |
|
Evan Prodromou
|
468a15db00
|
Merge branch 'master' into 0.9.x
|
2010-09-01 14:21:36 -04:00 |
|
Evan Prodromou
|
8ebb858964
|
remove noop function from OStatusPlugin
|
2010-09-01 14:21:24 -04:00 |
|
Craig Andrews
|
6df8230488
|
Leave session handling to StatusNet - disable phpCAS's handling.
|
2010-08-30 17:08:12 -04:00 |
|
Craig Andrews
|
6b4607f073
|
Upgrade from CAS 1.1.0RC6 to 1.1.2
|
2010-08-30 16:53:32 -04:00 |
|
Evan Prodromou
|
a507f04bc4
|
fix incorrect function name in updateostatus.php script
|
2010-08-25 12:32:10 -04:00 |
|
Craig Andrews
|
7cd0706aef
|
Merge remote branch 'chat-interface-plugins/irc-plugin' into 1.0.x
|
2010-08-18 14:13:15 -04:00 |
|
Craig Andrews
|
6c02c665f2
|
Use hash if available
|
2010-08-18 14:07:40 -04:00 |
|
Craig Andrews
|
05712ae62b
|
reconnect failed doesn't include a parameter in its invocation
|
2010-08-18 13:37:38 -04:00 |
|
Craig Andrews
|
b699364982
|
Merge remote branch 'chat-interface-plugins/msn-plugin' into 1.0.x
|
2010-08-18 13:34:39 -04:00 |
|
Craig Andrews
|
f5e4fc12e0
|
include mhash from php compat
|
2010-08-18 13:34:32 -04:00 |
|
Craig Andrews
|
ab89df0094
|
Use mhash from Compat if mhash isn't available
|
2010-08-18 13:33:52 -04:00 |
|
Luke Fitzgerald
|
79a81e5d54
|
Removed old code accidently left in ($data)
|
2010-08-18 10:27:03 -07:00 |
|
Craig Andrews
|
bbcc76e7e7
|
Remove .svn subversion control files
|
2010-08-18 12:42:32 -04:00 |
|
Craig Andrews
|
11661e62df
|
Merge remote branch 'chat-interface-plugins/msn-plugin' into 1.0.x
|
2010-08-18 12:41:50 -04:00 |
|
Brion Vibber
|
0cfaae48a3
|
Merge branch '0.9.x' into 1.0.x
|
2010-08-16 16:56:27 -07:00 |
|
Brion Vibber
|
b77c029aa8
|
Merge branch 'testing'
Conflicts:
plugins/OStatus/classes/Ostatus_profile.php
|
2010-08-16 10:06:52 -07:00 |
|
Evan Prodromou
|
5110275a38
|
fix use of activity rather than act in salmonaction subclasses, too
|
2010-08-16 10:03:44 -07:00 |
|
Evan Prodromou
|
54b93aede6
|
typo mixing up and in salmonaction
|
2010-08-16 10:03:38 -07:00 |
|
Evan Prodromou
|
c1cab9bfb8
|
Notice title constructor doesn't check class of Notice
|
2010-08-14 18:02:08 -07:00 |
|
Evan Prodromou
|
7df78c7c6a
|
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
|
2010-08-14 12:08:15 -07:00 |
|
Evan Prodromou
|
21bf50bad6
|
Merge branch 'noticetitle' into 0.9.x
|
2010-08-14 12:03:25 -07:00 |
|
Evan Prodromou
|
401cf36de3
|
handle deletion of notice
|
2010-08-14 11:58:54 -07:00 |
|
Evan Prodromou
|
9e4f40806a
|
Merge branch 'master' into noticetitle
|
2010-08-14 11:46:12 -07:00 |
|
Zach Copley
|
fa4b360ba0
|
- Remove extraneous style stuff from Echo plugin - that stuff should
be handled via CSS in the theme.
- Updated installation instructions on Echo and Disqus plugins
|
2010-08-14 00:07:12 +00:00 |
|
Zach Copley
|
20d0723dec
|
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
|
2010-08-13 23:53:44 +00:00 |
|
Zach Copley
|
614b12ea51
|
A plugin to add Disqus commenting to notice pages
|
2010-08-13 23:53:05 +00:00 |
|
Evan Prodromou
|
341b935acc
|
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
|
2010-08-13 14:52:16 -07:00 |
|
Evan Prodromou
|
1dadb8efc0
|
Merge branch '0.9.x' into 1.0.x
|
2010-08-13 14:51:51 -07:00 |
|
Evan Prodromou
|
926c77246b
|
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
plugins/OStatus/classes/Ostatus_profile.php
|
2010-08-13 14:35:49 -07:00 |
|
Evan Prodromou
|
7183175429
|
Merge branch 'master' into 1.0.x
|
2010-08-13 14:33:41 -07:00 |
|
Evan Prodromou
|
029aa0c61c
|
fix use of activity rather than act in salmonaction subclasses, too
|
2010-08-13 14:18:54 -07:00 |
|
Zach Copley
|
61ab21b711
|
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
|
2010-08-13 20:53:19 +00:00 |
|
Zach Copley
|
028f9a7b1d
|
A plugin for adding the Echo (formerly JS-Kit) commenting widget to
notice pages
|
2010-08-13 20:52:05 +00:00 |
|
Evan Prodromou
|
8dec16aeeb
|
add hooks to allow plugins to handle different kinds of activities
|
2010-08-13 13:14:47 -07:00 |
|
Evan Prodromou
|
4217277d14
|
typo mixing up and in salmonaction
|
2010-08-13 13:07:25 -07:00 |
|
Brion Vibber
|
16f75b95c6
|
Fixes for RSS subscriptions: accept posts with no ActivityStreams object-type set; be more liberal about accepting posts from feeds where the author info doesn't match (we'll post under the feed's profile and just not try to update the profile info).
|
2010-08-13 12:23:42 -07:00 |
|