Commit Graph

6146 Commits

Author SHA1 Message Date
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
Zach Copley
87f54c1136 Merge branch 'groupdesign' into 0.8.x
* groupdesign:
  Left out some new user and group theming file in the previous commit
2009-06-18 02:17:31 -07:00
Zach Copley
3f032bc36e Left out some new user and group theming file in the previous commit 2009-06-18 02:16:39 -07:00
Zach Copley
2f36604ddf Merge branch 'groupdesign' into 0.8.x
* groupdesign:
  Group theming.
  Add design_id to User_group
2009-06-18 02:02:43 -07:00
Zach Copley
57274d21ba Group theming. 2009-06-18 02:01:06 -07:00
Evan Prodromou
ba3a484a65 order notices in a conversation 2009-06-18 00:12:53 -07:00
Evan Prodromou
79e732bd03 Merge branch '0.8.x' into twitterpriv 2009-06-17 23:56:42 -07:00
Zach Copley
dff43c03e4 Add design_id to User_group 2009-06-17 22:16:09 -07:00
Sarven Capadisli
2b3746013e Updated themes for notice hover on content area 2009-06-18 04:55:41 +00:00
Sarven Capadisli
ca53791988 Using notice hover only on content area 2009-06-18 04:54:12 +00:00
Sarven Capadisli
5d8d3e3184 Updated pigeonthoughts theme to reflect 0.8 design requirements 2009-06-18 04:33:32 +00:00
Zach Copley
c14c9e1a08 Merge branch 'userdesign' into 0.8.x
* userdesign:
  Minor removal
2009-06-17 19:04:41 -07:00
Zach Copley
6c7bdf9df6 Merge branch 'userdesign' into 0.8.x
* userdesign: (56 commits)
  Fix for background image repetition for various page heights
  Removed height:100% for better background image repetition
  A little more specific selector for notice reply
  Have user favorites page show user's design
  Placed a check to make sure there is a reply button in a notice before
  Make MailboxAction read only
  Remove stale reference to deprecated personal.php
  Uppercase hex color values
  Default to image being on, no tile after upload
  Fix sidebar color bug default design
  Update background image settings to use bitflags
  It was accidently removed
  Dynamically tile background image  and turn background image on or off
  Show a background img in settings form
  IE7/8 CSS update for user design
  Enable tiling of background imgs for Designs
  Added background image tile flag to Design
  Init styles for tile and image use on/off for user design settings
  Added form option to tile background image and to turn it on and off
  Add background dir
  ...
2009-06-17 18:49:25 -07:00
Sarven Capadisli
f36d90a755 Minor removal 2009-06-18 01:41:53 +00:00
Sarven Capadisli
00736bddd1 Fix for background image repetition for various page heights 2009-06-18 01:39:37 +00:00
Sarven Capadisli
d8b0fcbc50 Removed height:100% for better background image repetition 2009-06-18 01:28:02 +00:00
Sarven Capadisli
4b542ccc1c Merge branch 'userdesign' of /var/www/design into userdesign 2009-06-18 01:11:13 +00:00
Sarven Capadisli
77185dd4c6 A little more specific selector for notice reply 2009-06-18 01:10:48 +00:00
Zach Copley
4eddf1c7a4 Merge branch 'userdesign' of ssh://zach@dev.controlyourself.ca/mnt/www/design into userdesign
* 'userdesign' of ssh://zach@dev.controlyourself.ca/mnt/www/design:
  Placed a check to make sure there is a reply button in a notice before
2009-06-17 18:05:49 -07:00
Zach Copley
06240450ef Have user favorites page show user's design 2009-06-17 18:05:12 -07:00
Sarven Capadisli
5854fe194a Placed a check to make sure there is a reply button in a notice before
applying the dynamic action
2009-06-18 01:04:12 +00:00
Zach Copley
b0591cd982 Make MailboxAction read only 2009-06-17 17:29:57 -07:00
Zach Copley
4fc4c0a74b Remove stale reference to deprecated personal.php 2009-06-17 17:13:59 -07:00
Evan Prodromou
85b4c24188 add dbhost argument for status network setup 2009-06-17 16:30:16 -07:00
Evan Prodromou
2187ec7056 hide group name and aliases in group tag cloud section 2009-06-17 15:20:44 -07:00
Evan Prodromou
420e8994f8 Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into taggedprofile 2009-06-17 15:05:24 -07:00
Evan Prodromou
07f5797f2f Make the personal tag streams actually work 2009-06-17 15:04:57 -07:00
Zach Copley
164588ef0f Merge branch '0.8.x' into userdesign 2009-06-17 21:40:52 +00:00
Zach Copley
cd1361fe96 Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-06-17 14:36:33 -07:00
Zach Copley
8992e8fa7a Ticket 1612 - make destory (and create) favorites work via API 2009-06-17 14:34:04 -07:00
Zach Copley
7e25a7f3aa Output XML and JSON error msgs for API calls 2009-06-17 14:32:36 -07:00
Robin Millette
b58dc5e961 Added config option to enable or disable file uploads with notices. 2009-06-17 16:55:01 -04:00
Robin Millette
28d02ec8cd Make oohembed endpoint configurable. 2009-06-17 16:44:33 -04:00
Robin Millette
fd6de17a4a Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-06-17 16:22:47 -04:00
Robin Millette
1505e3a4c3 Fixed recent attachment bug that required URLs to be posted twice to be taken into account. 2009-06-17 16:21:50 -04:00
Evan Prodromou
19d39b2029 Store better data about twitter statuses
We mark Twitter statuses with flags so they don't get shown in the
wrong places.
2009-06-17 12:31:35 -07:00
Evan Prodromou
2fbd141361 correct arguments for ProfileList 2009-06-17 08:21:53 -07:00
Evan Prodromou
8384e7c7f6 Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-06-17 08:18:33 -07:00