Evan Prodromou
eccab87044
slightly more robust select() logic
2009-07-09 12:33:38 -04:00
Evan Prodromou
03200235b1
use select() to bring down xmpp latency
2009-07-09 12:09:20 -04:00
Evan Prodromou
1daad01f36
slightly better timing
2009-07-09 11:40:01 -04:00
Evan Prodromou
d7611009b1
Revert "give processtime a minimum of 1s"
...
This reverts commit d2e83b6a67
.
2009-07-09 11:16:50 -04:00
Evan Prodromou
d2e83b6a67
give processtime a minimum of 1s
2009-07-09 10:40:24 -04:00
Evan Prodromou
14267381e9
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
2009-07-09 10:11:31 -04:00
Evan Prodromou
a5212dd6e3
timeouts and pings for xmppqueuehandlers
2009-07-09 10:11:13 -04:00
Zach Copley
bbb25e2153
Better error handling for FacebookQueueHandler
2009-07-09 02:04:38 +00:00
Zach Copley
616d68cf94
Better error handling for TwitterQueueHandler
2009-07-09 00:40:12 +00:00
Evan Prodromou
8aef0e4271
manually re-enqueue failed notices
2009-07-08 17:55:43 -04:00
Zach Copley
06bf2e2413
Get rid of the other error trying to property on a non-obj
2009-07-08 01:02:12 -07:00
Zach Copley
2ed9d2dac5
Get rid of error ('Trying to get property of non-object')
2009-07-08 00:30:18 -07:00
Evan Prodromou
a626f32d8e
log errors in handling notices
2009-07-08 01:36:12 -04:00
Evan Prodromou
f6c8efdce6
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
2009-07-07 21:16:19 -04:00
Evan Prodromou
b25e6139e8
check for array before checking xmlrpc fault
2009-07-07 21:15:39 -04:00
Sarven Capadisli
79b06ade27
Removed OpenID link from the primary global navigation in order to
...
keep a single Login idea because we have several ways to login
already: regular login, OpenID and Facebook (and probably LDAP, Open
Social in the future)
2009-07-08 00:42:14 +00:00
CiaranG
d846c5fc99
Merge commit 'br3nda/0.8.x-noticesfix' into 0.8.x
2009-07-07 20:53:28 +01:00
Evan Prodromou
84e676b687
Merge branch 'queuemanager' into 0.8.x
2009-07-07 11:35:00 -04:00
Evan Prodromou
dd705ddaf7
Merge branch 'tos' into 0.8.x
2009-07-07 11:34:49 -04:00
Zach Copley
d40075ae9c
Support undocumented 'id' parameter in /statuses/show API method
2009-07-06 11:57:21 -07:00
Evan Prodromou
5875c02cbb
also hide your own design
2009-07-05 14:37:37 -04:00
Evan Prodromou
e6c54a59e1
set/get viewdesigns flag and use it
2009-07-05 14:33:12 -04:00
Evan Prodromou
83adf9fa1a
don't hide unsub button for remote users
2009-07-05 11:47:14 -04:00
Evan Prodromou
23e6dafff6
better handling of frames and notices
2009-07-05 11:01:07 -04:00
Evan Prodromou
66a4a60e0b
better debug logging in stomp queue manager
2009-07-04 01:43:18 -04:00
Evan Prodromou
49eaa04b50
return singleton if initialized
2009-07-04 01:42:42 -04:00
Evan Prodromou
9dee9e1612
new default daemon jid
2009-07-04 01:20:39 -04:00
Evan Prodromou
6d72864618
don't try to show non-object
2009-07-04 01:17:37 -04:00
Evan Prodromou
f63702579a
don't say we're connecting if we're not
2009-07-04 01:16:58 -04:00
Evan Prodromou
49c5c6f92b
move handling code into queuemanager
2009-07-04 00:31:28 -04:00
Evan Prodromou
741eb1a28b
Merge branch '0.8.x' into queuemanager
2009-07-03 23:34:44 -04:00
Zach Copley
e3c70cc30c
Merge branch 'friendships_show' into 0.8.x
...
* friendships_show:
Implement friendships/show API method
Route and stub for new friendships/show API method
2009-07-03 15:43:14 -07:00
Zach Copley
a2a4cc35f6
Implement friendships/show API method
2009-07-03 15:42:12 -07:00
Evan Prodromou
c04e3c7769
only show subscribe button in profile list for local users
2009-07-03 10:14:02 -04:00
Evan Prodromou
72d0ee4e25
move peoplesearchresults class to action/peoplesearch
2009-07-03 10:10:12 -04:00
Evan Prodromou
3e4be98ff6
add _queueName function
2009-07-03 10:05:07 -04:00
Evan Prodromou
00074cda73
Merge branch '0.8.x' into queuemanager
2009-07-03 03:08:34 -04:00
Zach Copley
acb4c78346
Route and stub for new friendships/show API method
2009-07-02 17:32:27 -07:00
Zach Copley
d80c553e5f
Make logging facility configurable
2009-07-02 16:06:13 -07:00
Evan Prodromou
e8f27025ba
more logging in stompqueuemanager
2009-07-02 12:43:09 -04:00
Sarven Capadisli
a9c83b064f
Added event to let the site owner add more information into <address>
...
for contact e.g., email, location, tagline
2009-07-02 16:06:06 +00:00
Sarven Capadisli
35a5934503
Changed sioc:reply_to to sioc:reply_of
2009-07-02 15:38:25 +00:00
Evan Prodromou
5f9a4ebef4
Merge branch '0.8.x' into queuemanager
2009-07-02 08:51:10 -04:00
Zach Copley
734f631e1e
Show correct number of profile avatars and 'all' link in subs asides
2009-07-01 18:40:14 -07:00
Evan Prodromou
721ba6c88f
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
2009-07-01 12:58:49 -04:00
Evan Prodromou
8a8390c1a7
exclude p argument when calculating selfUrl
2009-07-01 12:58:16 -04:00
Evan Prodromou
e52997e52f
change queuehandler class to use queuemanager interface
2009-07-01 12:11:02 -04:00
Evan Prodromou
a35138b268
add fail() method to dbqueuemanager and fix logging
2009-07-01 12:10:25 -04:00
Evan Prodromou
2325d934a8
add fail() method to stompqueuemanager
2009-07-01 12:10:11 -04:00
Evan Prodromou
557418bc1e
better transport choices when xmpp is disabled
2009-07-01 12:09:41 -04:00
Evan Prodromou
887d35cfc8
better queue manager detection, new method fail()
2009-07-01 12:09:18 -04:00
Evan Prodromou
f61645aef8
take out session handler notification
2009-07-01 11:38:10 -04:00
Evan Prodromou
e0bf8ad95b
Add UnQueueManager for immediate handling
...
Perhaps it's a little precious, but I took out the switches in
util.php to determine what's supposed to be sent when, and made
a queuemanager class that will just do things when they're supposed to
be done.
2009-07-01 11:34:12 -04:00
Evan Prodromou
7b66a12913
save frames for StompQueueManager
2009-07-01 11:10:23 -04:00
Evan Prodromou
4c256a6d7e
better hook variables for StartQueueManager
2009-07-01 11:09:58 -04:00
Evan Prodromou
58b427869a
compile errors in DBQueueManager
2009-07-01 11:09:42 -04:00
Jeff Mitchell
b416df9312
Add site-wide option to change the length at which URLs are auto-shortened
2009-06-30 16:46:33 -07:00
Zach Copley
ccbc5c447d
Merge commit 'jeff-themovie/small-fixes' into 0.8.x
...
* commit 'jeff-themovie/small-fixes':
Fix missing max_id in API search calls
Fix "Trying to get property of non-object" errors when a user tries to log in using an unknown nickname
Fix "Trying to get property of non-object" errors when accessing the people search results page
Fix "Undefined variable: cnt"
Fix "Trying to get property of non-object" errors in groupeditform.php
Fix "Undefined property: DisfavorAction::$id"
2009-06-30 16:25:52 -07:00
Zach Copley
b10dba2798
Merge commit 'jeff-themovie/invite-enabled' into 0.8.x
...
* commit 'jeff-themovie/invite-enabled':
Adds $config['invite']['enabled'] to enable/disable invites.
2009-06-30 16:10:12 -07:00
Jeff Mitchell
c3cffaf9c7
Laconica defaults to a locale 'en' which uses language 'en'. Unfortunately, this language doesn't exist -- properly it's en_US. This causes a lot of spammy messages in syslog. This fix simply changes 'en' to have
...
the same properties as 'en-us', i.e. a language of en_US and a description of 'English (US)'.
2009-06-30 14:36:40 -07:00
Zach Copley
4321e02c7b
Delete orphaned background imgs. Design settings code now passes
...
phpcs.
2009-06-29 16:57:36 -07:00
Zach Copley
a23b612ae9
Small comment change (default is for both users an groups)
2009-06-29 15:37:13 -07:00
Zach Copley
135927e42a
Allow users and groups to reset their design to system default colors
2009-06-29 14:52:38 -07:00
Zach Copley
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
Evan Prodromou
14575fe6fc
better output for common error handler
2009-06-28 19:24:14 -04:00
Evan Prodromou
6557a569e5
fix logging error
2009-06-28 17:41:16 -04:00
Evan Prodromou
5cc58f1e01
note when going background
2009-06-28 17:38:02 -04:00
Evan Prodromou
9f079764aa
extract log-line formatting to its own function
2009-06-28 16:38:27 -04:00
Evan Prodromou
6ca4dfa7ef
Daemon can optionally not go into the background
2009-06-28 16:12:23 -04:00
Evan Prodromou
495c85544a
don't canonicalize people's text into URLs
2009-06-28 15:21:15 -04:00
Evan Prodromou
854c82cfd5
start of queuemanager code
2009-06-28 14:38:34 -04:00
Evan Prodromou
e5b758dbbe
start of queuemanager code
2009-06-28 14:38:31 -04:00
Evan Prodromou
871f598dcc
debug flag for sessions
2009-06-27 08:11:09 -07:00
Evan Prodromou
70521d55a8
log IP for API auth errors
2009-06-27 07:37:58 -07:00
Evan Prodromou
7af94dc125
some debugging code for sessions
2009-06-27 07:09:21 -07:00
Evan Prodromou
71dad1ff62
use the session class to store sessions
2009-06-27 06:20:24 -07:00
Evan Prodromou
0ca22cf6e2
a memcached_dataobject class for saving sessions
2009-06-27 05:48:22 -07:00
Evan Prodromou
ce76d61957
marker in sessions
2009-06-27 05:07:14 -07:00
Sarven Capadisli
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
Jeffery To
612a107e09
Merge branch '0.8.x' into small-fixes
2009-06-26 15:44:31 +08:00
Jeffery To
6328add622
Merge branch '0.8.x' into invite-enabled
2009-06-26 15:31:42 +08:00
Zach Copley
4662a4fa0d
Add attachment action back into router
2009-06-25 14:05:06 -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
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
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
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
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
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
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
Sarven Capadisli
2d3e990ed4
Using default theme design values (it was previously set to identica
...
theme)
2009-06-23 21:26:47 +00:00
Jeffery To
280f8faab4
Merge branch '0.8.x' into small-fixes
...
Conflicts:
lib/peoplesearchresults.php
lib/profilelist.php
2009-06-24 01:25:55 +08:00
Evan Prodromou
a21a9f26c5
append uploads to content rather than showing them double
2009-06-23 07:29:43 -07:00
Evan Prodromou
e2becdb251
use a subclass for single notice items to show attachments
2009-06-23 07:25:18 -07:00
Evan Prodromou
7bcaa858af
make file command configurable
2009-06-23 05:35:20 -07:00