Commit Graph

1321 Commits

Author SHA1 Message Date
Evan Prodromou
1b07e65277 Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-24 10:38:11 +01:00
sarven
18eb40c988 Search form markup and style 2009-01-24 00:58:12 +00:00
Zach Copley
44d1e723df trac750 fixed dumb sql query that was pulling ancient notices 2009-01-23 12:12:51 +00:00
Zach Copley
767c7d293d trac750 Better CSS file organization and linking fore the FB app 2009-01-23 10:51:49 +00:00
Evan Prodromou
447e2b8e35 Bad link for popular notices 2009-01-23 11:51:48 +01:00
Zach Copley
d06a929d70 Merge branch 'master' of /var/www/trunk 2009-01-23 09:47:09 +00:00
Zach Copley
ef3f47b8f5 trac750 Better styling for the Facebook profile box widget 2009-01-23 09:46:29 +00:00
Zach Copley
0ef33663ce Merge branch 'master' of ssh://zach@dev.controlyourself.ca/var/www/trunk 2009-01-23 01:20:00 -08:00
Zach Copley
b13374faa5 Bring the Twitter compatible API inline with new uiredesign stuff 2009-01-23 01:19:19 -08:00
sarven
927576e3f0 Using openidlogin instead of openid in order to show the current local
nav item
2009-01-23 08:58:54 +00:00
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
Robin Millette
0c7176b603 Bug fix, wrong action urls. 2009-01-22 20:48:54 +00:00
Evan Prodromou
4f58dbf557 Merge branch 'master' of /var/www/trunk 2009-01-22 20:46:55 +00:00
Evan Prodromou
1be3efd1b5 A section for showing a cloud of tags in a person's notices 2009-01-22 20:46:10 +00:00
Evan Prodromou
183ad682af A base class for tag cloud sections 2009-01-22 20:45:53 +00:00
sarven
0e69402394 Merge branch 'master' of ../trunk 2009-01-22 20:39:42 +00:00
sarven
9bab9ae078 Top posters section markup and stye 2009-01-22 20:39:13 +00:00
Robin Millette
9e9b8349a2 Merge branch 'master' of /var/www/trunk 2009-01-22 20:33:34 +00:00
Robin Millette
5a84d7f975 New search navigation widget. 2009-01-22 20:33:09 +00:00
Evan Prodromou
06cc977032 Add a section to show popular groups (by posts) 2009-01-22 20:17:05 +00:00
Evan Prodromou
82e47b2ec1 Add new section type for groups 2009-01-22 20:16:43 +00:00
Evan Prodromou
0029ebad11 Don't tryto show a section if nothing comes back from profiles 2009-01-22 19:54:35 +00:00
Evan Prodromou
7260153bd1 Add a section for popular notices sitewide 2009-01-22 19:48:17 +00:00
Evan Prodromou
ebb99f8cb1 Add a notice section superclass for sections listing notices 2009-01-22 19:42:55 +00:00
Evan Prodromou
5cc0391093 Change to only show local posters in top posting section 2009-01-22 20:22:06 +01:00
Evan Prodromou
e9b3e4e7a8 Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-22 20:10:42 +01:00
Evan Prodromou
871439ba67 A section for showing the site's top posters 2009-01-22 20:07:55 +01:00
Evan Prodromou
04b164c342 A section sub-class for profiles 2009-01-22 20:07:31 +01:00
Evan Prodromou
3cfb708dcd Fix section widget's output calls 2009-01-22 20:07:13 +01:00
Evan Prodromou
e2869fcf0a Move NoticeWrapper to a generalized ArrayWrapper class
We need to use array wrappers for other kinds of queries, so
I generalized the NoticeWrapper and tested it in the Notice class.
2009-01-22 18:48:52 +01:00
sarven
93925b8505 Mathching markup to user profilelist (entities) 2009-01-22 16:50:35 +00:00
Evan Prodromou
e6211c4c22 Add a superclass for all sections 2009-01-22 17:29:10 +01:00
Evan Prodromou
9d913150d4 use profile attr in GalleryAction 2009-01-22 17:12:03 +01:00
Evan Prodromou
b8887ef4f6 reformat profilelist code 2009-01-22 17:06:06 +01:00
Evan Prodromou
e36404dac1 Add a menu for the subscriptions group of actions 2009-01-22 16:11:44 +01:00
Evan Prodromou
a2a2dd88b5 Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-22 12:35:25 +01:00
Evan Prodromou
6a3204d08e Extract image management code to a helper function 2009-01-22 12:35:09 +01:00
Zach Copley
f89f6a8eb0 Base class for new uiredesign HTTP error classes 2009-01-22 03:33:12 -08:00
Zach Copley
8990aaebb4 New HTTP error message classes for uiredesign 2009-01-22 03:13:11 -08:00
Robin Millette
f871f52624 Merge branch 'master' of /var/www/trunk 2009-01-22 08:02:40 +00:00
Robin Millette
e272adb321 fixed a few bugs and logic problems in groups 2009-01-22 08:01:40 +00:00
Evan Prodromou
2f043b74e7 Move common_save_replies to Notice class 2009-01-22 01:53:27 -05:00
sarven
a330bdac62 Moved nudge response from util.php to nudge.php
Adjusted some CSS
2009-01-22 06:33:38 +00:00
sarven
03117fe3e8 Cleanup.. some for IE and other for cascading 2009-01-22 04:35:22 +00:00
Robin Millette
205eb386c5 Merge branch 'master' of /var/www/trunk 2009-01-22 04:22:50 +00:00
Robin Millette
7f25b9db4b phpdocs 2009-01-22 04:22:32 +00:00
Evan Prodromou
4e3891d24e Fix group fetch and regex for group link 2009-01-21 22:41:57 -05:00
Evan Prodromou
fca1ccc351 First pass at delivery of group messages
A first pass at the delivery of group messages.
2009-01-21 21:53:02 -05:00
sarven
a57f12b06c selector name cleanup 2009-01-22 00:04:13 +00:00
sarven
d72706ce9d Changed to @class entity_profile from @id user_profile. 2009-01-21 23:33:52 +00:00
sarven
4b42c35269 General markup and style cleanup 2009-01-21 22:44:27 +00:00
Evan Prodromou
74a1d8b64a minilist for groups 2009-01-21 13:32:43 -05:00
Evan Prodromou
516424cccd Change loop limit for minilist 2009-01-21 13:32:10 -05:00
Evan Prodromou
ab2dca20ff profileminilist widget 2009-01-21 13:00:12 -05:00
Evan Prodromou
785fb0a08f A widget for showing a list of groups 2009-01-21 12:19:13 -05:00
Evan Prodromou
0824bb2e1d Merge branch 'master' into groups 2009-01-21 11:52:06 -05:00
Evan Prodromou
394977b739 fix group tab in groupnav 2009-01-21 09:57:44 -05:00
Evan Prodromou
1499a5e048 Add tabset to group and admin tabs 2009-01-21 09:55:44 -05:00
Evan Prodromou
9967658f42 Add a group navigation tabset 2009-01-21 09:51:25 -05:00
Evan Prodromou
9dafcce015 add new group action 2009-01-21 09:06:18 -05:00
Evan Prodromou
7be676a338 Fix ID for leaveform 2009-01-21 09:05:49 -05:00
Evan Prodromou
534979d56a Fix ID for joinform 2009-01-21 09:05:40 -05:00
Evan Prodromou
67c886c230 Add fancy urls for new urls 2009-01-21 02:47:55 -05:00
Evan Prodromou
af554abcbc Fix redirect function 2009-01-21 02:45:08 -05:00
Evan Prodromou
26652e92f2 First pass at a group home page
This is the first pass at a group home page.
2009-01-21 02:22:10 -05:00
sarven
92e2f3babc Added @title to user_action inputs and anchor and form legends 2009-01-21 07:14:43 +00:00
sarven
f90bd303af Merge branch 'master' of ../trunk 2009-01-21 06:32:49 +00:00
sarven
6c78421298 Moved common_profile_new_message_nudge() to showstream.php 2009-01-21 06:31:53 +00:00
Zach Copley
047c87d1cc Converted DeleteAction and DeletenoticeAction to new uiredesign zeitgeist 2009-01-20 22:20:17 -08:00
Evan Prodromou
97f14ef1f9 Define URLs for groups 2009-01-21 00:38:33 -05:00
sarven
9376003871 Mailbox markup for Inbox/Outbox direct notices
Please enter the commit message for your changes.
2009-01-21 05:27:16 +00:00
sarven
88297e7b24 Direct message markup and style 2009-01-21 03:38:50 +00:00
Zach Copley
624ca93c9d Converted direct messaging actions to new uiredesign 2009-01-20 17:49:47 -08:00
sarven
f51984175a Matching markup for tags 2009-01-21 01:22:08 +00:00
sarven
96e40e0649 profilelist markup and styles 2009-01-21 01:10:11 +00:00
sarven
1ab0de3ddd If user has fn, then it will not link to their own profile with @class
'fn'. Only put @class 'fn' on the anchor if there is no fn.
2009-01-20 23:50:52 +00:00
sarven
bb4a6a514b user_actions form markup and styling 2009-01-20 22:36:57 +00:00
sarven
77790ab768 Featuerd profile list markup
Minor class change to (un)subscribeform.php
2009-01-19 21:56:55 +00:00
Evan Prodromou
0b9cda03d5 Merge branch 'master' of /var/www/trunk 2009-01-19 18:22:03 +00:00
Evan Prodromou
930f82a951 Update tag to use new framework
Broke up the tag action into two different actions (publictagcloud and
tag). Brought it up-to-date with the new framework, but haven't fixed it
for phpcs yet.
2009-01-19 18:21:14 +00:00
Evan Prodromou
ccf5f58608 Extra whitespace in profilelist 2009-01-19 18:09:34 +00:00
Evan Prodromou
b39474935a Update profile list for new framework 2009-01-19 17:48:53 +00:00
sarven
77a9b4b758 Moved minor dangling HTML. 2009-01-19 17:09:50 +00:00
sarven
042b01d169 Extracted the showLocalNav block information into its own method in
order to override it from other actions. This HTML need not be
outputted if there is no page_notice.
2009-01-19 17:04:59 +00:00
Evan Prodromou
02b49e3f87 Reformat notice list code 2009-01-19 16:35:04 +00:00
Evan Prodromou
9145794400 Update facebook stuff to use new methods
change facebook stuff to use new methods for XML and HTML.
2009-01-19 13:44:10 +00:00
Evan Prodromou
12c475c101 Merge branch 'master' of /var/www/trunk
Conflicts:

	actions/facebookhome.php
	actions/facebooksettings.php
