dd1fc46f09
Merge branch '0.8.x' into design_reset
...
* 0.8.x: (32 commits)
admin indicators in groups
show section with admins in sidebar of group
update to latest (r76) version of XMPPHP
better output for common error handler
fix logging error
note when going background
change name of constructor for xmppdaemon
add a lot more logging to xmppdaemon
error in get_option_value wasn't returning a value
reformat commandline.inc
if not in daemon mode, xmppdaemon sends log to stdout
extract log-line formatting to its own function
got my background/foreground logic backwards
twitter status fetcher takes an id argument
more efficient fixup of conversations
commandline processing handles errors better
xmppdaemon.php can stay in foreground
command line arg handling a little more flexible
Daemon can optionally not go into the background
don't canonicalize people's text into URLs
...
Conflicts:
theme/base/css/display.css
2009-06-29 13:23:45 -07:00
14575fe6fc
better output for common error handler
2009-06-28 19:24:14 -04:00
6557a569e5
fix logging error
2009-06-28 17:41:16 -04:00
5cc58f1e01
note when going background
2009-06-28 17:38:02 -04:00
9f079764aa
extract log-line formatting to its own function
2009-06-28 16:38:27 -04:00
6ca4dfa7ef
Daemon can optionally not go into the background
2009-06-28 16:12:23 -04:00
495c85544a
don't canonicalize people's text into URLs
2009-06-28 15:21:15 -04:00
871f598dcc
debug flag for sessions
2009-06-27 08:11:09 -07:00
70521d55a8
log IP for API auth errors
2009-06-27 07:37:58 -07:00
7af94dc125
some debugging code for sessions
2009-06-27 07:09:21 -07:00
71dad1ff62
use the session class to store sessions
2009-06-27 06:20:24 -07:00
0ca22cf6e2
a memcached_dataobject class for saving sessions
2009-06-27 05:48:22 -07:00
ce76d61957
marker in sessions
2009-06-27 05:07:14 -07:00
f65015b24a
Added input submit to let the user to go back to site's default design
...
settings
2009-06-27 03:21:18 +00:00
4662a4fa0d
Add attachment action back into router
2009-06-25 14:05:06 -07:00
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
2707622762
Return clippy to his rightful place next to attachments
2009-06-25 12:52:10 -07:00
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
e872ca5bfa
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
2009-06-25 06:57:00 +00:00
fcb43dd711
Added class entry-content to attachment list container
2009-06-25 06:55:40 +00:00
becfd6b3b5
all daemons take an id parameter
2009-06-24 19:31:12 -07:00
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
63f12c48a8
make stomp server work with username and password
2009-06-24 19:17:41 -07:00
835799ff16
Separated attachment view components
2009-06-25 00:49:54 +00:00
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
d72a90161b
Only show "tile background" setting once an img has been uploaded
2009-06-24 00:43:48 -07:00
b702461f69
fix bad function call (needed to be static)
2009-06-24 00:27:37 -07:00
2d3e990ed4
Using default theme design values (it was previously set to identica
...
theme)
2009-06-23 21:26:47 +00:00
a21a9f26c5
append uploads to content rather than showing them double
2009-06-23 07:29:43 -07:00
e2becdb251
use a subclass for single notice items to show attachments
2009-06-23 07:25:18 -07:00
7bcaa858af
make file command configurable
2009-06-23 05:35:20 -07:00
205d8afe54
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
2009-06-22 17:13:28 -07:00
9171f16b73
add commandline.inc for parsing
2009-06-22 15:29:24 -07:00
0461aafeef
Merge branch '0.8.x' into cmdline
2009-06-22 14:51:17 -07:00
09e24af683
Add upload location to attachments config section
2009-06-22 21:36:04 +00:00
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
7cf0a4c647
theme dir, path configurable
2009-06-22 09:31:55 -07:00
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
876ab05927
Add like for search
2009-06-21 21:50:35 -07:00
02a4ca9e2e
got rid of 'skin' concept a while ago
2009-06-21 21:38:16 -07:00
b64ac083dd
add collecta.com link
2009-06-21 11:11:12 -07:00
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
aec6456c91
Update copyright dates in files modified in 2009
2009-06-20 16:12:55 -07:00
793a6a1155
change Controlez-Vous to Control Yourself
2009-06-20 16:00:04 -07:00
198afa0a1d
change scripts to take server and path from commandline
2009-06-20 14:58:47 -07:00
054e4459b2
Position of max_file_size position helps IE
2009-06-20 18:22:05 +00:00
b8f3f32f3f
Keep Twitter gateway notices from leaking thru MySQL notice search
2009-06-19 20:21:57 -07:00
9be54a3dcf
Minor indenting
2009-06-19 16:04:14 +00:00
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
597df6a234
better calculation of path
2009-06-18 16:19:26 -07:00
Zach Copley
Evan Prodromou
Sarven Capadisli