GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity
5,346 Commits 8 Branches 4 Tags 310 MiB
1e7df7fbab
Commit Graph

2137 Commits

Author SHA1 Message Date
Craig Andrews
b975a6a0e5 Don't start HTML responses with <?xml if the document is served as text/html. 
Starting a text/html mime type document with <?xml causes some browsers (previous version of Opera and IE) to switch to Quirks Mode.
 2009-08-05 18:55:47 -04:00
Craig Andrews
95ba22c5d7 Switch DOCTYPE's to the XHTML 5 DOCTYPE 2009-08-05 18:27:27 -04:00
Evan Prodromou
7a61b0737d update version to 0.8.1pre1 2009-08-05 16:06:15 -04:00
Zach Copley
3ebbc1c388 Merge branch '0.8.x' into twitter-oauth 2009-08-05 19:01:15 +00:00
Zach Copley
43eb19910f Post to Facebook user's stream if notice has an attachment, otherwise post notice as a status update 2009-08-04 20:49:18 +00:00
Zach Copley
0685b85d8d Use ssl for fetching frinds_timeline from Twitter since it requires auth and is a protected resource 2009-08-04 17:19:05 +00:00
Jeffery To
0155d02cec Fixed PHP Notice "Undefined property: Profile::$value" 2009-08-04 18:45:11 +08:00
Zach Copley
fe9fc15286 Make TwitterStatusFetcher daemon work with OAuth 2009-08-04 02:21:18 +00:00
Zach Copley
f94ee5597d Moved some stuff to a base class 2009-08-04 00:46:18 +00:00
Zach Copley
dccd4aa68d Merge branch '0.8.x' into twitter-oauth 2009-08-03 22:47:57 +00:00
Zach Copley
981fa1b33a Make the TwitterQueuehandler post to Twitter using OAuth 2009-08-03 22:46:01 +00:00
Jeffery To
e670e4306b Fixed PHP Notices: 
Undefined index:  HTTP_X_FORWARDED_FOR
    Undefined index:  HTTP_CLIENT_IP
    Undefined variable: proxy

Also fixed the return value order to match calls to common_client_ip() in actions/api.php and lib/rssaction.php
 2009-08-02 20:10:31 +08:00
Jeffery To
6c1bd67591 Fixed PHP Notice "Undefined index: enclosures" (and a possible one for 'tags') 2009-08-02 19:38:03 +08:00
Jeffery To
b2d2b19d3a Fixed PHP Notice "Use of undefined constant session_name - assumed 'session_name'" 2009-08-02 19:36:09 +08:00
Zach Copley
6f4b2f0ac2 Twitter OAuth server dance working 2009-08-01 08:20:44 +00:00
Craig Andrews
45ad4cfe72 Added a url field to hold the permalink. I believe this field is very useful for api consumers. 2009-07-30 22:43:07 -04:00
Craig Andrews
ec103b90e3 Implemented the "show" method of the laconica groups api 2009-07-30 22:15:24 -04:00
Sarven Capadisli
77c5f9481c Removed default values from <input>s. JavaScript will now get the 
colours from the theme. This approach removes data that was
previously available in HTML. It was only necessary if the user wanted
to know the site's default values.
 2009-07-30 17:06:17 -04:00
Evan Prodromou
854d24b05a Site-wide design configuration 
I added some code so that the site-wide design can be set, using the
configuration interface.

I also moved the configuration option from
$config['site']['design']['background'] to just
$config['design']['background'], but the old syntax will still work.

Conflicts:

	config.php.sample
 2009-07-30 17:05:35 -04:00
Sarven Capadisli
80ad02610a Removed default values from <input>s. JavaScript will now get the 
colours from the theme. This approach removes data that was
previously available in HTML. It was only necessary if the user wanted
to know the site's default values.
 2009-07-30 20:44:51 +00:00
Evan Prodromou
7292c1aa78 Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x 2009-07-30 16:25:38 -04:00
Evan Prodromou
ae81d36137 Site-wide design configuration 
I added some code so that the site-wide design can be set, using the
configuration interface.

I also moved the configuration option from
$config['site']['design']['background'] to just
$config['design']['background'], but the old syntax will still work.
 2009-07-30 16:24:04 -04:00
