Commit Graph

4434 Commits

Author SHA1 Message Date
Jeffery To
899aad747a Merge branch '0.8.x' into group-rss-empty 2009-06-26 15:30:24 +08:00
Evan Prodromou
97ee517680 Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-06-25 23:01:30 -07:00
Evan Prodromou
994768b821 break up big inbox queries into lots of small ones 2009-06-25 23:00:46 -07:00
Sarven Capadisli
74d9b0f820 Removed unnecessary assignment to variable for background image on 2009-06-26 05:38:43 +00:00
Sarven Capadisli
4a90c3c3ad Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x 2009-06-26 00:48:13 +00:00
Sarven Capadisli
c4da201fc0 IE UI update for notice_data_attach_selected 2009-06-25 21:25:41 +00:00
Evan Prodromou
b53b6b8769 Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-06-25 14:02:41 -07:00
Sarven Capadisli
e268cb5fd1 Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x 2009-06-25 21:01:59 +00:00
Sarven Capadisli
6a0571d51b Added functionality to remove the notice data attachment 2009-06-25 21:01:07 +00:00
Zach Copley
801aa9165e Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
* '0.8.x' of git@gitorious.org:laconica/dev:
  Using transparent background colour instead of solid for notice on hover
2009-06-25 13:59:34 -07:00
Zach Copley
03d31911e1 FileAction redirections weren't being added (e.g.: /notice/$notice_id/file) 2009-06-25 13:51:29 -07:00
Sarven Capadisli
d1d5347ba3 Using transparent background colour instead of solid for notice on hover 2009-06-25 20:36:02 +00:00
Evan Prodromou
a7cdf32df5 max public page 2009-06-25 13:23:59 -07:00
Zach Copley
6262fdbe78 Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
* '0.8.x' of git@gitorious.org:laconica/dev:
  Added fragment identifier to the "in context" URL which points to
  Adds a scrollbar if the filename is too long for the attached file
2009-06-25 12:52:55 -07:00
Zach Copley
2707622762 Return clippy to his rightful place next to attachments 2009-06-25 12:52:10 -07:00
Sarven Capadisli
28b4e85af0 Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x 2009-06-25 19:00:26 +00:00
Sarven Capadisli
0eb77e6753 Added fragment identifier to the "in context" URL which points to
the notice location in the Conversation page.
2009-06-25 18:57:39 +00:00
Evan Prodromou
c96572c090 fix caching for conversations, again 2009-06-25 11:23:47 -07:00
Evan Prodromou
69f0613473 Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-06-25 11:10:49 -07:00
Evan Prodromou
638905c270 avoid getting duplicate errors on upload 2009-06-25 11:10:34 -07:00
Evan Prodromou
09010c4c2b show backtrace on error 2009-06-25 11:08:55 -07:00
Evan Prodromou
4d56bc6a0a streamline the file action 2009-06-25 11:08:32 -07:00
Sarven Capadisli
5cc5bae4a9 Adds a scrollbar if the filename is too long for the attached file 2009-06-25 17:00:32 +00:00
Sarven Capadisli
bebe7b99f9 Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x 2009-06-25 16:56:02 +00:00
Sarven Capadisli
1e17f1256a Shows the selected file attachment under the form_notice textarea 2009-06-25 16:55:19 +00:00
Evan Prodromou
3ca9e85ce4 update conversations to use newer query format 2009-06-25 09:43:30 -07:00
Evan Prodromou
262f864555 don't try to load a null notice into the list 2009-06-25 02:57:16 -07:00
Evan Prodromou
ad1f2aac03 Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-06-25 02:13:52 -07:00
Evan Prodromou
79547d99cf blow cache when new notice in conversation is saved 2009-06-25 02:11:34 -07:00
Sarven Capadisli
75d6b0707c Style for entity_aliases 2009-06-25 07:55:52 +00:00
Sarven Capadisli
e872ca5bfa Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x 2009-06-25 06:57:00 +00:00
Sarven Capadisli
fcb43dd711 Added class entry-content to attachment list container 2009-06-25 06:55:40 +00:00
Sarven Capadisli
0c5c834827 Slightly more specific selector. Looks only in the notices in the
content area
2009-06-25 03:46:52 +00:00
Evan Prodromou
246013d984 different args for pid and daemon scripts 2009-06-24 19:50:45 -07:00
Evan Prodromou
6038420a69 add i argument for all daemons 2009-06-24 19:35:19 -07:00
Evan Prodromou
becfd6b3b5 all daemons take an id parameter 2009-06-24 19:31:12 -07:00
Evan Prodromou
a6c56d17e0 Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-06-24 19:18:32 -07:00
Evan Prodromou
63f12c48a8 make stomp server work with username and password 2009-06-24 19:17:41 -07:00
Evan Prodromou
5f1b97e2ad no memcached queue handler 2009-06-24 18:02:17 -07:00
Sarven Capadisli
835799ff16 Separated attachment view components 2009-06-25 00:49:54 +00:00
Sarven Capadisli
fa57e717e3 Moved the attachment representation outside of the anchor so that
onclick, it doesn't follow through on the href (e.g., it would play
the video in the overlay instead)
2009-06-25 00:25:22 +00:00
Zach Copley
5067f2ba3a Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
* '0.8.x' of git@gitorious.org:laconica/dev:
  script to upgrade a database from 0.7.4 to 0.8.0
  change foreign_user.id to bigint (for Twitter, Facebook, etc.)
  use printf instead of echo for startdaemons.sh
2009-06-24 16:11:48 -07:00
Zach Copley
e3c5d1664f Take out noisy debugging statement 2009-06-24 16:10:28 -07:00
Evan Prodromou
936567394f script to upgrade a database from 0.7.4 to 0.8.0 2009-06-24 14:59:36 -07:00
Evan Prodromou
83407cc3ca change foreign_user.id to bigint (for Twitter, Facebook, etc.) 2009-06-24 14:44:02 -07:00
Evan Prodromou
07486089d8 Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-06-24 14:13:42 -07:00
Zach Copley
dfac8e8cd4 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 args to daemons fetch
  pass through server and path args to daemons
2009-06-24 00:45:25 -07:00
Zach Copley
d72a90161b Only show "tile background" setting once an img has been uploaded 2009-06-24 00:43:48 -07:00
Zach Copley
b702461f69 fix bad function call (needed to be static) 2009-06-24 00:27:37 -07:00
Zach Copley
98f518b9af fix bug in which design background could accidentally get removed 2009-06-24 00:00:36 -07:00