c74943e598
I can't believe I forgot to commit this as part of 9ed117d... wow. Epic fail. Epic.
2009-07-17 23:16:29 -04:00
f1fc392e2d
Fix OpenId cancelled / error message
...
Thanks jeff-themovie
2009-07-17 22:55:59 -04:00
3dbbefd5ad
Merge branch 'oembed-provider' into 0.8.x
2009-07-17 12:33:56 -04:00
9ed117dc3a
Move the oembed endpoint to /main/oembed
2009-07-17 12:33:12 -04:00
eb22f06ac6
conversation action is readonly
2009-07-15 16:57:39 -04:00
6308539c1d
Added oEmbed discovery for attachments and notices
2009-07-15 15:11:29 -04:00
e637e5a8a9
Support oembed for attachments and notices
2009-07-15 14:49:41 -04:00
0aeea42724
Added stub oembed api endpoint
2009-07-15 10:29:54 -04:00
e047ba52c7
Merge branch 'tags-timeline-api' into 0.8.x
2009-07-13 14:58:39 -04:00
91324890ae
Add timeline tags API (RSS 2.0 and Atom feeds)
2009-07-12 15:07:54 -04:00
7654d69022
Fix atom self reference in the groups api
2009-07-12 15:06:37 -04:00
7621e0e384
Fix link for atom feed in showgroup action
2009-07-10 20:13:12 -07:00
6b0468358b
Group timeline API method doesn't require auth
2009-07-10 18:15:18 -07:00
7308203065
Update showgroup action RSS 2.0 feed link
2009-07-10 18:11:54 -07:00
c13dd856c8
Fix alternate link for groups API feed
2009-07-10 18:08:10 -07:00
544a14d290
Move groups timeline API method into groups API action
2009-07-10 17:56:01 -07:00
5b3d4f7121
Merge branch 'candrews-review' into 0.8.x
...
* candrews-review:
added group status api, located at /api/statuses/group_timeline/ID.rss
2009-07-10 16:11:31 -07:00
4a1d7ad082
Merge branch 'candrews-review' into 0.8.x
2009-07-10 21:03:44 +00:00
08d50655f3
added group status api, located at /api/statuses/group_timeline/ID.rss
...
http://laconi.ca/trac/ticket/1702
2009-07-10 17:00:27 -04:00
bafa1ab1c5
Merge branch '0.7.x' into 0.8.x
...
Conflicts:
README
actions/twitapiusers.php
2009-07-10 10:03:57 -07:00
8250006fbf
When a notice is posted with an attachment, the facebook stream update has media displayed inline, or as links.
...
http://laconi.ca/trac/ticket/1685
2009-07-09 18:42:19 -04:00
c981f5bcec
Merge branch 'candrews-review' into 0.8.x
...
* candrews-review:
maildaemon makes mail attachments into notice attachments
File classes does not use the $FILES array directly, as users of this class aren't necessarily from the web
2009-07-09 11:22:07 -07:00
802b909518
user/show API method needs to fall back to basic auth so that
...
verify_credentials works correctly.
2009-07-07 14:21:44 -07:00
5f72423523
File classes does not use the $FILES array directly, as users of this class aren't necessarily from the web
2009-07-07 15:55:10 -04:00
d846c5fc99
Merge commit 'br3nda/0.8.x-noticesfix' into 0.8.x
2009-07-07 20:53:28 +01:00
4fffe1874f
Fix redundant page display for group design settings
2009-07-06 16:44:35 -07:00
195ec6820b
fix bad function call
...
Conflicts:
actions/twitapiusers.php
2009-07-06 15:56:10 -07:00
a9c1e66570
Bringing users/show in line with Twitter as far as specifying user.
2009-07-06 15:51:17 -07:00
91684830e5
fix bad function call
2009-07-06 15:49:26 -07:00
701a237e8c
Merge branch 'mgrdcm-review' into 0.7.x
...
* mgrdcm-review:
Bringing users/show in line with Twitter as far as specifying user.
2009-07-06 15:48:14 -07:00
5e067c2c81
Add special basic auth handling for friendships/show. Other fixups.
2009-07-06 13:21:16 -07:00
d40075ae9c
Support undocumented 'id' parameter in /statuses/show API method
2009-07-06 11:57:21 -07:00
e6c54a59e1
set/get viewdesigns flag and use it
2009-07-05 14:33:12 -04:00
e3c70cc30c
Merge branch 'friendships_show' into 0.8.x
...
* friendships_show:
Implement friendships/show API method
Route and stub for new friendships/show API method
2009-07-03 15:43:14 -07:00
a2a4cc35f6
Implement friendships/show API method
2009-07-03 15:42:12 -07:00
088fa6befc
null for both args in conversation
2009-07-03 10:48:15 -04:00
e2f8b8d65d
no limit on conversation stream
2009-07-03 10:40:23 -04:00
04c713e671
fixed limit for conversations
2009-07-03 10:37:39 -04:00
72d0ee4e25
move peoplesearchresults class to action/peoplesearch
2009-07-03 10:10:12 -04:00
f73d93fa7a
only show subscription controls to owner
2009-07-03 01:26:21 -04:00
acb4c78346
Route and stub for new friendships/show API method
2009-07-02 17:32:27 -07:00
bca3b3d36f
Send null as 2nd arg, not 3rd.
2009-07-02 15:09:48 -07:00
d04ab14a5a
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
2009-07-02 08:22:09 -04:00
aea546c122
notice should show user design
2009-07-02 08:21:54 -04:00
b4de1d4636
favorites should show owner design
2009-07-02 08:21:41 -04:00
0e78e1cc52
Show HTML for thumbnails instead of redirecting. Remove dead code.
2009-07-01 16:24:22 -07:00
90557e9147
correctly return count of notices
2009-07-01 14:45:48 -04:00
0057f3da81
show all the notices, not just latest 20
2009-07-01 14:45:09 -04:00
3b6ff92495
don't redirect on local file for ajax action
2009-07-01 13:50:44 -04:00
fbb7757c4b
Cleaning up comments at top of favor.php.
2009-06-30 17:04:49 -07:00
Craig Andrews
Evan Prodromou
Zach Copley
CiaranG
Dan Moore