Craig Andrews
15848a815e Fix the router entries for the oEmbed endpoint so they don't accidentally catch too much 2009-07-30 15:37:35 -04:00
Craig Andrews
6b48fd8f86 move oEmbed router connection after plugins, so other endpoints (such as main/facebooklogin) from plugins don't get accidentally intercepted 2009-07-29 15:33:09 -04:00
Craig Andrews
421ee4297e Fix RDFS namespace declaration. 
Thanks tobyink
 2009-07-28 10:43:40 -04:00
Craig Andrews
ac75772150 Sanitize html returned by oEmbed providers to protect laconica from XSS attacks 2009-07-27 13:42:03 -04:00
Zach Copley
b9cf19a2ee Better error handling when updating Facebook 2009-07-27 02:54:51 +00:00
Craig Andrews
3077876b17 Merge commit 'br3nda/0.8.x-lowercaseutf8' into 0.8.x 2009-07-26 00:59:41 -04:00
Brenda Wallace
d3a72431be lowercase tags using mb_convert_case(), which understands many more alphabets than I do. 2009-07-26 16:34:27 +12:00
Sarven Capadisli
0b47e71e7a Removed <dl> structure from NoticeListItem::showContext. Same as 
committ e0b877b26c.
 2009-07-25 18:26:00 +00:00
Sarven Capadisli
e378341910 Removed <dl> structure from NoticeListItem::showNoticeSource. Same as 
commit e0b877b26c.
 2009-07-25 18:22:05 +00:00
Sarven Capadisli
9c09bfe4d7 Removed <dl> structure from NoticeListItem::showNoticeLink. Reason: 
Arguably, the earlier structure was unnecessarily verbose. Same as commit
e0b877b26c.
 2009-07-25 18:04:45 +00:00
Sarven Capadisli
66a959a776 Removed <dl> structure from NoticeListItem::showReplyLink. Reason: 
Same as commit e0b877b26c.
 2009-07-25 17:44:19 +00:00
Sarven Capadisli
e0b877b26c Removed <dl> structure from NoticeListItem::showDeleteLink. Reason: 
To speed up DOM load by cutting down 3 nodes in each notice list item.
Generally each notice option should be a list item in a <ul>, however,
there is no tangible benefit for the user using this approach. In this
case, minimalism is favoured. Similarly, the new approach will make 5
fewer function calls on the server side.
 2009-07-25 17:37:37 +00:00
Evan Prodromou
a3a5d23c54 dbqueuemanager a little more sane about sleeping 2009-07-23 14:56:21 -07:00
Evan Prodromou
f227006789 whitespace in dbqueuemanager 2009-07-23 14:50:47 -07:00
Craig Andrews
7fff454ff9 Revert "0.9.0 dev version" 
This reverts commit 7cfb2f569d.

This should have never been committed to the 0.8.x branch.
 2009-07-23 13:00:34 -04:00
Craig Andrews
67e674773e Merge commit 'br3nda/0.8.x-tagrssfix' into 0.8.x 2009-07-23 11:16:50 -04:00
Brenda Wallace
a33ffe1357 Call $this->getNotices() always, becuase $this will be the right class. 
e.g.
TagrssAction
 or
PublicrssAction
 2009-07-23 21:46:20 +12:00
Craig Andrews
a54b809778 Merge commit 'jeff-themovie/private-rss' into 0.8.x 2009-07-22 10:25:22 -04:00
Craig Andrews
e70a79d6ab Merge commit 'br3nda/0.8.x-hashtags' into 0.8.x 2009-07-22 10:23:17 -04:00
CiaranG
be5f9ca0e1 Stop daemons using 100% CPU and hammering the DB server when the queue is empty (DBQueueManager-based only) 2009-07-22 09:25:27 +01:00
Craig Andrews
38d70f1386 Add <category> to RSS 2.0, use the same tag finding method for RSS 1.0 as for Atom and RSS 2.0. 
http://laconi.ca/trac/ticket/864
 2009-07-21 18:01:22 -04:00
