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
Siebrand Mazeland
7ad43e19d9
Localisation updates from http://translatewiki.net
...
* removed messages marked fuzzy from translations.
2010-08-28 17:34:02 +02:00
Siebrand Mazeland
f64fff379c
* when using multiple parameters, number them
...
* fix double space to single space
* use consistent punctuation in messages
* complete translation hints for all commands
* add an i18n fixme for missing plural support
* trailing whitespace removed
2010-08-28 16:51:49 +02:00
Siebrand Mazeland
2eb894e535
Document UI text and number parameters.
2010-08-28 16:28:23 +02:00
Siebrand Mazeland
59eea85da5
Localisation updates from http://translatewiki.net
2010-08-28 15:11:23 +02:00
Brion Vibber
8f06e3b281
Fix for failover error in status_network_tag caching; when no tags present in table we would return an array with one empty element instead of no elements when getting the cached data.
2010-08-26 13:52:03 -07:00
Siebrand Mazeland
36c2ee1b4f
Localisation updates from http://translatewiki.net
2010-08-25 23:50:29 +02:00
Brion Vibber
63fd2332f0
Use Status_network's caching settings when loading Status_network_tag entries; cache entries are batched per site and will be cleared when tags are inserted/deleted using the main interface.
...
(with fixes from tagcache branch)
2010-08-25 12:22:42 -07:00
Evan Prodromou
a507f04bc4
fix incorrect function name in updateostatus.php script
2010-08-25 12:32:10 -04:00
Siebrand Mazeland
2e1f2a0481
Localisation updates from http://translatewiki.net
2010-08-24 08:21:13 +02: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
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
