Commit Graph

9484 Commits

Author SHA1 Message Date
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
Sarven Capadisli
02eecb4f07 Minor markup consistency 2009-02-05 21:26:06 +00: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
Zach Copley
986abdd968 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-02-05 20:02:47 +00: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
Adrian Lang
68a3139d0b Fix #81: Profile and personal shows „you“ instead of username when looking at own profile / personal. While doing so I fixed a wrong gettext usage were the result was not sprintf'd, but concat'd. 2009-02-05 11:53:32 -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
Sean Murphy
4ced74dc91 Fixed #1140; Login form session token not set. 2009-02-05 10:17:19 -05:00
Zach Copley
96ca4ef75a Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-02-05 07:11:09 +00:00
Zach Copley
61b17b4c02 Facebook app: don't add FBJS event listeners to notice input box if it's not on the page 2009-02-05 07:10:11 +00: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
Evan Prodromou
a97f8f6a43 merge from dev/0.7.x 2009-02-04 15:40:36 -05:00
Evan Prodromou
2bd52059db take out redundant code from login 2009-02-04 15:38:26 -05:00
Zach Copley
df41b1307f Removed erroneous comments referring to old common_notice_form() func 2009-02-04 11:55:22 -08:00
Sean Murphy
5c880bc6cc Fix for #1057; group logo transparecy (and pixilation) 2009-02-04 14:44:12 -05:00
Sarven Capadisli
b43bdda312 Removing extra margin after .section .notice .author. 2009-02-04 18:18:25 +00:00
Sarven Capadisli
b8e10428d3 Changed error and facebookaction wrap selector from @class to @id. 2009-02-04 17:03:59 +00:00
Sarven Capadisli
593d41f78b Using overflow:hidden for long strings that don't contain any
whitespace. This is both a preventive measure for user content that is
abused (i.e., leaking text into other page components) and for
aesthetics (requested by @evan)
2009-02-04 16:45:46 +00:00
Sarven Capadisli
8463d23397 http://laconi.ca/trac/ticket/1112 -- Removed only the author fn from
display.
2009-02-04 14:35:34 +00:00
Evan Prodromou
e8d3615b3f Allow HTML in site notice (Bug#1002) 2009-02-04 08:49:42 -05:00
Evan Prodromou
2d063650ef Make WebChannel and AjaxWebChannel work
These command-output channels were using the old common_element_*
functions. They now take an $out constructor parameter, and use that
for output.

The WebChannel has pretty remedial output; it would be nice if it
output a real formatted page.
2009-02-04 07:59:30 -05:00
Evan Prodromou
15b96f78ab Revert "Fixed direct messaging: AjaxWebChannel is now using Action's methods."
This reverts commit 0f2c43bd04.

Making Channel a subclass of Action for no other reason than to let
the AjaxWebChannel do some output is the really, really wrong way to
do this. A Channel is not an Action.

I'll change AjaxWebChannel so it takes an Action as a constructor
paramater and uses that Action for its output. We do this for most
Widget subclasses and it makes sense here, too.
2009-02-04 07:33:10 -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
Zach Copley
c16ddd6775 trac1095 Profile page had bad alternate links for RSS and Atom feeds 2009-02-03 16:31:41 -08:00
Sarven Capadisli
05e11ea021 Removed deprecated files from the identica theme. 2009-02-03 22:12:04 +00:00
Sarven Capadisli
bcc8348615 Removed deprecated files from the default theme. 2009-02-03 22:09:25 +00:00
Sarven Capadisli
32b1bb381a Fixed ajaxErrorMsg(). Using startHTML() instead of common_start_html() 2009-02-03 21:46:09 +00:00
Robin Millette
a5a7c5033f Added PEAR Services/oEmbed and its dependencies for multimedia integration. 2009-02-03 21:36:11 +00:00
Robin Millette
c62c0602fe Added PEAR Services/oEmbed and its dependencies for multimedia integration. 2009-02-03 21:35:25 +00:00
Evan Prodromou
aafb73755e Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-02-03 15:13:06 -05: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
Zach Copley
b411ead3ce Merge branch '0.7.x' of git://gitorious.org/laconica/dev into 0.7.x 2009-02-03 11:30:59 -08:00
Robin Millette
06cfae3b91 Wrapped some URLs in the README with <> 2009-02-03 19:25:46 +00:00
Zach Copley
dcf18e9694 trac1104 Destroy method was dying because it was still calling deprecated common_dequeue_notice() func 2009-02-03 11:23:30 -08:00
Meitar Moscovitz
3b6d2653fb Fixes ticket:1087; correctly paginate group members list in fancy URLs. 2009-02-04 04:02:30 +11:00
Meitar Moscovitz
01b6aca078 Fix PHP warnings when user avatar crop controls aren'tn touched. 2009-02-04 03:34:17 +11:00
Todd Deshane
22c806a15a fix link to Open Software Service Definition 2009-02-02 17:28:42 -05: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