GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity
6,208 Commits 8 Branches 4 Tags 310 MiB
3874269a0b
Commit Graph

2445 Commits

Author SHA1 Message Date
Evan Prodromou
4737563b95 a distributed -> the distributed 2009-08-25 18:14:12 -04:00
Evan Prodromou
c8b8f07af1 change Laconica and Control Yourself to StatusNet in PHP files 2009-08-25 18:12:20 -04:00
Evan Prodromou
d0baab6978 Merge branch '0.8.x' into testing 2009-08-25 18:01:46 -04:00
Craig Andrews
a2117961be Allow ({['" to preceded #tags 2009-08-25 17:54:08 -04:00
Zach Copley
9b9d80cd97 Pluginized Twitter settings stuff 2009-08-25 14:52:25 -07:00
Sarven Capadisli
ada615d3ca Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x 2009-08-25 21:50:38 +00:00
Sarven Capadisli
fc89c345ed userdesign.go.js was incorrectly removed in commit 
304db1d30b
 2009-08-25 21:48:55 +00:00
Craig Andrews
31329c33ae Handle grouping symbols ()[]{} correctly. Now passing all tests! 2009-08-25 16:41:44 -04:00
Craig Andrews
ff836eb38a Add UTF-8 encodings of the IDN TLDs 2009-08-25 14:19:05 -04:00
Craig Andrews
210bc4248b All tests pass except for those that require matching parens or brackets 2009-08-25 14:12:31 -04:00
Craig Andrews
6a3a25b5a2 Improved the URL tests, and improve the matcher so more tests are passed. The remaining failing tests I believe are incorrect. 2009-08-25 11:21:45 -04:00
Evan Prodromou
ce442c049b remove some merge cruft from the end of twitter.php 2009-08-24 17:44:19 -04:00
Evan Prodromou
ff87732053 Merge branch '0.8.x' into testing 
Conflicts:
	actions/twitterauthorization.php
	lib/oauthclient.php
	lib/twitter.php
	lib/twitterapi.php
	lib/twitteroauthclient.php
	scripts/twitterstatusfetcher.php
 2009-08-24 16:55:49 -04:00
Zach Copley
aa4066bac6 Use ssl for fetching frinds_timeline from Twitter since it requires auth and is a protected resource 2009-08-24 11:54:35 -04:00
Zach Copley
fd9d653eb3 Make TwitterStatusFetcher daemon work with OAuth 2009-08-24 11:53:43 -04:00
Zach Copley
ee006dbb0e Moved some stuff to a base class 2009-08-24 11:53:21 -04:00
Zach Copley
500f0c7072 Make the TwitterQueuehandler post to Twitter using OAuth 2009-08-24 11:52:28 -04:00
Zach Copley
e9edaab358 Twitter OAuth server dance working 2009-08-24 11:52:15 -04:00
Evan Prodromou
77f303c2be Merge branch 'master' into testing 
Conflicts:
	lib/rssaction.php
	lib/twitterapi.php
 2009-08-24 11:28:16 -04:00
Craig Andrews
86ba7b13c2 Finally got the IPv6 regex right in the url finder 2009-08-21 22:58:43 -04:00
Craig Andrews
579a41b56f Improve url finding more. Properly end urls when a space is caught. 2009-08-21 21:11:23 -04:00
Craig Andrews
0615fda25e URLs surrounded by (),{}, and [] are correctly handled now! 2009-08-21 20:01:33 -04:00
Evan Prodromou
59beff6b46 Revert "Added configuration option to only allow OpenID logins." 
This reverts commit 14b46e2183.

This functionality will need to be rewritten to work with the new
OpenIDPlugin.

Conflicts:

	index.php
	lib/logingroupnav.php
 2009-08-21 16:45:42 -04:00
Evan Prodromou
bacef32aac Revert "Added a configuration option to disable OpenID." 
This reverts commit 7dc3a90d12.

Conflicts:

	actions/login.php
	actions/register.php
	lib/accountsettingsaction.php
	lib/common.php
	lib/logingroupnav.php
 2009-08-21 16:38:39 -04:00
Evan Prodromou
9f356b55c6 Merge branch '0.9.x' into openidplugin 
Conflicts:
	actions/login.php
	actions/register.php
 2009-08-21 16:27:43 -04:00
Evan Prodromou
8236037bf0 Merge branch 'dbconfig' into 0.9.x 
Conflicts:
	lib/common.php
 2009-08-21 16:17:06 -04:00
Evan Prodromou
538dcf2eef load configuration options from database at runtime 2009-08-21 16:14:32 -04:00
Brion Vibber
5c21a371d6 Include php-gettext 1.0.7 into extlibs; loading it up if native gettext extension is not present. 
This provides a pure PHP implementation of the gettext functions.

This should help get laconica running on shared hosting environments where PHP's gettext module may not be installed.
Also gets us one step closer to running on Mac OS X 10.5 with Apple's preinstalled PHP, which doesn't provide an easy way to add modules.

Source: http://savannah.nongnu.org/projects/php-gettext
Copyright (c) 2005 Steven Armstrong <sa at c-area dot ch>
GPLv2 or later
 2009-08-21 16:01:51 -04:00
Craig Andrews
871903a319 Linkifier support many more urls, and less mismatches 2009-08-21 15:56:15 -04:00
Evan Prodromou
b2664e1ae2 Merge branch '0.8.x' into 0.9.x 
Conflicts:
	actions/updateprofile.php
	actions/userauthorization.php
	classes/User_group.php
	index.php
	install.php
	lib/accountsettingsaction.php
	lib/logingroupnav.php
 2009-08-21 15:42:11 -04:00
Craig Andrews
70ca03f336 Use currying to call the url callbacks, and use preg_replace_callback 
This definitely looks neater than the string maniplation it replaces
 2009-08-21 12:47:01 -04:00
Evan Prodromou
d1cc159a04 facebook action correctly checks max notice length 2009-08-21 08:23:52 -04:00
Evan Prodromou
35bf388204 url-shortening check correctly checks max notice length 2009-08-21 08:16:08 -04:00
Evan Prodromou
3eeb9deffb Web UI for notices correctly shows and checks max content length 2009-08-21 08:13:17 -04:00
Evan Prodromou
de5382d4ca message input form correctly shows and check max length 2009-08-21 07:23:27 -04:00
Evan Prodromou
eb309f788b correctly check Message length for d-commands 2009-08-21 07:21:29 -04:00
Evan Prodromou
7a68272580 correct instructions for length in groupeditform 2009-08-21 06:37:22 -04:00
Evan Prodromou
a28bbdfb0f configuration options for text limits 2009-08-21 06:33:22 -04:00
Evan Prodromou
c8b3557802 make common_config() handle nulls correctly 2009-08-21 06:33:12 -04:00
Evan Prodromou
3acdda4327 reformat groupeditform.php 2009-08-21 06:17:13 -04:00
Evan Prodromou
4b2aa51750 Merge branch '0.9.x' of git@gitorious.org:laconica/mainline into 0.9.x 2009-08-20 17:13:40 -04:00
Marcel van der Boom
418a5a95ab Change the notice type defines all into class constants and adapt all files. 2009-08-20 13:11:22 -04:00
Francois Marier
986d95b31e Fix the default value of ['server']['path'] when running from command line scripts 
The logic in _sn_to_path() doesn't make sense when not running via a remote server.

Default to the empty string if running from the command line and ['server']['path']
is not set manually in config.php
 2009-08-20 17:46:26 +12:00
Craig Andrews
f4e4a8dd8a Removed all the redundant logic in common_replace_urls_callback 
Modified the regex so that strings such as /usr/share/perl5/HTML/Mason/ApacheHandler.pm as not turned into links
 2009-08-18 20:42:06 -04:00
Craig Andrews
ce004083d9 IPv4 and IPv6 addresses are picked up in URLs 
Added ".onion" as a possible TLD
 2009-08-18 14:15:55 -04:00
Craig Andrews
136a69a387 Merge commit 'jeff-themovie/0.8.x-openid-enabled' into 0.8.x 2009-08-16 19:50:37 -04:00
Jeffery To
75a0a3e18b Fixed OpenID appearing in primary nav when OpenID is enabled but not OpenID-only 2009-08-15 00:17:00 +08:00
Evan Prodromou
2cf50ea432 whitespace in error.php 2009-08-14 08:04:03 -07:00
Jeffery To
7dc3a90d12 Added a configuration option to disable OpenID. 
If $config['openid']['enabled'] is set to false, OpenID is removed from
the navigation and direct accesses to OpenID login pages redirect to the
login page.

If OpenID is enabled, $config['site']['openidonly'] is ignored, i.e.
OpenID is required to go OpenID-only.
 2009-08-13 22:18:06 +08:00
Evan Prodromou
a0f6b4f078 ServerErrorAction always logs 2009-08-12 11:16:57 -07:00
Evan Prodromou
347f74d650 ServerErrorAction always logs 2009-08-12 11:16:31 -07:00
Craig Andrews
853b6d38b3 Define the member variable N 
N is defined in the DB_DataObject class, which this class kind of extends. So to keep a consistent interface for consumers, we need to have N defined here.
 2009-08-12 11:53:46 -04:00
Craig Andrews
7eda7295e4 oEmbed provider does not use the twitter api library classes any more 2009-08-11 21:15:42 -04:00
Craig Andrews
b93df1ccbc Merge commit 'jeff-themovie/0.8.x-private-search' into 0.8.x 2009-08-11 10:39:44 -04:00
Evan Prodromou
2d29800b6f Merge branch 'master' into 0.8.x 
Conflicts:
	lib/mail.php
	lib/rssaction.php
	lib/twitterapi.php
 2009-08-11 10:23:11 -04:00
Jeffery To
4d37e919ec Don't show Search in the primary nav if the user isn't logged in and the site is private 2009-08-11 20:47:41 +08:00
Brett Taylor
d6bcc635bb two variables $public and $system were generating notices in lib/htmloutputter.php, removed because these two parameters are null by default. 2009-08-11 15:53:37 +12:00
Evan Prodromou
3cdefe9983 Revert "Typo, session_name is a function." 
This reverts commit d0793c0f44.
 2009-08-10 16:42:10 -04:00
Craig Andrews
e9ed20a69d Merge commit 'jeff-themovie/0.8.x-openidonly' into 0.8.x 2009-08-10 11:53:35 -04:00
Adrian Lang
d0793c0f44 Typo, session_name is a function. 2009-08-10 15:24:27 +02:00
Adrian Lang
ec88d2650e Replace own OMB stack with libomb. 2009-08-10 14:48:50 +02:00
Zach Copley
17dcf1c317 Merge branch 'twitter-oauth' into 0.8.x 
Conflicts:

	scripts/getvaliddaemons.php
 2009-08-10 07:49:51 +00:00
Zach Copley
27548c6903 I forgot that we don't do database upgrades for point releases. So I've 
changed Twitter OAuth to store token and token secret in the same field
in foreign_link (credentials).  This should be changed in 0.9.
 2009-08-10 07:00:59 +00:00
Zach Copley
fa8433308f Moved some stuff around. More comments and phpcs compliance. 2009-08-10 06:05:43 +00:00
Jeffery To
14b46e2183 Added configuration option to only allow OpenID logins. 
If $config['site']['openidonly'] is set to true:
* the Login/Register pages will be removed from the navigation;
* directly accesses to the Login/Register pages will redirect to the
  OpenID login page;
* most links to the Login/Register pages will link to the OpenID login
  page instead.

The user will still need to set a password to access the API and RSS
feeds.
 2009-08-10 13:57:39 +08:00
Craig Andrews
060d5c4b8e Fix logic that determines if a URL is relative or absolute in script() and cssLink() 2009-08-08 22:56:42 -04:00
Zach Copley
e3bb64cd6c Merge branch '0.8.x' into twitter-oauth 2009-08-08 18:11:47 +00:00
Zach Copley
9ec022df93 Only populate attachments array element if there are attachments 2009-08-08 00:57:49 +00:00
Zach Copley
348fa35c6b Also show XML representation of attachments in the API 2009-08-08 00:57:41 +00:00
Zach Copley
0cfdc2b91b Post to Facebook user's stream if notice has an attachment, otherwise post notice as a status update 2009-08-08 00:57:29 +00:00
Zach Copley
2399908138 Better error handling when updating Facebook 2009-08-08 00:57:21 +00:00
Brenda Wallace
4e7546fbe2 Call $this->getNotices() always, becuase $this will be the right class. 
e.g.
TagrssAction
 or
PublicrssAction
 2009-08-08 00:56:01 +00:00
anontwit
468252ee6a bug 1770 conversation link for email 2009-08-07 18:32:15 -04:00
Craig Andrews
a7a87913be Redirect instead of showing an error when the user visits a non-local notice's url 
Use consistent logic in display non-local notice links

Fixes http://laconi.ca/trac/ticket/1788
 2009-08-07 18:26:12 -04:00
Craig Andrews
11086c7823 Implemented the list_all and list groups API methods as defined at http://laconi.ca/trac/wiki/ProposedGroupsAPI 
Made the Autocomplete plugin also autocomplete groups
 2009-08-07 18:00:04 -04:00
Craig Andrews
f917485a0d Merge commit 'jeff-themovie/0.8.x-jsonsearchresultslist' into 0.8.x 2009-08-06 22:39:38 -04:00
Craig Andrews
1c3a1360a9 Merge commit 'jeff-themovie/0.8.x-subsystems-enabled' into 0.8.x 2009-08-06 22:38:06 -04:00
Zach Copley
c03d593287 Make TwitterStatusFetcher extend ParallelizingDaemon 2009-08-06 22:52:58 +00:00
Craig Andrews
04ed583cc5 remove redundant/unnecessary lines 2009-08-06 18:05:46 -04:00
Craig Andrews
26b608d914 Support the 'lite' parameter to statuses/friends and statuses/followers twitter api methods. 
http://laconi.ca/trac/ticket/1786
 2009-08-06 15:14:27 -04:00
Jeffery To
7c9e12a0b8 Fixed IM and SMS enabled options to default to true. 2009-08-07 01:57:43 +08:00
Jeffery To
5f293f0e2f Added configuration option to disable post-by-email. 
This hides the relevant settings from the email settings page and
prevents maildaemon.php from processing email if the option is
disabled.
 2009-08-07 01:55:31 +08:00
Jeffery To
93f585446e Added configuration options to enable/disable SMS and Twitter integration. 
This disables the IM, SMS and Twitter settings pages and queue handlers
depending on the config options.
 2009-08-07 01:18:17 +08:00
Craig Andrews
e386a75d1b Check theme first for CSS files, then use the non-theme path. 
Fixes CSS links in plugins
 2009-08-06 13:07:14 -04:00
Jeffery To
ad1c91a1cf Fixed missing/null values from JSON search results 2009-08-07 00:03:50 +08:00
Craig Andrews
c8c2d9d7c9 Make 2nd and 3rd cssLink() arguments optional 2009-08-06 11:18:57 -04:00
Zach Copley
421e33f145 - Rewrote SyncTwitterFriends as a daemon 
- Made it use OAuth
- Code clean up
 2009-08-06 07:03:05 +00:00
Zach Copley
6d29592ec7 Abstract out the parallelizing daemon stuff 2009-08-06 01:15:08 +00:00
Craig Andrews
2eaf738bf7 Handle relative and absolute url parameters to script() and cssLink() 2009-08-05 20:28:46 -04:00
Craig Andrews
304db1d30b Use script() and cssLink() methods everywhere instead of manually writing out javascript and css each time 2009-08-05 19:45:12 -04:00
Craig Andrews
6a76addbe8 Added cssLink() and script() functions to htmloutputter 2009-08-05 19:35:42 -04:00
Craig Andrews
feac024348 Accidentally caused the DOCTYPE to never be rendered - fix that. 2009-08-05 19:24:34 -04:00
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
Evan Prodromou
622c0b24c3 move redirect-to-openid code to OpenID plugin 2009-08-04 13:17:43 -04:00
Evan Prodromou
000e21be19 Merge branch '0.9.x' into openidplugin 2009-08-04 13:10:43 -04:00
Evan Prodromou
8f122dd71e new action for when we redirect to login page 2009-08-04 13:10:37 -04:00
Evan Prodromou
3997682d26 incorrectly moved user xrds to OpenID plugin; fixing 2009-08-04 13:01:23 -04:00
Evan Prodromou
0616ea0205 move check for SSL from util.php to OpenIDPlugin 2009-08-04 13:01:23 -04:00
Evan Prodromou
3245357749 add account settings menu item for OpenID 2009-08-04 13:01:23 -04:00
Evan Prodromou
7a742a0572 show OpenID action in login nav 2009-08-04 13:01:23 -04:00
Evan Prodromou
6d64882270 OpenIDPlugin sets up actions for router 2009-08-04 13:01:23 -04:00
Evan Prodromou
2b79b4d21f Move OpenID-related files to OpenID plugin directory 
As a first step to pluginizing our OpenID support, I've moved the
important OpenID-related files to a dedicated plugin directory. Many
of these classes are still referred to by libraries that are still in
core.
 2009-08-04 13:01:23 -04:00
Evan Prodromou
9421b36498 add an event for head children 2009-08-04 13:01:06 -04:00
Evan Prodromou
c378cc976f add an event for determining if an action is sensitive 2009-08-04 08:58:24 -04:00
Evan Prodromou
6937704ebd give plugins a chance to autoload their classes 2009-08-04 07:34:58 -04:00
Evan Prodromou
58f85463ef error in EndLoginGroupNav arguments 2009-08-04 07:17:14 -04:00
Evan Prodromou
84ca1482ff add hook for showing account settings menu 2009-08-04 07:08:10 -04:00
Evan Prodromou
b3ba7669df Add hooks for Start/End LoginGroupNav 2009-08-04 06:52:57 -04:00
Jeffery To
0155d02cec Fixed PHP Notice "Undefined property: Profile::$value" 2009-08-04 18:45:11 +08:00
Evan Prodromou
b995370d4a 0.9.0 dev version 2009-08-04 06:05:04 -04: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
Evan Prodromou
7bcaa858af make file command configurable 2009-06-23 05:35:20 -07:00
Evan Prodromou
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
Evan Prodromou
9171f16b73 add commandline.inc for parsing 2009-06-22 15:29:24 -07:00
Evan Prodromou
0461aafeef Merge branch '0.8.x' into cmdline 2009-06-22 14:51:17 -07:00
Zach Copley
09e24af683 Add upload location to attachments config section 2009-06-22 21:36:04 +00:00
Zach Copley
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
Evan Prodromou
7cf0a4c647 theme dir, path configurable 2009-06-22 09:31:55 -07:00
Zach Copley
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
Evan Prodromou
876ab05927 Add like for search 2009-06-21 21:50:35 -07:00
Evan Prodromou
02a4ca9e2e got rid of 'skin' concept a while ago 2009-06-21 21:38:16 -07:00
Evan Prodromou
b64ac083dd add collecta.com link 2009-06-21 11:11:12 -07:00
Evan Prodromou
de0335fbe9 add TOS to footer menu if brought-by available 2009-06-20 22:36:56 -07:00
Evan Prodromou
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
Evan Prodromou
aec6456c91 Update copyright dates in files modified in 2009 2009-06-20 16:12:55 -07:00
Evan Prodromou
793a6a1155 change Controlez-Vous to Control Yourself 2009-06-20 16:00:04 -07:00
Evan Prodromou
198afa0a1d change scripts to take server and path from commandline 2009-06-20 14:58:47 -07:00
Sarven Capadisli
054e4459b2 Position of max_file_size position helps IE 2009-06-20 18:22:05 +00:00
Zach Copley
b8f3f32f3f Keep Twitter gateway notices from leaking thru MySQL notice search 2009-06-19 20:21:57 -07:00
Sarven Capadisli
9be54a3dcf Minor indenting 2009-06-19 16:04:14 +00:00
Sarven Capadisli
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
Evan Prodromou
597df6a234 better calculation of path 2009-06-18 16:19:26 -07:00
Sarven Capadisli
23d6d19e75 Better attachment view check 2009-06-18 19:03:44 +00:00
Sarven Capadisli
730c173238 Updated markup and CSS for attachment_view 2009-06-18 18:48:19 +00:00
Robin Millette
c442b400b9 Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-06-18 06:02:54 -04:00
Robin Millette
65b4cfbb54 Display more oembed info in attachment popup. 2009-06-18 06:02:12 -04:00
Zach Copley
3f032bc36e Left out some new user and group theming file in the previous commit 2009-06-18 02:16:39 -07:00
Zach Copley
57274d21ba Group theming. 2009-06-18 02:01:06 -07:00
Zach Copley
6c7bdf9df6 Merge branch 'userdesign' into 0.8.x 
* userdesign: (56 commits)
  Fix for background image repetition for various page heights
  Removed height:100% for better background image repetition
  A little more specific selector for notice reply
  Have user favorites page show user's design
  Placed a check to make sure there is a reply button in a notice before
  Make MailboxAction read only
  Remove stale reference to deprecated personal.php
  Uppercase hex color values
  Default to image being on, no tile after upload
  Fix sidebar color bug default design
  Update background image settings to use bitflags
  It was accidently removed
  Dynamically tile background image  and turn background image on or off
  Show a background img in settings form
  IE7/8 CSS update for user design
  Enable tiling of background imgs for Designs
  Added background image tile flag to Design
  Init styles for tile and image use on/off for user design settings
  Added form option to tile background image and to turn it on and off
  Add background dir
  ...
 2009-06-17 18:49:25 -07:00
Zach Copley
b0591cd982 Make MailboxAction read only 2009-06-17 17:29:57 -07:00
Zach Copley
4fc4c0a74b Remove stale reference to deprecated personal.php 2009-06-17 17:13:59 -07:00
Evan Prodromou
2187ec7056 hide group name and aliases in group tag cloud section 2009-06-17 15:20:44 -07:00
Zach Copley
164588ef0f Merge branch '0.8.x' into userdesign 2009-06-17 21:40:52 +00:00
Zach Copley
cd1361fe96 Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-06-17 14:36:33 -07:00
Zach Copley
8992e8fa7a Ticket 1612 - make destory (and create) favorites work via API 2009-06-17 14:34:04 -07:00
Zach Copley
7e25a7f3aa Output XML and JSON error msgs for API calls 2009-06-17 14:32:36 -07:00
Robin Millette
b58dc5e961 Added config option to enable or disable file uploads with notices. 2009-06-17 16:55:01 -04:00
Robin Millette
28d02ec8cd Make oohembed endpoint configurable. 2009-06-17 16:44:33 -04:00
Zach Copley
af4b18b1e2 Uppercase hex color values 2009-06-17 03:05:48 -07:00
Zach Copley
76cbeff33c Update background image settings to use bitflags 2009-06-17 02:35:51 -07:00
Zach Copley
d1ae3176b6 Enable tiling of background imgs for Designs 2009-06-16 22:18:25 -07:00
Zach Copley
bc1f877f6e Design settings now save and displays backgrounds 2009-06-16 19:17:37 -07:00
Zach Copley
c3c30aa0ea Check to make sure a design exists before trying to display it 2009-06-15 23:18:54 -07:00
Zach Copley
ef99f83963 Output custom stylesheets on design sub-Actions 2009-06-15 22:13:35 -07:00
Zach Copley
44343986c3 Merge branch '0.8.x' into userdesign 
* 0.8.x:
  a little better query handling in redirect code
  a little better query handling in redirect code
  forgot some functions aren't available at status time
  redirect on non-canonical server name
  don't show create-a-group link if not logged in
  allow a configured base for cache keys
  Missing call to getProfile() caused verify_credentials to fail.
  change mods for setup script
  Script to set up new status networks
  strncmp -> strcasecmp
  Return network from network setup function
  Configurable avatar directory
 2009-06-15 21:24:22 -07:00
Zach Copley
e7e3709ae0 Throw an WebColorException if wrong # of hex chars 2009-06-15 21:21:33 -07:00
Zach Copley
20d9350877 User design setting save now 2009-06-15 20:21:33 -07:00
Evan Prodromou
fd290fc3f9 allow a configured base for cache keys 2009-06-15 16:09:40 -07:00
Zach Copley
92f095f589 Merge branch '0.8.x' into userdesign 
* 0.8.x: (32 commits)
  updates to Status_network
  makeadmin action
  make admins of groups
  show aliases when showing a group
  Link and distribute notices tagged for a group alias
  Code for adding and saving group aliases
  Styles for group block
  add correct li for css magic for block stuff
  typo in profileminilist class
  return count from show
  try to get the right class for profileminilist
  fix perms for classes/statusnet.ini
  fixup perms for classes
  Added Group_alias class
  add a table for group aliases
  Cross-browser notice_attach
  Allow users to be unblocked from a group
  Some UI improvements for blocking and unblocking
  The rest of the things necessary to make group block work
  Make group block work
  ...

Conflicts:
	db/laconica.sql
	lib/common.php
 2009-06-15 11:50:08 -07:00
Evan Prodromou
c077ad0775 Configurable avatar directory 
Avatar directory and path are configurable.
 2009-06-15 10:45:50 -07:00
Evan Prodromou
2b8a767770 make admins of groups 2009-06-15 00:59:15 -07:00
Evan Prodromou
4dad3191f6 Merge branch 'groupalias' into 0.8.x 2009-06-14 23:48:24 -07:00
Evan Prodromou
1b6b00a6d0 Link and distribute notices tagged for a group alias 
Correctly link and distribute notices tagged for a group alias. Added
a helper function, getForNickname(), to User_group, to make it easier
to get a group by its nickname or aliases.
 2009-06-14 23:43:47 -07:00
Evan Prodromou
ecbd7718d5 Code for adding and saving group aliases 
Added code to add and save group aliases. Like tags, aliases are
free-texted in to the group admin page. configurable max number of
aliases, default is three.
 2009-06-14 23:37:24 -07:00
Evan Prodromou
c0f3204a10 Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-06-14 22:09:59 -07:00
Evan Prodromou
7097804eeb typo in profileminilist class 2009-06-14 22:09:17 -07:00
Evan Prodromou
bef643352d return count from show 2009-06-14 22:09:04 -07:00
Evan Prodromou
ee8dd62038 try to get the right class for profileminilist 2009-06-14 22:07:27 -07:00
Sarven Capadisli
8dd5871d4f Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x 2009-06-15 03:26:32 +00:00
Sarven Capadisli
0bc9b2e730 Cross-browser notice_attach 2009-06-15 03:21:15 +00:00
Evan Prodromou
f8da15bf41 Allow users to be unblocked from a group 
List users who are blocked from joining a group. Add a form to let
them be unblocked. Add an action that removes the block. Includes
changes to group and groupblock classes.
 2009-06-14 16:17:44 -07:00
Evan Prodromou
bd26a80d45 Merge branch '0.8.x' into groupblock 
Conflicts:
	lib/router.php
 2009-06-14 15:59:35 -07:00
Evan Prodromou
c2ba727d61 Merge branch '0.7.x' into 0.8.x 2009-06-14 15:58:19 -07:00
Evan Prodromou
203a5aba67 Some UI improvements for blocking and unblocking 
Add unblock to the router table, so unblocking will work at all.

Block form and unblock form return to subscribers list, not
subscriptions list, by default.

showstream action sends its parameters to block and unblock forms to
better return to the right page.
 2009-06-14 15:54:22 -07:00
Evan Prodromou
1c87532912 The rest of the things necessary to make group block work 
Link to the group block form. Hide join button if the current user is
blocked.
 2009-06-14 15:47:39 -07:00
Evan Prodromou
daf2e7ef47 Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-06-14 14:54:20 -07:00
Evan Prodromou
b6ef8e735b base class SubscriptionList for some actions 2009-06-14 14:53:42 -07:00
Evan Prodromou
c2dae24701 Break profilelist into a recipe 
Expanded the ProfileList class so it worked more like a recipe. This
helps to get rid of a lot of special cases and simplifies the code. It
also makes it possible to do things like group block.
 2009-06-14 14:52:26 -07:00
Robin Millette
7c772e1d63 Removed another bit of dead (commented out) code. 2009-06-14 15:48:46 -04:00
Zach Copley
946d016df2 Reworked output for design settings page 2009-06-14 02:03:50 -07:00
Jeffery To
6d308f6ffe Adds $config['invite']['enabled'] to enable/disable invites. 
The invite function may not applicable for private and/or closed installs. This adds a configuration option to enable/disable invites (defaulting to enabled), hides the "Invite" nav item when necessary, and adds a check to actions/invite.php.

Note that I haven't tried the Facebook application so I didn't add any checks to actions/facebookinvite.php.
 2009-06-14 16:17:22 +08:00
Jeffery To
bb3361467c Merge branch '0.8.x' into small-fixes 2009-06-14 15:45:58 +08:00
Sarven Capadisli
77c94c44a6 Removed hanging skin crapola 2009-06-14 05:57:59 +00:00
Zach Copley
d0eb2058a5 Merge branch '0.8.x' into userdesign 
Conflicts:

	actions/showfavorites.php
	lib/action.php
 2009-06-14 00:23:48 +00:00
Zach Copley
89d0583b91 Fixes Ticket #1607 - empty 'page-notice' definition lists were 
being output in a bunch of places.
 2009-06-12 17:06:42 -07:00
Zach Copley
fc6154fe4d Add a method to check for registered event handlers 2009-06-12 16:56:43 -07:00
Sarven Capadisli
8524990512 http://laconi.ca/trac/ticket/1367 
Thanks to Toby Inkster for the patch.
 2009-06-12 16:18:58 +00:00
Sarven Capadisli
4532babb6f http://laconi.ca/trac/ticket/1370 
Thanks to Toby Inkster for the patch.
 2009-06-12 16:15:30 +00:00
Sarven Capadisli
392c8d4a96 http://laconi.ca/trac/ticket/863 
Thanks to Toby Inkster for the patch.
 2009-06-12 16:13:45 +00:00
Sarven Capadisli
1627fe8f33 http://laconi.ca/trac/ticket/1368 Site is the space that Container 
sits in.
Thanks to Toby Inkster for the patch.
 2009-06-12 15:42:53 +00:00
Sarven Capadisli
e2476307ba Updated Creative Commons namespace to current. 
Thanks to Toby Inkster for the patch.
 2009-06-12 15:41:45 +00:00
Jeffery To
53f31a247e Fix missing max_id in API search calls 2009-06-12 20:03:18 +08:00
Jeffery To
e2b20bd1e6 Fix "Trying to get property of non-object" errors when a user tries to log in using an unknown nickname 2009-06-12 19:58:30 +08:00
Jeffery To
cfea2b0c4e Fix "Trying to get property of non-object" errors when accessing the people search results page 2009-06-12 19:55:41 +08:00
Jeffery To
216ada5cc4 Fix "Trying to get property of non-object" errors in groupeditform.php 2009-06-12 19:48:26 +08:00
Zach Copley
8064397588 Ticket #1611 and a bunch of code cleanup 2009-06-12 01:31:22 -07:00
Robin Millette
ba6beaa310 Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-06-10 14:18:41 -04:00
Robin Millette
e120cb1a53 Uploaded content now displays in overlay (and removed var_dump crap) 2009-06-10 14:17:46 -04:00
Evan Prodromou
5469e46ef5 merge error in util.php 2009-06-10 09:14:48 -07:00
Evan Prodromou
c0853e3040 Merge branch '0.7.x' into 0.8.x 2009-06-10 09:09:57 -07:00
Evan Prodromou
f4a1cd75ab Remove FIXME-marked Opera links until they actually work 2009-06-10 08:47:46 -07:00
Evan Prodromou
4df1ea49ec Merge branch '0.8.x' into userdesign 
Conflicts:
	actions/designsettings.php
 2009-06-09 21:51:24 -07:00
Evan Prodromou
ed627bb4bd Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-06-09 21:48:56 -07:00