Evan Prodromou
|
4e5be119d3
|
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
|
2009-01-23 09:17:51 +01:00 |
|
Zach Copley
|
85321cede0
|
Fix for Twitter bridge bug introduced by uiredesign merge
|
2009-01-23 00:11:05 -08:00 |
|
Evan Prodromou
|
e7d5310a2f
|
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
|
2009-01-23 09:01:06 +01:00 |
|
Evan Prodromou
|
a7c85bebd5
|
Merge branch 'master' of /var/www/mublog
Conflicts:
actions/api.php
actions/deletenotice.php
actions/recoverpassword.php
actions/remotesubscribe.php
actions/tag.php
actions/tagrss.php
actions/twitapiaccount.php
actions/twitapiusers.php
classes/Notice.php
classes/User.php
lib/common.php
lib/language.php
lib/subs.php
lib/twitterapi.php
lib/util.php
scripts/inbox_users.php
scripts/update_translations.php
Merged development trunk into laconica head. woohoo!
|
2009-01-23 08:58:31 +01:00 |
|
Robin Millette
|
aa100884fb
|
Merge branch 'master' of /var/www/trunk
|
2009-01-23 07:51:02 +00:00 |
|
Robin Millette
|
965d4db265
|
Group search
|
2009-01-23 07:50:55 +00:00 |
|
Evan Prodromou
|
7aa496cd8a
|
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
|
2009-01-23 08:23:40 +01:00 |
|
Zach Copley
|
8114676bd4
|
trac750 Let's try that again - fix for base css href
|
2009-01-23 07:22:01 +00:00 |
|
Evan Prodromou
|
aadf10cedb
|
Update version number
|
2009-01-23 08:15:40 +01:00 |
|
Evan Prodromou
|
50ec1cc26e
|
Upload logos for groups
|
2009-01-23 08:15:29 +01:00 |
|
sarven
|
538518ead6
|
Not using thickbox... yet
|
2009-01-23 06:18:00 +00:00 |
|
Robin Millette
|
171d89aab7
|
Merge branch 'master' of /var/www/trunk
|
2009-01-23 05:57:15 +00:00 |
|
Robin Millette
|
fbd1cf4dfa
|
use new error actions classes to display error
|
2009-01-23 05:57:08 +00:00 |
|
Evan Prodromou
|
277a6e984c
|
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
|
2009-01-23 06:47:43 +01:00 |
|
Zach Copley
|
df25b5f5f5
|
Merge branch 'master' of /var/www/trunk
|
2009-01-23 05:37:45 +00:00 |
|
Zach Copley
|
240231a8bd
|
trac750 linked in stylesheets for login and permissions prompt screens
|
2009-01-23 05:37:21 +00:00 |
|
Evan Prodromou
|
9dc5d8d0f6
|
Made avatar upload a two-stage process; first upload, then crop
|
2009-01-23 06:16:55 +01:00 |
|
Evan Prodromou
|
a7b80ef230
|
Better math for seciton
|
2009-01-23 06:11:05 +01:00 |
|
Evan Prodromou
|
a130bb9d6d
|
A section
|
2009-01-23 06:10:25 +01:00 |
|
Robin Millette
|
597245ffc3
|
make avatar bigger on single notice pages
|
2009-01-23 04:52:39 +00:00 |
|
Zach Copley
|
8dad87ea95
|
trac750 FB script to update statuses working again with new uiredesign stuff
|
2009-01-23 04:23:44 +00:00 |
|
Robin Millette
|
45f5094b46
|
uiredesign
|
2009-01-23 03:31:38 +00:00 |
|
Zach Copley
|
adf77944e8
|
trac750 Facebook app proper integrated into new uiredesign
|
2009-01-23 03:16:03 +00:00 |
|
Evan Prodromou
|
21d156c05b
|
Keep checking who's received stuff in jabber broadcast
|
2009-01-23 03:58:18 +01:00 |
|
Evan Prodromou
|
eb156741f8
|
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
|
2009-01-23 03:49:56 +01:00 |
|
sarven
|
8ba19b0686
|
Merge branch 'master' of ../trunk
|
2009-01-23 02:43:55 +00:00 |
|
sarven
|
0daf242100
|
Using util.js to set onclick reply anchor
|
2009-01-23 02:43:18 +00:00 |
|
Evan Prodromou
|
4bd3eae79d
|
Make sure group messages go out over Jabber
|
2009-01-23 03:29:26 +01:00 |
|
Evan Prodromou
|
ba3b82c563
|
Runaway comment in rssaction
|
2009-01-23 03:10:26 +01:00 |
|
Evan Prodromou
|
ae0f2009d5
|
Groups list by members
|
2009-01-23 03:07:03 +01:00 |
|
Evan Prodromou
|
8942e3a445
|
Add an action to show the list of the latest groups
|
2009-01-23 03:00:51 +01:00 |
|
Evan Prodromou
|
cafc51db09
|
Make search actions retain their q values.
|
2009-01-23 03:00:06 +01:00 |
|
Evan Prodromou
|
df54373411
|
Fix call to joinform in grouplist
|
2009-01-23 02:58:48 +01:00 |
|
Evan Prodromou
|
0e1ea38319
|
Whitespace changes in form.php
|
2009-01-23 02:58:18 +01:00 |
|
Evan Prodromou
|
f54f0a179a
|
Help OpenID module make its little form
|
2009-01-23 02:17:29 +01:00 |
|
Robin Millette
|
8a65c5175c
|
Merge branch 'master' of /var/www/trunk
|
2009-01-23 01:01:01 +00:00 |
|
Robin Millette
|
4a4efc3b0a
|
uiredesign
|
2009-01-23 01:00:57 +00:00 |
|
sarven
|
2935e8c7ce
|
Minor markup fix
|
2009-01-23 00:20:05 +00:00 |
|
Evan Prodromou
|
d6879bfe0c
|
Debug some of the subscriptions+tags problems
|
2009-01-22 22:38:10 +00:00 |
|
Evan Prodromou
|
baaf55e9d6
|
Merge branch 'master' of /var/www/trunk
|
2009-01-22 21:49:31 +00:00 |
|
sarven
|
251551fee6
|
Group top post section and styles
|
2009-01-22 21:47:33 +00:00 |
|
Evan Prodromou
|
cb3d94ea93
|
Add a featured user section
|
2009-01-22 21:42:18 +00:00 |
|
Evan Prodromou
|
56b6164fa4
|
Move table-based profile section layout from topposter to base class
|
2009-01-22 21:41:52 +00:00 |
|
Evan Prodromou
|
6472630f92
|
Merge branch 'master' of /var/www/trunk
|
2009-01-22 21:15:35 +00:00 |
|
Evan Prodromou
|
8112c04c3d
|
Show (None) on no tag cloud results
|
2009-01-22 21:14:24 +00:00 |
|
Evan Prodromou
|
7cd275b982
|
A tag cloud section for groups
|
2009-01-22 21:14:01 +00:00 |
|
sarven
|
f6f71ea0ee
|
Minor
|
2009-01-22 21:07:11 +00:00 |
|
sarven
|
0790402414
|
Merge branch 'master' of ../trunk
|
2009-01-22 21:04:21 +00:00 |
|
sarven
|
785ffd5b9b
|
Populat notices and some css cleanup
|
2009-01-22 21:03:59 +00:00 |
|
Robin Millette
|
e33d80fe9d
|
Merge branch 'master' of /var/www/trunk
|
2009-01-22 20:49:45 +00:00 |
|