Evan Prodromou
be6ce27538
Merge branch 'sgmurphy-clone/0.7.x' into 0.7.x
...
Conflicts:
lib/util.php
2009-02-06 14:28:17 -05:00
Evan Prodromou
adcbb48362
Merge branch '0.7.x' of git://gitorious.org/laconica/sgmurphy-clone into sgmurphy-clone/0.7.x
2009-02-06 14:27:06 -05:00
Sean Murphy
56d7348ec2
Fixed #1149 : URL auto-linking bug when following colon.
2009-02-06 12:18:15 -05:00
Evan Prodromou
343cd6f205
Move common_avatar_* functions to Avatar
...
Moved the common_avatar_* functions to the Avatar class. Typically
either as methods on the object or as static methods. Replaced all the
uses of the functions in other modules.
2009-02-06 03:55:48 -05:00
Evan Prodromou
d3ff8bfec6
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-02-06 01:07:09 -05:00
Evan Prodromou
c47bfcef65
Merge branch 'sgmurphy-clone/0.7.x' into 0.7.x
2009-02-06 01:06:54 -05:00
Evan Prodromou
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
Zach Copley
ab82978b2d
Trac #894 and #1013 - fixed bad redirects after delete notice
2009-02-05 16:16:10 -08:00
Sean Murphy
e08b7f7205
Fix for unicode string auto-linking bug
2009-02-05 17:29:58 -05:00
Evan Prodromou
8775e79e35
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-02-05 16:35:19 -05:00
Evan Prodromou
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
Evan Prodromou
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
Sean Murphy
d4bdb2dc19
Better fix for displaying max file size.
2009-02-05 15:01:44 -05:00
Sean Murphy
746a5d7507
Fixed #905 : Presenting image size limit to user.
2009-02-05 14:11:50 -05:00
Robin Millette
9febe8ce39
trac #1142 fix tag rss
2009-02-05 18:10:47 +00:00
Evan Prodromou
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
Evan Prodromou
43feee783b
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-02-05 11:47:47 -05:00
Evan Prodromou
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
Sarven Capadisli
7bc764fdc0
Facebook profile box CSS and a link back to the app page.
2009-02-05 07:07:36 +00:00
Sarven Capadisli
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
Sean Murphy
4090471ebe
Forgot to replace URL shortening regex with new function.
2009-02-04 23:18:45 -05:00
Sean Murphy
8053adc60e
Fixed #779 & #588 ; Better URL auto-linking.
2009-02-04 23:11:40 -05:00
Sean Murphy
0f12d6135e
Fixed #732 ; Hashtags inside parens and brackets.
2009-02-04 20:02:50 -05:00
Sean Murphy
7e975b17c5
Fixed #1134 ; Consolidated image scaling functions.
2009-02-04 19:32:15 -05:00
Zach Copley
68152dcf3a
Facebook app - reorganized some stuff; better HTML output
2009-02-04 22:54:07 +00:00
Sarven Capadisli
b8e10428d3
Changed error and facebookaction wrap selector from @class to @id.
2009-02-04 17:03:59 +00:00
Evan Prodromou
e8d3615b3f
Allow HTML in site notice (Bug#1002)
2009-02-04 08:49:42 -05:00
Evan Prodromou
92c6034b25
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-02-04 07:26:14 -05:00
Evan Prodromou
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
Zach Copley
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
Evan Prodromou
0356953cf8
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk into 0.7.x
2009-02-03 15:12:55 -05:00
Meitar Moscovitz
3b6d2653fb
Fixes ticket:1087; correctly paginate group members list in fancy URLs.
2009-02-04 04:02:30 +11:00
Evan Prodromou
ab16bb876b
Merge branch 'master' of git@gitorious.org:laconica/dev into 0.7.x
2009-02-02 16:46:51 -05:00
Evan Prodromou
daa5797809
Merge branch 'master' of git://gitorious.org/laconica/adrianlang-clone into adrianlang/master
2009-02-02 16:42:27 -05:00
Robin Millette
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
Robin Millette
f9edd1101b
trac #1099 : main menu should not lead to IM settings when IM is disabled
2009-02-02 20:20:21 +00:00
Sarven Capadisli
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
Robin Millette
d3b30164be
added primary menu to error pages
2009-02-02 14:51:23 +00:00
Sarven Capadisli
4f1345620a
Better cross-browser support for page and text zoom-in/out.
2009-02-02 14:14:14 +00:00
Meitar Moscovitz
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
Sarven Capadisli
18593afee7
If user is not logged in, then notice-options container shouldn't be
...
outputted.
2009-02-01 23:37:54 +00:00
Adrian Lang
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
Sarven Capadisli
d309fd27c5
Rearraned stylesheet order for IE and fixed path to files for base IE stylesheets
2009-02-01 20:05:13 +00:00
Evan Prodromou
87b99540ef
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk into cyi/master
2009-02-01 14:33:18 -05:00
Sarven Capadisli
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
Evan Prodromou
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
Ciaran Gultnieks
53274a6d93
PostgreSQL - code changes to avoid problems where user table is referenced in ad-hoc queries
2009-01-30 01:12:58 +00:00
Zach Copley
c7d06519f0
trac750 update Facebook status when posting to Identi.ca from Facebook
2009-01-29 05:58:27 +00:00
Evan Prodromou
04b3add162
only send group notices through Jabber to users with notices enabled
2009-01-28 23:03:03 -05:00
Greg Grossmeier
62fd9369ec
fix email notification link
2009-01-28 09:22:54 -05:00