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
|
a68c10280f
|
Merge branch 'master' into 0.9.x
|
2010-08-16 16:56:15 -07:00 |
|
Brion Vibber
|
466e3f7f70
|
Link fixes for footer in fr, pt-br (also saved changed at TranslateWiki.net)
|
2010-08-16 12:03:30 -07:00 |
|
Brion Vibber
|
b2a5e0d09b
|
StatusNet 0.9.4 "Orange Crush"
|
2010-08-16 10:09:33 -07:00 |
|
Brion Vibber
|
b77c029aa8
|
Merge branch 'testing'
Conflicts:
plugins/OStatus/classes/Ostatus_profile.php
|
2010-08-16 10:06:52 -07:00 |
|
Brenda Wallace
|
7f9ab683b2
|
fixed a %d that should be a %s in an error message
|
2010-08-16 10:03:58 -07:00 |
|
Brenda Wallace
|
fa77814887
|
removed the notice.location column from postgres def -- snuck in on a git commit by Patrick G
|
2010-08-16 10:03:53 -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 |
|
Brenda Wallace
|
a50feb3d47
|
Merge remote branch 'shiny/0.9.x' into 0.9.x
|
2010-08-16 14:51:31 +12:00 |
|
Brenda Wallace
|
640e7e7c43
|
Merge commit 'origin/0.9.x' into 0.9.x
|
2010-08-16 02:52:23 +00:00 |
|
Brenda Wallace
|
9c97e33d35
|
removed the notice.location column from postgres def -- snuck in on a git commit by Patrick G
|
2010-08-16 14:47:18 +12:00 |
|
Brenda Wallace
|
e687862ca1
|
fixed a %d that should be a %s in an error message
|
2010-08-16 13:26:27 +12: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
|
6d89aa0931
|
on deleting a notice
|
2010-08-14 11:54:20 -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 |
|
Siebrand Mazeland
|
f60ee85f68
|
Update extension configuration file creation (doesn't work yet in translatewiki.net).
|
2010-08-13 22:21:33 +02: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 |
|
Brion Vibber
|
60c36c1868
|
SubMirror: check feel-url discovery if profile-url discovery failed; should help when giving direct feeds to subscribe to
|
2010-08-13 12:23:32 -07:00 |
|
Brion Vibber
|
f7b2bb09e6
|
Suppress whinging during HTML parsing in profile page discovery for things that turn out to be XML feeds with funny namespaces.
|
2010-08-13 12:23:28 -07:00 |
|
Evan Prodromou
|
9b7536351b
|
hide the Whats Up Nickname if notice title enabled
|
2010-08-13 12:22:58 -07:00 |
|
Evan Prodromou
|
e6da476c16
|
make notice title phpcs-clean
|
2010-08-13 12:04:30 -07:00 |
|
Evan Prodromou
|
eff0b8e1aa
|
make notice title phpcs-clean
|
2010-08-13 12:01:29 -07:00 |
|
Evan Prodromou
|
96705b4ec5
|
set notice titles in RSS and Atom output
|
2010-08-13 11:50:33 -07:00 |
|
Evan Prodromou
|
ed8d8eb5ee
|
hooks to allow changing RSS content
|
2010-08-13 11:44:26 -07:00 |
|
Brion Vibber
|
185f18024a
|
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 11:41:44 -07:00 |
|