2009-01-19 13:35:17 +00:00
Evan Prodromou
582e2eefa3 Slightly better hover notices for global nav (glad it's there!) 2009-01-19 13:24:50 +00:00
Evan Prodromou
dc97382068 Fix public group nav so it shows selection correctly 2009-01-19 13:19:28 +00:00
Evan Prodromou
264ab53953 Merge branch 'uiredesign' of /var/www/trunk into uiredesign 2009-01-19 12:28:45 +00:00
Zach Copley
739baf0396 trac750 Add notice input box to FB app and ability to post notices 2009-01-19 07:24:12 +00:00
sarven
0b5f0f4faa Renamed form_datas to form_data 2009-01-19 03:09:13 +00:00
Zach Copley
cd6b9d6c46 trac750 fix method calls to get CSS files 2009-01-19 02:13:25 +00:00
Zach Copley
5f2fce04cb trac750 Updated paths for new css files; deleted old unused css file 2009-01-19 01:59:31 +00:00
Zach Copley
64bda5bd6c trac750 New CSS files for FB app to allow bettter per-install theming 2009-01-19 01:34:25 +00:00
Zach Copley
12f7ec980c trac750 Better workflow for asking user for status update permission 2009-01-19 00:50:45 +00:00
sarven
8f9762aab1 Cross-browser stuff 2009-01-19 00:48:12 +00:00
sarven
910bd33243 Minimal cross browser styling (mostly IE7). w00t! 2009-01-19 00:10:42 +00:00
sarven
9d384aadb1 @id for site_nav_global_primary items in order to target for styling 2009-01-18 22:08:51 +00:00
sarven
6b23a9ed2f Disfavor markup/style 2009-01-18 21:34:57 +00:00
sarven
5426c4ec6a Using config site name for creative commons bit. Fix i18n. 2009-01-18 19:58:28 +00:00