Commit Graph

4708 Commits

Author SHA1 Message Date
Zach Copley
b05b998d68 Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x
* '0.8.x' of git@gitorious.org:laconica/mainline:
  HTML "File"/attachments should probably not be considered enclosures.
  Moved the decision logic as to whether an attachment should be an enclosure to the File class
2009-07-14 10:43:13 -07:00
Zach Copley
783231c327 Updated master laconica.po file and merged in lastest translations work from Pootle. 2009-07-14 10:39:18 -07:00
Craig Andrews
c97957cf3e HTML "File"/attachments should probably not be considered enclosures. 2009-07-14 13:38:26 -04:00
Craig Andrews
593af9feb6 Moved the decision logic as to whether an attachment should be an enclosure to the File class 2009-07-14 13:33:40 -04:00
Craig Andrews
e047ba52c7 Merge branch 'tags-timeline-api' into 0.8.x 2009-07-13 14:58:39 -04:00
Craig Andrews
678f054bfe Merge commit 'tobyinks/master' into 0.8.x 2009-07-13 14:32:56 -04:00
Craig Andrews
858e3e765f Merge branch 'groups-timeline-atom-fix' into 0.8.x 2009-07-13 14:27:22 -04:00
Toby Inkster
38784141d1 Copy isset($attachment->filename) fix from RSS 1.0 to RSS 2.0 and Atom 1.0 feeds. 2009-07-13 16:56:52 +01:00
Toby Inkster
ae2bc6a850 Add notice tags to RSS 1.0 output. 2009-07-13 15:37:15 +01:00
Toby Inkster
a68773df63 Improve output for files/attachments. 2009-07-13 15:16:10 +01:00
Evan Prodromou
824e04d50b update README for Meteor plugin 2009-07-13 03:25:08 -04:00
Evan Prodromou
6ae7057b5c correctly pass JSON object to receive function for Meteor 2009-07-13 03:15:39 -04:00
Evan Prodromou
55494720e5 add slashes to JSON so it goes across meteor.js channel correctly 2009-07-13 03:15:12 -04:00
Craig Andrews
91324890ae Add timeline tags API (RSS 2.0 and Atom feeds) 2009-07-12 15:07:54 -04:00
Craig Andrews
7654d69022 Fix atom self reference in the groups api 2009-07-12 15:06:37 -04:00
Evan Prodromou
221f13a10d Some changes for debugging 2009-07-11 13:23:37 -07:00
Evan Prodromou
cc317b169f first version of Meteord plugin, doesn't work 2009-07-11 09:38:01 -07:00
Evan Prodromou
5541565238 Merge branch 'testing' 2009-07-11 07:30:26 -07:00
Zach Copley
7621e0e384 Fix link for atom feed in showgroup action 2009-07-10 20:13:12 -07:00
Zach Copley
0ac08c1fb3 Make get_group() behave more like get_user() 2009-07-10 18:22:19 -07:00
Zach Copley
6b0468358b Group timeline API method doesn't require auth 2009-07-10 18:15:18 -07:00
Zach Copley
7308203065 Update showgroup action RSS 2.0 feed link 2009-07-10 18:11:54 -07:00
Zach Copley
c13dd856c8 Fix alternate link for groups API feed 2009-07-10 18:08:10 -07:00
Zach Copley
544a14d290 Move groups timeline API method into groups API action 2009-07-10 17:56:01 -07:00
Zach Copley
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
Zach Copley
49e4f958eb Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x
* '0.8.x' of git@gitorious.org:laconica/mainline:
  When a notice is posted with an attachment, the facebook stream update has media displayed inline, or as links.
2009-07-10 15:28:26 -07:00
Zach Copley
36d2c66eee Add Craig Andrews to the credits list 2009-07-10 14:46:19 -07:00
Zach Copley
111aee9dc0 Fix conflict from merge with 0.7.x; remove conflict markers 2009-07-10 14:44:50 -07:00
Zach Copley
4a1d7ad082 Merge branch 'candrews-review' into 0.8.x 2009-07-10 21:03:44 +00:00
Craig Andrews
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
Evan Prodromou
bafa1ab1c5 Merge branch '0.7.x' into 0.8.x
Conflicts:
	README
	actions/twitapiusers.php
2009-07-10 10:03:57 -07:00
Evan Prodromou
15f6309dea add a little syntactical sugar for adding plugins 2009-07-09 23:12:53 -07:00
Evan Prodromou
f527b8a8d7 wrong order for span and a in profilesection 2009-07-09 17:40:11 -07:00
Evan Prodromou
8b65883f9d cache frequently-used subscriber, subscription, notice and fave count values 2009-07-09 17:28:38 -07:00
Craig Andrews
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
Evan Prodromou
efd94b4e54 change version number to 0.8.0 2009-07-09 18:22:10 -04:00
Evan Prodromou
f2b12c6084 update the README for 0.8.0 2009-07-09 18:19:24 -04:00
Evan Prodromou
b78801becb correct the newuser default setting in common.php 2009-07-09 18:19:13 -04:00
Evan Prodromou
262c581ea7 Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-07-09 15:26:22 -04:00
Evan Prodromou
0828fde51c one more shot at servicing queues 2009-07-09 15:25:59 -04:00
Sarven Capadisli
2197d0bacf Added width/height attribute and values for the creative commons image 2009-07-09 19:12:50 +00:00
Zach Copley
db58756275 Merge branch 'candrews-review' into 0.8.x
* candrews-review:
  Notice attachments are enclosures in feeds (Atom, RSS 1.0/RDF, and RSS 2.0).
2009-07-09 11:28:21 -07:00
Zach Copley
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
Evan Prodromou
43e0b308fd Revert "Let the queue handlers drain their xmpp queues"
This reverts commit fc3442a041.
2009-07-09 13:39:22 -04:00
Evan Prodromou
e9edf27661 Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-07-09 13:26:29 -04:00
Evan Prodromou
fc3442a041 Let the queue handlers drain their xmpp queues 2009-07-09 13:26:09 -04:00
Craig Andrews
69574591d0 Notice attachments are enclosures in feeds (Atom, RSS 1.0/RDF, and RSS 2.0).
http://laconi.ca/trac/ticket/1690
2009-07-09 13:18:57 -04:00
Sarven Capadisli
228b2001d8 Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x 2009-07-09 17:02:27 +00:00
Sarven Capadisli
be0b149517 Updated max-width values for attachment view 2009-07-09 17:01:45 +00:00
Evan Prodromou
031146f4c7 yet another select() refinement 2009-07-09 12:49:37 -04:00