Evan Prodromou
6467351e32 update dbqueuemanager to respect handler timeout values 2009-07-21 12:52:55 -07:00
Evan Prodromou
0a602725b1 Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x 2009-07-21 12:50:45 -07:00
Evan Prodromou
de987a9e63 update dbqueuemanager to respect handler timeout values 2009-07-21 12:50:32 -07:00
Craig Andrews
52d51fad3c Fixed: Browser language preference's not used when using Google Chrome 
Thanks bambeeq

http://laconi.ca/trac/ticket/620
 2009-07-21 15:10:00 -04:00
Craig Andrews
10a6751ddb Fixed: If the site name contains "." or "@" (and perhaps others), then notification emails (such as the email confirmation email) fail with the error "LOG_ERR: PEAR error: Validation failed for: 
SITE_NAME <noreply@HOSTNAME> :"

Thanks jk3us

http://laconi.ca/trac/ticket/1356
 2009-07-21 14:03:08 -04:00
Craig Andrews
a9613e999f Detect xmpp uri's and make them into hyperlinks 
http://laconi.ca/trac/ticket/1592
 2009-07-21 13:52:59 -04:00
Brenda Wallace
76dd061a34 allow full unicode into links for tags 2009-07-20 14:02:52 +12:00
Brenda Wallace
5909826122 show full utf8 in tags 2009-07-20 14:02:26 +12:00
CiaranG
1139f7cad5 Merge commit 'br3nda/0.8.x-pgfixes' into 0.8.x 2009-07-19 08:05:53 +01:00
Craig Andrews
8e7a8450d3 Make RSS 1.0 more efficient when the same hashtag is used in multiple notices. 
Thanks tobyink
 2009-07-17 23:08:19 -04:00
Craig Andrews
441c276859 Add link to conversation pages when possible. 
Thanks tobyink
 2009-07-17 23:06:14 -04:00
Craig Andrews
7237d59aab Fix RDFS namespace declaration. 
Thanks tobyink
 2009-07-17 22:59:58 -04:00
Zach Copley
64853769b3 Moved $_id from queuehandler to daemon, as other daemons need it too. 2009-07-17 18:07:53 -07:00
Zach Copley
3474a0f04e Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x 
* '0.8.x' of git@gitorious.org:laconica/mainline:
  Moved oembed endpointer so openid no longer incorrectly prompts for authentication
 2009-07-17 14:26:34 -07:00
Zach Copley
44f3f2bd2a Only create attachment elements if attachment is an enclosure 2009-07-17 14:25:36 -07:00
Craig Andrews
f0d17afc7b Moved oembed endpointer so openid no longer incorrectly prompts for authentication 2009-07-17 17:11:26 -04:00
Zach Copley
9c670ba695 Only populate attachments array element if there are attachments 2009-07-17 12:42:16 -07:00
Zach Copley
baec1320ab Also show XML representation of attachments in the API 2009-07-17 12:42:05 -07:00
Craig Andrews
3dbbefd5ad Merge branch 'oembed-provider' into 0.8.x 2009-07-17 12:33:56 -04:00
Craig Andrews
9ed117dc3a Move the oembed endpoint to /main/oembed 2009-07-17 12:33:12 -04:00
Jeffery To
1aea598977 Merge branch '0.9.x' into private-rss 2009-07-17 16:54:46 +08:00
Jeffery To
5015505f16 Added failed auth logging (like in actions/api.php) 2009-07-17 16:44:14 +08:00
Sarven Capadisli
9b372f5bb7 Added form_note for notice character count. 
http://laconi.ca/trac/ticket/1712
 2009-07-16 19:58:43 +00:00
