Commit Graph

4833 Commits

Author SHA1 Message Date
Zach Copley
f95dbee7d6 Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x 2009-06-22 21:51:20 +00:00
Evan Prodromou
0461aafeef Merge branch '0.8.x' into cmdline 2009-06-22 14:51:17 -07:00
Zach Copley
09e24af683 Add upload location to attachments config section 2009-06-22 21:36:04 +00:00
Evan Prodromou
2c4486401d Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-06-22 14:32:40 -07:00
Evan Prodromou
2e9fc34d4f change staticGet() from DB_DataObject to Memcached_DataObject for file classes 2009-06-22 14:24:40 -07:00
Evan Prodromou
05e5122802 Database changes for file tables
Some minor database changes for file tables. Namely:

 * Added a timestamp to all tables
 * Added a filename column for local files
 * Change some tables that had unnecessary auto-increment primary
   keys when they had another unique column that should act as
   the primary key
 * Change engine from MyISAM to InnoDB for a couple of files.

Also, rebuilt the DB_DataObject files for all these tables.
2009-06-22 14:19:41 -07:00
Zach Copley
b021cb7288 Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
* '0.8.x' of git@gitorious.org:laconica/dev:
  fixing up conversations
2009-06-22 14:14:33 -07:00
Evan Prodromou
f21cecbfbd Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-06-22 13:33:31 -07:00
Evan Prodromou
15e4cbebab fixing up conversations 2009-06-22 13:14:15 -07:00
Zach Copley
4c09d10025 Keep gateway notices from leaking thru Sphinx search-engine 2009-06-22 12:24:59 -07:00
Zach Copley
e6559e3bea Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
* '0.8.x' of git@gitorious.org:laconica/dev:
  Layout fix for IE6
  theme dir, path configurable
2009-06-22 10:56:02 -07:00
Sarven Capadisli
7b269a6712 Layout fix for IE6 2009-06-22 17:18:09 +00:00
Evan Prodromou
7cf0a4c647 theme dir, path configurable 2009-06-22 09:31:55 -07:00
Zach Copley
9014a0a90d Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
* '0.8.x' of git@gitorious.org:laconica/dev:
  Add like for search
  got rid of 'skin' concept a while ago
  add collecta.com link
  Update copyright dates in files modified in 2009
  change Controlez-Vous to Control Yourself
  ignore config.php.*
  Position of max_file_size position helps IE
2009-06-21 22:30:39 -07:00
Evan Prodromou
876ab05927 Add like for search 2009-06-21 21:50:35 -07:00
Evan Prodromou
02a4ca9e2e got rid of 'skin' concept a while ago 2009-06-21 21:38:16 -07:00
Evan Prodromou
b64ac083dd add collecta.com link 2009-06-21 11:11:12 -07:00
Evan Prodromou
de0335fbe9 add TOS to footer menu if brought-by available 2009-06-20 22:36:56 -07:00
Evan Prodromou
2f991f9396 focus on microblogging 2009-06-20 22:34:05 -07:00
Evan Prodromou
232dac67bd reformat for Markdown 2009-06-20 22:13:06 -07:00
Evan Prodromou
89bf13d5d6 Add original of Wordpress.com TOS 2009-06-20 21:45:06 -07:00
Evan Prodromou
29bebdb50b Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-06-20 21:32:27 -07:00
Evan Prodromou
aec6456c91 Update copyright dates in files modified in 2009 2009-06-20 16:12:55 -07:00
Evan Prodromou
793a6a1155 change Controlez-Vous to Control Yourself 2009-06-20 16:00:04 -07:00
Evan Prodromou
5b96523c23 Merge branch '0.8.x' into cmdline 2009-06-20 15:51:51 -07:00
Evan Prodromou
27aaabb5f2 ignore config.php.* 2009-06-20 15:49:42 -07:00
Evan Prodromou
198afa0a1d change scripts to take server and path from commandline 2009-06-20 14:58:47 -07:00
Sarven Capadisli
054e4459b2 Position of max_file_size position helps IE 2009-06-20 18:22:05 +00:00
Zach Copley
b8f3f32f3f Keep Twitter gateway notices from leaking thru MySQL notice search 2009-06-19 20:21:57 -07:00
Zach Copley
f5b24133cb Add twitterstatusfetcher to the list of daemons to stop 2009-06-19 14:40:32 -07:00
Sarven Capadisli
9be54a3dcf Minor indenting 2009-06-19 16:04:14 +00:00
Sarven Capadisli
1c2cf10811 Includes a sioc:reply_to link between notices. It helps with things
like http://danbri.org/words/2009/06/16/415
Thanks to Toby Inkster for the patch:
http://buzzword.org.uk/2009/laconica-0.7.3-sioc-reply_to.patch
2009-06-19 15:54:24 +00:00
Evan Prodromou
45430d2b3b Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-06-18 23:25:27 -07:00
Zach Copley
cb0047b144 This time, twitterstatusfetcher really DOES update changed and missing avatars! 2009-06-18 19:21:17 -07:00
Zach Copley
e506f82cdf Better avatar handling - pull in any missing Twitter avatars 2009-06-18 16:51:06 -07:00
Evan Prodromou
5d3e47e501 remove path from install; better autodetection now 2009-06-18 16:21:03 -07:00
Evan Prodromou
597df6a234 better calculation of path 2009-06-18 16:19:26 -07:00
Evan Prodromou
68b34b3266 Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-06-18 12:22:41 -07:00
Zach Copley
d3fa832f76 Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x 2009-06-18 19:21:05 +00:00
Zach Copley
e0fb15c185 Make sure we have a DB connection before setting its charset 2009-06-18 19:19:19 +00:00
Sarven Capadisli
23d6d19e75 Better attachment view check 2009-06-18 19:03:44 +00:00
Sarven Capadisli
95eff9c766 Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x 2009-06-18 18:48:56 +00:00
Sarven Capadisli
730c173238 Updated markup and CSS for attachment_view 2009-06-18 18:48:19 +00:00
Evan Prodromou
3f54840b51 Only show twitter msgs in your own inbox 2009-06-18 11:45:48 -07:00
Evan Prodromou
b761cfd409 Merge branch 'twitterpriv' into 0.8.x 2009-06-18 11:19:25 -07:00
Zach Copley
bde571728d Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
* '0.8.x' of git@gitorious.org:laconica/dev:
  Display more oembed info in attachment popup.
  order notices in a conversation
2009-06-18 10:52:40 -07:00
Zach Copley
65457e73bf Config option for bidirectional Twitter bridge 2009-06-18 10:51:43 -07:00
Evan Prodromou
3a0c6d6c6d Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-06-18 07:45:06 -07:00
Robin Millette
c442b400b9 Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-06-18 06:02:54 -04:00
Robin Millette
65b4cfbb54 Display more oembed info in attachment popup. 2009-06-18 06:02:12 -04:00