Commit Graph

5299 Commits

Author SHA1 Message Date
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
Brenda Wallace
bd9824c8d5 added missing conversation column to group by 2009-06-25 22:35:41 +12:00
Brenda Wallace
a38245d4d1 added missing table "design" 2009-06-25 22:01:14 +12:00
Brenda Wallace
2456baa3bc added missing conversation id to notices 2009-06-25 22:00:55 +12:00
Brenda Wallace
72df5c9eb4 removed semicolons from comments
(mucks up logic in install.php)
and fixed stray commas that stopped it parsing as valid SQL
2009-06-25 21:59:33 +12: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
Brenda Wallace
56496a2cb5 add missing group by item, to make database that aren't mysql happy 2009-06-24 21:31:10 +12: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
Evan Prodromou
a9bbf29ca6 use printf instead of echo for startdaemons.sh 2009-06-23 17:08:33 -07:00
Evan Prodromou
d98ecc760d Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-06-23 16:44:31 -07:00
Evan Prodromou
f88d767f49 add args to daemons fetch 2009-06-23 16:44:00 -07:00
Zach Copley
57903bf2ac Make gateway notices available to the auth user in the API 2009-06-23 15:53:49 -07:00
Evan Prodromou
8588d32120 pass through server and path args to daemons 2009-06-23 15:00:10 -07:00
Zach Copley
f04a54ed2f Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
* '0.8.x' of git@gitorious.org:laconica/dev: (61 commits)
  Using default theme design values (it was previously set to identica
  Updated default colour theme and IE6 colours for transparent values
  chmod +x delete_status_network.sh
  rm -Rf, not rmdir
  script to delete a status network
  chmod allsites.php
  script to show all sites on a network
  use different name for connection and database
  use /etc/laconica/setup.cfg instead of local file
  other base directories
  On XHR notice post, calls NoticeAttachment to trigger thumbnail and
  oembed and thumbnail don't need sequences
  add innodb by default to status networks
  pwgen not pwdgen
  make pwgen command configurable
  a little sql script to drop full-text index and use innodb for profile and notice
  remove common_debug from newnotice
  append uploads to content rather than showing them double
  use a subclass for single notice items to show attachments
  make file command configurable
  ...
2009-06-23 14:29:46 -07:00
Sarven Capadisli
2d3e990ed4 Using default theme design values (it was previously set to identica
theme)
2009-06-23 21:26:47 +00:00
Sarven Capadisli
3cfa2ebb05 Updated default colour theme and IE6 colours for transparent values 2009-06-23 21:18:41 +00:00