Evan Prodromou
26b0bc3aab
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-02-11 09:54:23 -05:00
Evan Prodromou
1a7337f2fd
Moved /doc/ to /doc-src/
...
Moved the doc/ dir to /doc-src/ so that the actual
markdown files aren't substituted for the docs.
2009-02-10 22:33:57 -05:00
Robin Millette
7763f804ca
trac #233 Explicitely show we have an rss feed for notice searches.
2009-02-10 22:04:47 +00:00
Evan Prodromou
47a5d2b7f0
Fixed remote subscribe avatar problems
...
Had some Avatar file-copying issues; seem to be fixed.
2009-02-09 23:13:11 +00:00
Evan Prodromou
c87a0c3f58
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-02-09 12:09:44 -05:00
Evan Prodromou
9b7c57d094
whitespace and formatting in showstream.php
2009-02-09 12:07:21 -05:00
Evan Prodromou
73b8de7c4c
Merge branch 'sgmurphy-clone/0.7.x' into 0.7.x
2009-02-09 12:03:45 -05:00
Robin Millette
43888b5239
trac #1160 fix dropdown xmloutput function for the selected attribute and fix newmessage auto-selected dropdown.
2009-02-09 15:35:38 +00:00
Zach Copley
c604fa8d37
Ticket #1094 Facebook app invites page was failing if no friends had added the app yet
2009-02-08 23:07:56 +00:00
Zach Copley
00fda7ae5f
Minor update to the way Facebook app handles listing of friends you've invited.
2009-02-08 21:58:25 +00:00
Zach Copley
dec0461d5f
Trac #1159 : Fix peopletag pagination. Also phpcs cleanup.
2009-02-08 13:25:48 -08:00
Robin Millette
c2905085c1
trac #1155 ++ replace strlen with mb_strlen for all utf8 strings.
2009-02-07 19:33:18 +00:00
Sean Murphy
a3d5e00f64
Merge commit 'upstream/0.7.x' into 0.7.x
...
Conflicts:
actions/showstream.php
2009-02-07 11:02:10 -05:00
Sean Murphy
d6245dca63
Fixed #1048 : Edit avatar link on profile page.
2009-02-06 18:36:34 -05:00
Evan Prodromou
26053c1868
Make adding and removing an incoming email in SMS settings
...
Fixes Bug#1036.
2009-02-06 15:22:48 -05:00
Meitar Moscovitz
8ec312043f
Add a link to the group search page from a user's own group list.
...
I've seen a request or two pop up for this on the Laconica group on
Identica, and I'd personally like there to be a link to the search
page from my own groups listing, as I often find myself looking for
one and end up at my browser's address bar.
2009-02-07 04:03:25 +11:00
Evan Prodromou
bb2cb65c2a
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-02-06 03:56:15 -05:00
Evan Prodromou
fc094e0cf4
fix formatting of new Avatar:: calls
2009-02-06 03:55:53 -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
Sarven Capadisli
a6cf3a2fb3
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-02-06 06:28:14 +00:00
Sarven Capadisli
ac23321a40
Added primary and secondary form actions. Fixed markup for
...
form_notice_delete
2009-02-06 06:27:04 +00:00
Zach Copley
d51be320ca
Removed debugging statements I accidentally left in deletenotice.php
2009-02-05 16:21:23 -08:00
Zach Copley
ab82978b2d
Trac #894 and #1013 - fixed bad redirects after delete notice
2009-02-05 16:16:10 -08: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
444c794480
Don't show stretchy-box on avatar if not cropping
2009-02-05 16:34:38 -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
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
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
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
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
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
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
c16ddd6775
trac1095 Profile page had bad alternate links for RSS and Atom feeds
2009-02-03 16:31:41 -08:00
Sarven Capadisli
32b1bb381a
Fixed ajaxErrorMsg(). Using startHTML() instead of common_start_html()
2009-02-03 21:46:09 +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