Evan Prodromou
5ec5a22dc7
make tagother work with router
2009-02-20 10:04:28 -05:00
Evan Prodromou
c0497d28f4
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-02-20 09:54:50 -05:00
Evan Prodromou
a0ddbecfbc
Merge branch '0.7.x' of evan@dev.controlyourself.ca:/var/www/evan into 0.7.x
2009-02-20 09:54:17 -05:00
Zach Copley
28e1c163e3
Open the /api/laconica/config.format API method so clients can determine whether a site is "private".
2009-02-18 15:33:52 -08:00
Evan Prodromou
d8b6762e6d
move peoplesearchresults to its own module
2009-02-18 09:35:59 -05:00
Meitar Moscovitz
4327ae19d4
Fixes ticket:1053; removes spacing between hash and tag on profile page.
2009-02-17 18:37:02 +11:00
Evan Prodromou
b727e8be33
Set @-message notification options in email settings
...
Set the @-message notification options in email settings.
2009-02-16 18:45:05 -05:00
Evan Prodromou
4ad5d55ecf
Add events for filtering and logging new notices
2009-02-13 10:52:26 -05:00
Zach Copley
47e595b092
Merge branch 'queuehandlers' into 0.7.x
2009-02-12 14:41:27 -08:00
Evan Prodromou
3b5fd8fb6b
Revert "Code to handle PEAR_Errors raised by DB_DataObject that are bubbling"
...
This reverts commit 9f035e2847
.
It's a lot of complicated stuff, and the global handler probably does
fine.
2009-02-12 16:05:37 -05:00
Evan Prodromou
b09eb06dae
Revert "Just discovered the PEAR_Error handling function in index.php. Duh."
...
This reverts commit 616bdd43a9
.
Kind of a long hard way to deal with a simple situation, so I'd prefer
to just use the global handler.
2009-02-12 16:04:43 -05:00
Zach Copley
986068d6e7
Merge branch '0.7.x' into queuehandlers
2009-02-11 23:07:49 -08:00
Zach Copley
616bdd43a9
Just discovered the PEAR_Error handling function in index.php. Duh.
...
Renamed the Action functions to throw an exception like it. I still
think it probably makes sense to have the callback defined in both
places for finer control.
2009-02-11 22:08:20 -08:00
Zach Copley
9f035e2847
Code to handle PEAR_Errors raised by DB_DataObject that are bubbling
...
up, but are actually expected and can safely be ignored.
2009-02-11 21:41:56 -08:00
Zach Copley
7155cf813d
Move/reorg Twitter broadcast code to lib/twitter.php in prep for
...
making a twitterqueuehandler.
2009-02-11 17:46:53 -08:00
Sarven Capadisli
012288bdf6
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-02-11 16:53:01 +00:00
Sarven Capadisli
fc293545be
Minor. Changed from @class location to label
2009-02-11 16:50:07 +00:00
Evan Prodromou
22b10399aa
Unify feeds definition in actions
...
I got a little sick of trying to keep the export data and <head> links
synched in actions, so I made a common method, getFeeds(), which gets
the feeds for both. It returns an array of Feed objects, which know
about what their mime type is, title, location, all that jazz.
I changed the FeedList class so it handles the new Feed objects
instead of the old array of data.
I changed all the actions that show feeds (I think...) so that they
now use getFeeds() for all their feed needs.
2009-02-11 11:37:50 -05:00
Evan Prodromou
ad65c447d5
fix Atom link, add Atom and RSS 2.0 to <head>
2009-02-11 10:35:15 -05:00
Evan Prodromou
27e23f2dd3
Merge branch 'sgmurphy-clone/0.7.x' into 0.7.x
2009-02-11 10:11:26 -05:00
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
Sean Murphy
d8ed013612
Merge commit 'upstream/0.7.x' into 0.7.x
2009-02-09 20:18:27 -05:00
Sean Murphy
55fcc150fe
Fixed #1025 : Delete avatar option.
2009-02-09 20:17:56 -05: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