de4ed67b7a
Merge branch '0.7.x' of git://gitorious.org/laconica/sgmurphy-clone into sgmurphy-clone/0.7.x
2009-02-06 01:05:30 -05:00
ab82978b2d
Trac #894 and #1013 - fixed bad redirects after delete notice
2009-02-05 16:16:10 -08:00
e08b7f7205
Fix for unicode string auto-linking bug
2009-02-05 17:29:58 -05:00
8775e79e35
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-02-05 16:35:19 -05:00
99d520b351
Two different functions for file size
...
Made two different functions for file size in ImageFile; one uses the
other.
Also, use sprintf() for gettext msgs.
2009-02-05 16:32:58 -05:00
383e6c730d
Merge branch '0.7.x' of git://gitorious.org/laconica/sgmurphy-clone into sgmurphy-clone/0.7.x
2009-02-05 16:02:19 -05:00
d4bdb2dc19
Better fix for displaying max file size.
2009-02-05 15:01:44 -05:00
746a5d7507
Fixed #905 : Presenting image size limit to user.
2009-02-05 14:11:50 -05:00
9febe8ce39
trac #1142 fix tag rss
2009-02-05 18:10:47 +00:00
7ea136ee1b
Merge branch '0.7.x' of git://gitorious.org/laconica/sgmurphy-clone into sgmurphy-clone/0.7.x
...
Conflicts:
actions/avatarsettings.php
2009-02-05 12:04:06 -05:00
43feee783b
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-02-05 11:47:47 -05:00
7ad3ff4a2c
Allow re-authentication with OpenID
...
"Rememberme" logins aren't allowed to make changes to an account
(since cookie-stealing is too easy). Users have to re-authenticate.
Previously, it was impossible to do so without having a username and
password; this change lets you do it with OpenID, too.
2009-02-05 11:46:17 -05:00
7bc764fdc0
Facebook profile box CSS and a link back to the app page.
2009-02-05 07:07:36 +00:00
e5b075b912
Matching Facebook app UI to identi.ca. Fixed tabs, add to profile,
...
widths, font-size, and some HTML markup.
2009-02-05 04:54:42 +00:00
4090471ebe
Forgot to replace URL shortening regex with new function.
2009-02-04 23:18:45 -05:00
8053adc60e
Fixed #779 & #588 ; Better URL auto-linking.
2009-02-04 23:11:40 -05:00
0f12d6135e
Fixed #732 ; Hashtags inside parens and brackets.
2009-02-04 20:02:50 -05:00
7e975b17c5
Fixed #1134 ; Consolidated image scaling functions.
2009-02-04 19:32:15 -05:00
68152dcf3a
Facebook app - reorganized some stuff; better HTML output
2009-02-04 22:54:07 +00:00
b8e10428d3
Changed error and facebookaction wrap selector from @class to @id.
2009-02-04 17:03:59 +00:00
e8d3615b3f
Allow HTML in site notice (Bug#1002)
2009-02-04 08:49:42 -05:00
92c6034b25
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-02-04 07:26:14 -05:00
355d438cee
Merge branch '0.7.x' of git://gitorious.org/laconica/meitar into meitar/0.7.x
2009-02-04 07:25:36 -05:00
19724a51b3
trac533 Removed redundant calls to htmlspecialcharacters().
...
XMLWriter::writeAttribute() already takes care of the escaping for
us, although that doesn't seem to be well documented.
2009-02-03 21:22:41 -08:00
0356953cf8
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk into 0.7.x
2009-02-03 15:12:55 -05:00
3b6d2653fb
Fixes ticket:1087; correctly paginate group members list in fancy URLs.
2009-02-04 04:02:30 +11:00
ab16bb876b
Merge branch 'master' of git@gitorious.org:laconica/dev into 0.7.x
2009-02-02 16:46:51 -05:00
daa5797809
Merge branch 'master' of git://gitorious.org/laconica/adrianlang-clone into adrianlang/master
2009-02-02 16:42:27 -05:00
b6f0f72a09
trac #569 and trac #711 add missing utf-8 headers and removed extraneous argument in startHTML calls
2009-02-02 21:08:33 +00:00
f9edd1101b
trac #1099 : main menu should not lead to IM settings when IM is disabled
2009-02-02 20:20:21 +00:00
99fba4932d
Ticket 1044 -- Removed border-top, reduced padding, changed notice
...
count from 6 to 5, removed nickname.
2009-02-02 17:02:58 +00:00
d3b30164be
added primary menu to error pages
2009-02-02 14:51:23 +00:00
4f1345620a
Better cross-browser support for page and text zoom-in/out.
2009-02-02 14:14:14 +00:00
a381bff4da
Link rtsp, mms & tel URI schemes, correct pseudo-protocol ones.
...
This patch builds on the work of user `candrews` at http://laconi.ca/trac/ticket/529#comment:2
2009-02-02 19:59:48 +11:00
18593afee7
If user is not logged in, then notice-options container shouldn't be
...
outputted.
2009-02-01 23:37:54 +00:00
2f37539967
Fixes #1088 : Show number of group members. Unlike the bugreport requested, the stats are displayed similar to userstream stats in a section in the sidebar. Additionaly, I removed a redundant notnull if check in ShowgroupAction->showMembers, fixed a SQL error in User_group->getMembers when no limit is passed, removed return value storing of void function and added an usage of Profile->getBestName.
2009-02-01 22:24:54 +01:00
d309fd27c5
Rearraned stylesheet order for IE and fixed path to files for base IE stylesheets
2009-02-01 20:05:13 +00:00
87b99540ef
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk into cyi/master
2009-02-01 14:33:18 -05:00
add0b7f329
Resaved identica logo as transparent PNG24 in order to handle various
...
background colours without having to explicitly apply anti-aliasing.
Updated colour information in identica theme.
Removed ie7 base stylesheet that's no longer required.
Added ie identica stylesheet to handle solid background colour for
2009-02-01 18:04:56 +00:00
74bf2bf672
Enable configuration files in /etc/laconica/
...
Enable storing config files in /etc/laconica/, which makes it much
easier to have a single installation with multiple mublogs supported.
2009-01-31 09:38:39 -05:00
53274a6d93
PostgreSQL - code changes to avoid problems where user table is referenced in ad-hoc queries
2009-01-30 01:12:58 +00:00
c7d06519f0
trac750 update Facebook status when posting to Identi.ca from Facebook
2009-01-29 05:58:27 +00:00
04b3add162
only send group notices through Jabber to users with notices enabled
2009-01-28 23:03:03 -05:00
62fd9369ec
fix email notification link
2009-01-28 09:22:54 -05:00
d86622da33
don't show reply for anon user
2009-01-28 09:17:12 -05:00
f761031d0a
Merge branch 'master' of root@laconi.ca:/var/www/laconi.ca/software/laconica
2009-01-28 08:24:29 -05:00
c4097750ad
Revert "Fixup already-subscribed string"
...
This reverts commit 6055516aaf
2009-01-27 20:34:57 -05:00
f9403ae99a
Keeping HTML consistent throughout the site.
2009-01-27 06:21:36 +00:00
1c60afb940
trac750 140 character countdown for FB app
2009-01-27 01:55:36 +00:00
26f9bf540e
Fixed bad query causing facebook_update to fail
2009-01-26 12:22:52 -08:00
69e7811d01
Add some more useless HTML
2009-01-26 17:30:32 +01:00
91e63866fb
move block form
2009-01-26 17:14:08 +01:00
44162e07c3
Fix scrolling for groups
2009-01-26 16:16:51 +01:00
f3db32d151
Fix direct addressing of messages
2009-01-26 15:45:54 +01:00
6055516aaf
Fixup already-subscribed string
2009-01-26 14:21:01 +01:00
5b211271f9
Fix pagination on user groups page
2009-01-26 14:19:49 +01:00
0e9cdf5859
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
2009-01-26 14:14:49 +01:00
55a4fac6a6
trac750 Better permissions workflow and styling hooks
2009-01-26 06:31:25 +00:00
f06d5eff10
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
2009-01-25 18:07:55 +01:00
e2a965c999
Rss10Action::showImage() was trying to call pre-uiredesign XML output functions
2009-01-24 22:08:27 -08:00
0d34cd24ab
Update notice deletion
...
Changed the errors in notice deletion so it now works. Also,
consistently delete records from related tables that refer
to the notice.
2009-01-24 19:38:40 +01:00
db4271692a
wrong action for groups
2009-01-24 11:26:28 +01:00
4e44b0b8d7
Fix the group url ( Closes #971 )
2009-01-24 11:24:37 +01:00
1b07e65277
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
2009-01-24 10:38:11 +01:00
18eb40c988
Search form markup and style
2009-01-24 00:58:12 +00:00
44d1e723df
trac750 fixed dumb sql query that was pulling ancient notices
2009-01-23 12:12:51 +00:00
767c7d293d
trac750 Better CSS file organization and linking fore the FB app
2009-01-23 10:51:49 +00:00
447e2b8e35
Bad link for popular notices
2009-01-23 11:51:48 +01:00
d06a929d70
Merge branch 'master' of /var/www/trunk
2009-01-23 09:47:09 +00:00
ef3f47b8f5
trac750 Better styling for the Facebook profile box widget
2009-01-23 09:46:29 +00:00
0ef33663ce
Merge branch 'master' of ssh://zach@dev.controlyourself.ca/var/www/trunk
2009-01-23 01:20:00 -08:00
b13374faa5
Bring the Twitter compatible API inline with new uiredesign stuff
2009-01-23 01:19:19 -08:00
927576e3f0
Using openidlogin instead of openid in order to show the current local
...
nav item
2009-01-23 08:58:54 +00:00
4e5be119d3
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
2009-01-23 09:17:51 +01:00
85321cede0
Fix for Twitter bridge bug introduced by uiredesign merge
2009-01-23 00:11:05 -08:00
e7d5310a2f
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
2009-01-23 09:01:06 +01:00
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
aa100884fb
Merge branch 'master' of /var/www/trunk
2009-01-23 07:51:02 +00:00
965d4db265
Group search
2009-01-23 07:50:55 +00:00
7aa496cd8a
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
2009-01-23 08:23:40 +01:00
8114676bd4
trac750 Let's try that again - fix for base css href
2009-01-23 07:22:01 +00:00
aadf10cedb
Update version number
2009-01-23 08:15:40 +01:00
50ec1cc26e
Upload logos for groups
2009-01-23 08:15:29 +01:00
538518ead6
Not using thickbox... yet
2009-01-23 06:18:00 +00:00
171d89aab7
Merge branch 'master' of /var/www/trunk
2009-01-23 05:57:15 +00:00
fbd1cf4dfa
use new error actions classes to display error
2009-01-23 05:57:08 +00:00
277a6e984c
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
2009-01-23 06:47:43 +01:00
df25b5f5f5
Merge branch 'master' of /var/www/trunk
2009-01-23 05:37:45 +00:00
240231a8bd
trac750 linked in stylesheets for login and permissions prompt screens
2009-01-23 05:37:21 +00:00
9dc5d8d0f6
Made avatar upload a two-stage process; first upload, then crop
2009-01-23 06:16:55 +01:00
a7b80ef230
Better math for seciton
2009-01-23 06:11:05 +01:00
a130bb9d6d
A section
2009-01-23 06:10:25 +01:00
597245ffc3
make avatar bigger on single notice pages
2009-01-23 04:52:39 +00:00
8dad87ea95
trac750 FB script to update statuses working again with new uiredesign stuff
2009-01-23 04:23:44 +00:00
45f5094b46
uiredesign
2009-01-23 03:31:38 +00:00
adf77944e8
trac750 Facebook app proper integrated into new uiredesign
2009-01-23 03:16:03 +00:00
21d156c05b
Keep checking who's received stuff in jabber broadcast
2009-01-23 03:58:18 +01:00
eb156741f8
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
2009-01-23 03:49:56 +01:00
8ba19b0686
Merge branch 'master' of ../trunk
2009-01-23 02:43:55 +00:00
0daf242100
Using util.js to set onclick reply anchor
2009-01-23 02:43:18 +00:00
4bd3eae79d
Make sure group messages go out over Jabber
2009-01-23 03:29:26 +01:00
ba3b82c563
Runaway comment in rssaction
2009-01-23 03:10:26 +01:00
ae0f2009d5
Groups list by members
2009-01-23 03:07:03 +01:00
8942e3a445
Add an action to show the list of the latest groups
2009-01-23 03:00:51 +01:00
cafc51db09
Make search actions retain their q values.
2009-01-23 03:00:06 +01:00
df54373411
Fix call to joinform in grouplist
2009-01-23 02:58:48 +01:00
0e1ea38319
Whitespace changes in form.php
2009-01-23 02:58:18 +01:00
f54f0a179a
Help OpenID module make its little form
2009-01-23 02:17:29 +01:00
8a65c5175c
Merge branch 'master' of /var/www/trunk
2009-01-23 01:01:01 +00:00
4a4efc3b0a
uiredesign
2009-01-23 01:00:57 +00:00
2935e8c7ce
Minor markup fix
2009-01-23 00:20:05 +00:00
d6879bfe0c
Debug some of the subscriptions+tags problems
2009-01-22 22:38:10 +00:00
baaf55e9d6
Merge branch 'master' of /var/www/trunk
2009-01-22 21:49:31 +00:00
251551fee6
Group top post section and styles
2009-01-22 21:47:33 +00:00
cb3d94ea93
Add a featured user section
2009-01-22 21:42:18 +00:00
56b6164fa4
Move table-based profile section layout from topposter to base class
2009-01-22 21:41:52 +00:00
6472630f92
Merge branch 'master' of /var/www/trunk
2009-01-22 21:15:35 +00:00
8112c04c3d
Show (None) on no tag cloud results
2009-01-22 21:14:24 +00:00
7cd275b982
A tag cloud section for groups
2009-01-22 21:14:01 +00:00
f6f71ea0ee
Minor
2009-01-22 21:07:11 +00:00
0790402414
Merge branch 'master' of ../trunk
2009-01-22 21:04:21 +00:00
785ffd5b9b
Populat notices and some css cleanup
2009-01-22 21:03:59 +00:00
e33d80fe9d
Merge branch 'master' of /var/www/trunk
2009-01-22 20:49:45 +00:00
0c7176b603
Bug fix, wrong action urls.
2009-01-22 20:48:54 +00:00
4f58dbf557
Merge branch 'master' of /var/www/trunk
2009-01-22 20:46:55 +00:00
1be3efd1b5
A section for showing a cloud of tags in a person's notices
2009-01-22 20:46:10 +00:00
183ad682af
A base class for tag cloud sections
2009-01-22 20:45:53 +00:00
0e69402394
Merge branch 'master' of ../trunk
2009-01-22 20:39:42 +00:00
9bab9ae078
Top posters section markup and stye
2009-01-22 20:39:13 +00:00
9e9b8349a2
Merge branch 'master' of /var/www/trunk
2009-01-22 20:33:34 +00:00
5a84d7f975
New search navigation widget.
2009-01-22 20:33:09 +00:00
06cc977032
Add a section to show popular groups (by posts)
2009-01-22 20:17:05 +00:00
82e47b2ec1
Add new section type for groups
2009-01-22 20:16:43 +00:00
0029ebad11
Don't tryto show a section if nothing comes back from profiles
2009-01-22 19:54:35 +00:00
7260153bd1
Add a section for popular notices sitewide
2009-01-22 19:48:17 +00:00
ebb99f8cb1
Add a notice section superclass for sections listing notices
2009-01-22 19:42:55 +00:00
5cc0391093
Change to only show local posters in top posting section
2009-01-22 20:22:06 +01:00
e9b3e4e7a8
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
2009-01-22 20:10:42 +01:00
871439ba67
A section for showing the site's top posters
2009-01-22 20:07:55 +01:00
04b164c342
A section sub-class for profiles
2009-01-22 20:07:31 +01:00
3cfb708dcd
Fix section widget's output calls
2009-01-22 20:07:13 +01:00
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
93925b8505
Mathching markup to user profilelist (entities)
2009-01-22 16:50:35 +00:00
e6211c4c22
Add a superclass for all sections
2009-01-22 17:29:10 +01:00
9d913150d4
use profile attr in GalleryAction
2009-01-22 17:12:03 +01:00
b8887ef4f6
reformat profilelist code
2009-01-22 17:06:06 +01:00
e36404dac1
Add a menu for the subscriptions group of actions
2009-01-22 16:11:44 +01:00
a2a2dd88b5
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
2009-01-22 12:35:25 +01:00
6a3204d08e
Extract image management code to a helper function
2009-01-22 12:35:09 +01:00
f89f6a8eb0
Base class for new uiredesign HTTP error classes
2009-01-22 03:33:12 -08:00
Evan Prodromou
Zach Copley
Sean Murphy
Robin Millette
Sarven Capadisli
Meitar Moscovitz
Sarven Capadisli
Adrian Lang
Ciaran Gultnieks
Evan Prodromou
Greg Grossmeier
Robin Millette