Evan Prodromou
7cfb2f569d 0.9.0 dev version 2009-07-16 00:16:30 -04:00
Evan Prodromou
c07c4b2050 change version to 0.8.1dev 2009-07-15 23:36:08 -04:00
Craig Andrews
75545cdc07 Added attachment information to the json responses 2009-07-15 10:37:50 -04:00
Craig Andrews
0aeea42724 Added stub oembed api endpoint 2009-07-15 10:29:54 -04:00
Brenda Wallace
3722b90a27 use single quotes in sql 2009-07-15 20:19:01 +12:00
Brenda Wallace
15042ed50b added user_group.design_id into the group by clause 2009-07-15 20:17:17 +12:00
Brenda Wallace
1a151ff6f6 used SQL standard LIMIT/OFFSET, because every database can understand that 2009-07-15 20:17:01 +12:00
Craig Andrews
593af9feb6 Moved the decision logic as to whether an attachment should be an enclosure to the File class 2009-07-14 13:33:40 -04:00
Jeffery To
ae6a3e258d Adds HTTP basic authentication for private RSS 1.0 feeds 2009-07-14 03:45:12 +08:00
Craig Andrews
e047ba52c7 Merge branch 'tags-timeline-api' into 0.8.x 2009-07-13 14:58:39 -04:00
Toby Inkster
38784141d1 Copy isset($attachment->filename) fix from RSS 1.0 to RSS 2.0 and Atom 1.0 feeds. 2009-07-13 16:56:52 +01:00
Toby Inkster
ae2bc6a850 Add notice tags to RSS 1.0 output. 2009-07-13 15:37:15 +01:00
Toby Inkster
a68773df63 Improve output for files/attachments. 2009-07-13 15:16:10 +01:00
Craig Andrews
91324890ae Add timeline tags API (RSS 2.0 and Atom feeds) 2009-07-12 15:07:54 -04:00
Zach Copley
0ac08c1fb3 Make get_group() behave more like get_user() 2009-07-10 18:22:19 -07:00
Zach Copley
544a14d290 Move groups timeline API method into groups API action 2009-07-10 17:56:01 -07:00
Zach Copley
5b3d4f7121 Merge branch 'candrews-review' into 0.8.x 
* candrews-review:
  added group status api, located at /api/statuses/group_timeline/ID.rss
 2009-07-10 16:11:31 -07:00
Zach Copley
4a1d7ad082 Merge branch 'candrews-review' into 0.8.x 2009-07-10 21:03:44 +00:00
Craig Andrews
08d50655f3 added group status api, located at /api/statuses/group_timeline/ID.rss 
http://laconi.ca/trac/ticket/1702
 2009-07-10 17:00:27 -04:00
Evan Prodromou
6a0f0e32d5 Merge branch '0.8.x' into 0.9.x 2009-07-10 10:06:20 -07:00
Evan Prodromou
15f6309dea add a little syntactical sugar for adding plugins 2009-07-09 23:12:53 -07:00
Evan Prodromou
f527b8a8d7 wrong order for span and a in profilesection 2009-07-09 17:40:11 -07:00
Evan Prodromou
8b65883f9d cache frequently-used subscriber, subscription, notice and fave count values 2009-07-09 17:28:38 -07:00
Craig Andrews
8250006fbf When a notice is posted with an attachment, the facebook stream update has media displayed inline, or as links. 
http://laconi.ca/trac/ticket/1685
 2009-07-09 18:42:19 -04:00
Evan Prodromou
03ccb74052 0.9.0 dev version 2009-07-09 18:22:46 -04:00
Evan Prodromou
efd94b4e54 change version number to 0.8.0 2009-07-09 18:22:10 -04:00
Evan Prodromou
b78801becb correct the newuser default setting in common.php 2009-07-09 18:19:13 -04:00
Evan Prodromou
262c581ea7 Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-07-09 15:26:22 -04:00
Evan Prodromou
0828fde51c one more shot at servicing queues 2009-07-09 15:25:59 -04:00
Sarven Capadisli
2197d0bacf Added width/height attribute and values for the creative commons image 2009-07-09 19:12:50 +00:00
Zach Copley
db58756275 Merge branch 'candrews-review' into 0.8.x 
* candrews-review:
  Notice attachments are enclosures in feeds (Atom, RSS 1.0/RDF, and RSS 2.0).
 2009-07-09 11:28:21 -07:00
Evan Prodromou
43e0b308fd Revert "Let the queue handlers drain their xmpp queues" 
This reverts commit fc3442a041.
 2009-07-09 13:39:22 -04:00
Evan Prodromou
fc3442a041 Let the queue handlers drain their xmpp queues 2009-07-09 13:26:09 -04:00
Craig Andrews
69574591d0 Notice attachments are enclosures in feeds (Atom, RSS 1.0/RDF, and RSS 2.0). 
http://laconi.ca/trac/ticket/1690
 2009-07-09 13:18:57 -04:00
Evan Prodromou
031146f4c7 yet another select() refinement 2009-07-09 12:49:37 -04:00
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