Zach Copley
937a05fb5d
Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x
2009-08-26 14:35:25 +00:00
Evan Prodromou
434abed511
add back in /etc/laconica/* for compatibility
2009-08-26 10:34:50 -04:00
Zach Copley
cbdf8e51aa
Facebook app wasn't loading the theme css
2009-08-26 14:34:41 +00:00
Evan Prodromou
379c80e26e
add *Laconica* events back in for backwards compatibility
2009-08-26 10:33:04 -04:00
Evan Prodromou
be5d113fc6
Merge branch 'master' into testing
2009-08-26 10:28:10 -04:00
Evan Prodromou
c5cf2c4c94
Merge branch '0.8.x' into testing
2009-08-26 10:27:53 -04:00
Evan Prodromou
6dc89e766f
more logging in xmppqueuehandler
2009-08-26 05:50:48 -04:00
Evan Prodromou
be51d5e23a
more log output in queue handlers
2009-08-26 05:50:34 -04:00
Evan Prodromou
fd53fba114
more logging in xmppqueuehandler
2009-08-26 05:50:20 -04:00
Evan Prodromou
e1b5ca85f9
more log output in queue handlers
2009-08-26 05:46:41 -04:00
Evan Prodromou
e3a53251c0
last scrub of Laconica -> StatusNet
2009-08-26 03:33:43 -04:00
Evan Prodromou
ff01140d71
accidentally changed the URL for Laconica Tools
2009-08-26 03:13:09 -04:00
Zach Copley
2f1e719cbe
Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x
...
* '0.8.x' of git@gitorious.org:laconica/mainline:
Updated rgb2hex() to handle IE. It turns out that jQuery is giving hex
2009-08-25 20:46:14 -07:00
Zach Copley
0e3598cea9
Small update to the Facebook app section
2009-08-25 20:45:09 -07:00
Evan Prodromou
3567b9d708
global search and replace for laconica -> statusnet
2009-08-25 18:53:24 -04:00
Sarven Capadisli
70ef9d89fa
Updated rgb2hex() to handle IE. It turns out that jQuery is giving hex
...
to IE and RGB to Firefox, Opera, Safari. Fun.
2009-08-25 22:47:54 +00:00
Evan Prodromou
99e3b1723b
update names in shell scripts
2009-08-25 18:43:48 -04:00
Evan Prodromou
865b716f09
change LACONICA to STATUSNET
2009-08-25 18:42:34 -04:00
Evan Prodromou
1ee7d0ab55
update Laconica to StatusNet in js code
2009-08-25 18:40:12 -04:00
Evan Prodromou
9d98768e83
change Laconica and laconi.ca in locale files
2009-08-25 18:37:41 -04:00
Evan Prodromou
5fb94f874d
Laconica -> StatusNet in EVENTS.txt
2009-08-25 18:30:48 -04:00
Evan Prodromou
bfc66cfe19
Laconica in plugins
2009-08-25 18:29:56 -04:00
Evan Prodromou
2506207454
update README file
2009-08-25 18:25:01 -04:00
Evan Prodromou
020ee72943
update doc-src with StatusNet, status.net
2009-08-25 18:23:26 -04:00
Evan Prodromou
1f6ea95c92
convert CSS files to use new names
2009-08-25 18:21:37 -04:00
Evan Prodromou
ae883ceb9b
change controlyourself.ca to status.net
2009-08-25 18:19:04 -04:00
Evan Prodromou
d35b2d3f3c
change laconi.ca to status.net
2009-08-25 18:16:46 -04:00
Evan Prodromou
4737563b95
a distributed -> the distributed
2009-08-25 18:14:12 -04:00
Evan Prodromou
c8b8f07af1
change Laconica and Control Yourself to StatusNet in PHP files
2009-08-25 18:12:20 -04:00
Brenda Wallace
6c3149334c
Merge commit 'mainline-write/0.8.x' into 0.8.x
2009-08-26 10:02:07 +12:00
Evan Prodromou
d0baab6978
Merge branch '0.8.x' into testing
2009-08-25 18:01:46 -04:00
Brenda Wallace
3400f6f431
renamed to plural, for consitency
2009-08-26 10:00:29 +12:00
Evan Prodromou
077955cb1d
merge problem with scripts/twitterstatusfetcher
2009-08-25 17:58:44 -04:00
Evan Prodromou
c87e1de017
Rename Laconica to StatusNet
2009-08-25 17:56:10 -04:00
Craig Andrews
a2117961be
Allow ({['" to preceded #tags
2009-08-25 17:54:08 -04:00
Sarven Capadisli
ada615d3ca
Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x
2009-08-25 21:50:38 +00:00
Sarven Capadisli
fc89c345ed
userdesign.go.js was incorrectly removed in commit
...
304db1d30b
2009-08-25 21:48:55 +00:00
Craig Andrews
31329c33ae
Handle grouping symbols ()[]{} correctly. Now passing all tests!
2009-08-25 16:41:44 -04:00
Craig Andrews
8cd474e985
Correct the hash tag test
2009-08-25 16:06:04 -04:00
Zach Copley
ec83890bc2
Take token field out of foreign_link
...
This undoes patch a49272d448
2009-08-25 15:48:06 -04:00
Craig Andrews
ff836eb38a
Add UTF-8 encodings of the IDN TLDs
2009-08-25 14:19:05 -04:00
Craig Andrews
210bc4248b
All tests pass except for those that require matching parens or brackets
2009-08-25 14:12:31 -04:00
Craig Andrews
6a3a25b5a2
Improved the URL tests, and improve the matcher so more tests are passed. The remaining failing tests I believe are incorrect.
2009-08-25 11:21:45 -04:00
Brenda Wallace
9ec3911020
Merge commit 'mainline/0.8.x' into 0.8.x
2009-08-25 19:01:29 +12:00
Brenda Wallace
3ff67b3bc1
beginning of hashtag tests
2009-08-25 18:44:32 +12:00
Craig Andrews
9fd3a41576
ftps protocol should be handled the same way as ftp
...
Canon urls that have a protocol followed by a host (and no path) automatcally get a trailing slash by the canon function - make the unit test match that
2009-08-24 20:44:06 -04:00
Evan Prodromou
ab2f6fb860
Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x
2009-08-24 17:49:31 -04:00
Evan Prodromou
add42759c9
change class to rel in unit tests for URL check
2009-08-24 17:48:24 -04:00
Evan Prodromou
ce442c049b
remove some merge cruft from the end of twitter.php
2009-08-24 17:44:19 -04:00
Brenda Wallace
eceffc4c01
ignore the local folder
2009-08-25 09:23:09 +12:00
