Commit Graph

121 Commits

Author SHA1 Message Date
Craig Andrews
39392e03a7 Merge branch '0.9.x' into 1.0.x
Conflicts:
	actions/confirmaddress.php
	actions/imsettings.php
2010-04-18 19:21:15 -04:00
Siebrand Mazeland
3656a2cb13 Fix inconsistencies in clientError() messages
* use correct punctuation
* single quotes when replace was possible
* wording updated when needed
2010-04-10 00:58:57 +02:00
Brion Vibber
e89908f261 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
	lib/channel.php
	scripts/imdaemon.php
2010-03-22 13:56:16 -07:00
Brion Vibber
c89e1865f7 Merge branch 'testing' into 0.9.x 2010-03-15 12:45:38 -07:00
Brion Vibber
e9b671e3af Consolidate and patch up redirection to remote notices.
Now using the correct order consistently (URL, then URI if http/s), and as a niceness measure skipping the redirect if the only URL we have stored is the local one. (Could happen if remote OStatus feed has tag URIs and no alt link.)
2010-03-15 11:38:37 -07:00
Brion Vibber
d2c4ff5f7c Ticket 2239: white space before apostrophe in metadata of status of notice 2010-03-13 11:54:04 -08:00
Craig Andrews
e9995b0f6a Create IM plugin, Pluginize XMPP, Create AIM plugin 2010-01-27 13:48:35 -05:00
Ciaran Gultnieks
deeaafe712 Fixes to bugs where non-local messages were being wrong put in the public timeline and public xmpp feed 2010-01-07 20:59:31 +00:00
Brion Vibber
088081675f Revert "Remove more contractions"
This reverts commit 5ab709b739.

Missed this one yesterday...
2009-11-09 20:01:46 +01:00
Siebrand Mazeland
5ab709b739 Remove more contractions
* doesn't
* won't
* isn't
* don't
2009-11-08 23:32:15 +01:00
Brion Vibber
b7ed31c27b Use nickname from profile, not user object, to avoid barfing warnings on Twitter messages imported into the timeline. 2009-10-30 16:55:47 -04:00
Evan Prodromou
5d09b6b3f0 Merge branch '0.8.x' into 0.9.x
Conflicts:
	EVENTS.txt
	actions/finishremotesubscribe.php
	actions/postnotice.php
	actions/public.php
	actions/remotesubscribe.php
	actions/showstream.php
	actions/updateprofile.php
	actions/userauthorization.php
	classes/laconica.ini
	lib/common.php
	lib/oauthstore.php
	lib/omb.php
2009-08-27 11:16:45 -07:00
Evan Prodromou
df86aa7214 define LACONICA and accept LACONICA for backwards compatibility 2009-08-26 10:41:36 -04:00
Evan Prodromou
865b716f09 change LACONICA to STATUSNET 2009-08-25 18:42:34 -04:00
Evan Prodromou
ae883ceb9b change controlyourself.ca to status.net 2009-08-25 18:19:04 -04:00
Evan Prodromou
d35b2d3f3c change laconi.ca to status.net 2009-08-25 18:16:46 -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
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
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
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
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
Evan Prodromou
3ebf817e36 use 410 Gone for deleted notices 2009-08-04 06:05:04 -04:00
Craig Andrews
9ed117dc3a Move the oembed endpoint to /main/oembed 2009-07-17 12:33:12 -04:00
Craig Andrews
6308539c1d Added oEmbed discovery for attachments and notices 2009-07-15 15:11:29 -04:00
Evan Prodromou
aea546c122 notice should show user design 2009-07-02 08:21:54 -04:00
Evan Prodromou
e2becdb251 use a subclass for single notice items to show attachments 2009-06-23 07:25:18 -07:00
Evan Prodromou
adfb79a9bb Merge branch '0.7.x' into 0.8.x
Conflicts:
	classes/Notice.php
	classes/Profile.php
	lib/common.php
	lib/util.php
	scripts/getvaliddaemons.php
	scripts/stopdaemons.sh
2009-06-08 11:55:32 -07:00
Evan Prodromou
4ec1c33307 correct last-modified date for shownotice.php 2009-05-30 21:45:11 -04:00
Sarven Capadisli
b8de793556 Changed ul to ol and added xoxo for notice lists. 2009-05-29 02:38:38 +00:00
Evan Prodromou
7f81597a81 isReadOnly() now takes arguments
Add an array of arguments to isReadOnly() method of actions, to let
them change their results depending on what actions are called.
Primarily used by the 'api' action. Ideally in the future that will be
multiple actions. But this might still be useful.
2009-04-13 15:55:25 -04:00
Evan Prodromou
e9e75fc9d5 isReadOnly() now takes arguments
Add an array of arguments to isReadOnly() method of actions, to let
them change their results depending on what actions are called.
Primarily used by the 'api' action. Ideally in the future that will be
multiple actions. But this might still be useful.
2009-04-13 15:49:26 -04:00
Evan Prodromou
3d8a8aa03c redirect to original URL or URI for remote notices 2009-03-19 11:36:24 -04:00
Robin Millette
c628bbb192 make avatar bigger on single notice pages 2009-01-23 05:11:04 +00:00
sarven
a5f3e3b759 Removed unnecessary empty containers (page_notice, aside, local
navigation)
2009-01-19 17:12:35 +00:00
sarven
bc15d027a8 Changed @id to @class for notices ul 2009-01-19 16:50:22 +00:00
Evan Prodromou
c0f23a2703 Update shownotice for new framework, make phpcs-clean 2009-01-18 18:35:11 +00:00
Evan Prodromou
4b0cf99e56 Convert use of common_server_error and common_user_error to methods on Action 2009-01-15 23:03:38 +00:00
Evan Prodromou
eaa81d25fa Convert all actions to use new UI functions
I did a massive search-and-replace to get all the action subclasses to
use the new output function (common_element() -> $this->element(), etc.)

There's still a lot to do, but it's a first step
2009-01-15 22:57:15 +00:00
Evan Prodromou
b264c03d32 move opening brace of class declaration to next line
Another gigantor PEAR coding standards patch. Here, I've moved the
opening curly bracket on a class statement to the following line.

darcs-hash:20081223194923-84dde-77a93de314caadbcb5b70bf346a4648be77a864e.gz
2008-12-23 14:49:23 -05:00
Evan Prodromou
04ef1ba8ee change function headers to K&R style
Another huge change, for PEAR code standards compliance. Function
headers have to be in K&R style (opening brace on its own line),
instead of having the opening brace on the same line as the function
and parameters. So, a little perl magic found all the function
definitions and move the opening brace to the next line (properly
indented... usually).

darcs-hash:20081223193323-84dde-a28e36ecc66672c783c2842d12fc11043c13ab28.gz
2008-12-23 14:33:23 -05:00
Evan Prodromou
eb2f9c98ac replace NULL with null
Another global search-and-replace update. Here, I've replaced the PHP
keyword 'NULL' with its lowercase version. This is another PEAR code
standards change.

darcs-hash:20081223192129-84dde-4a0182e0ec16a01ad88745ad3e08f7cb501aee0b.gz
2008-12-23 14:21:29 -05:00
Evan Prodromou
edbc0c665c replace all tabs with four spaces
The PEAR coding standards decree: no tabs, but indent by four spaces.
I've done a global search-and-replace on all tabs, replacing them by
four spaces. This is a huge change, but it will go a long way to
getting us towards phpcs-compliance. And that means better code
readability, and that means more participation.

darcs-hash:20081223191907-84dde-21e8efe210e6d5d54e935a22d0cee5c7bbfc007d.gz
2008-12-23 14:19:07 -05:00
Evan Prodromou
8dcce13297 make a new NoticeList widget and call it from StreamAction
I made a new notice-list widget (like the profile list) and call it
from StreamAction. This cleans up some of the mess in the various
notice-stream-showing classes.

I also changed show-stream so it uses a subclass of NoticeList that
doesn't show author info (which is unnecessary).

darcs-hash:20081211231252-5ed1f-ee6e551ed5a029406748120f12e2ff57c4a86493.gz
2008-12-11 18:12:52 -05:00
Evan Prodromou
b7385b2306 parent::init() -> parent::prepare()
darcs-hash:20081203173423-5ed1f-95de0f98aba4be527cd59d7297bc4f7b712713bd.gz
2008-12-03 12:34:23 -05:00
Evan Prodromou
96df5916ad change Action::init() to Action::prepare() to avoid conflict with RSS10Action::init()
darcs-hash:20081203173225-5ed1f-e5ebfb202ed4a84c90851d0faa025ad09774d2c3.gz
2008-12-03 12:32:25 -05:00
Evan Prodromou
e0995d2fb7 add attributes for shownotice
darcs-hash:20081202050200-5ed1f-1ba5a3573e2276eac22a018ce26cc76b1ed7275f.gz
2008-12-02 00:02:00 -05:00
Evan Prodromou
0498aa94ec end ETag with quotes
darcs-hash:20081202045544-5ed1f-ac8df1a1c8ae9b2cd72e952144a8c2cb001868c4.gz
2008-12-01 23:55:44 -05:00
Evan Prodromou
28751ef554 notices have a create stamp not a modified stamp
darcs-hash:20081202045320-5ed1f-583091191425d10b695107ddc2e1a5e72b60130d.gz
2008-12-01 23:53:20 -05:00
Evan Prodromou
c3f2d195f9 generate an etag for shownotice
darcs-hash:20081202045021-5ed1f-ca0f14051507602bab8898e1e99d9cdb69f2eadc.gz
2008-12-01 23:50:21 -05:00
Evan Prodromou
99db5f5e1c trim whitespace
darcs-hash:20081202041243-5ed1f-7f30aeaa43160bddacc7d5300627964417aff3ec.gz
2008-12-01 23:12:43 -05:00
mikec
334c652e80 Publish MicroIDs for email and mpp on profile and notice pages.
darcs-hash:20080721120036-edabd-838335c0e23c80a657d353955b25b52a9a8624b2.gz
2008-07-21 08:00:36 -04:00
Mike Cochrane
16f0f6589b Convert more _t s to _
darcs-hash:20080712115300-533db-7426faac9059437c2a06a45ed5c87998f998aada.gz
2008-07-12 07:53:00 -04:00
Mike Cochrane
4d65b99c68 Translate a few more strings.
darcs-hash:20080708100519-533db-b326ea0bb16ea6c8244cfd00a0dd639d0553dd21.gz
2008-07-08 06:05:19 -04:00
Evan Prodromou
ad410c0c61 better error checking in shownotice
darcs-hash:20080711171345-84dde-790e24f1d31a716cc52857229087469cd84ad65e.gz
2008-07-11 13:13:45 -04:00
Evan Prodromou
3265812833 show exact date when needed
darcs-hash:20080627222930-84dde-e54a369d91060b7ff2559af9ff08735b2eec43d9.gz
2008-06-27 18:29:30 -04:00
Evan Prodromou
0ee3b6c57f fix copy-and-paste error
darcs-hash:20080618151103-84dde-f3af75746f3f240c0fad2e0fec1d01459df9e48e.gz
2008-06-18 11:11:03 -04:00
Evan Prodromou
56de872740 move instructions up to the "whats up" area
darcs-hash:20080618035739-84dde-a562cffe186780d5f03cf53798ea249b2bda9fb1.gz
2008-06-17 23:57:39 -04:00
Evan Prodromou
fba4b40e0a get the profile to show it in the title
darcs-hash:20080610222547-84dde-7606c2f575ba482fef17a9ef306789c047aaddec.gz
2008-06-10 18:25:47 -04:00
Evan Prodromou
10654ebf35 fix including stream in shownotice
darcs-hash:20080610222222-84dde-f17190f0da05f65ba0d0030d39c97dfec701b624.gz
2008-06-10 18:22:22 -04:00
Evan Prodromou
f6bf8a5870 make shownotice a stream of one notice
For display sake, make showing a single notice like showing a
stream with one notice in it.

darcs-hash:20080610221910-84dde-a3b2252625ac5392ff60f1e975350ed5d2d1145f.gz
2008-06-10 18:19:10 -04:00
Evan Prodromou
9d9588a3de @ messages
darcs-hash:20080529170801-84dde-765f70013696c46bee65bf1408ff4a0b379711d7.gz
2008-05-29 13:08:01 -04:00
Evan Prodromou
066f6843fe use common_render_content
darcs-hash:20080529164139-84dde-85f6b27707af4c2f00f0d62c2fe4e209ab353e57.gz
2008-05-29 12:41:39 -04:00
Evan Prodromou
9b97e7c3b9 highlight notice
darcs-hash:20080520202747-84dde-d0c7a1ac57b8caab5498978cc8108e92243e22fb.gz
2008-05-20 16:27:47 -04:00
Evan Prodromou
52600ce0b0 trim whitespace
darcs-hash:20080520191412-84dde-a607dbe848279639630edd1ab4616d05cc2318d1.gz
2008-05-20 15:14:12 -04:00
Evan Prodromou
749178f343 better headers
Added H1 headers to all pages. Added H2 headers to sections of pages,
where appropriate.

Moved a lot of TODOs around.

Made the public stream the default if no action is specified.

darcs-hash:20080519141219-84dde-f9917a8351596060faa7ff5d231417773764a8fd.gz
2008-05-19 10:12:19 -04:00
Evan Prodromou
1a15570339 common_start_element -> common_element_start
darcs-hash:20080517170430-84dde-74f42b52695699f646b65b939f78fbbe95a05c7e.gz
2008-05-17 13:04:30 -04:00
Evan Prodromou
3b14b7901c fixes to make it all lint
Ran everything through php -l, found out that it didn't compile.

So: fixed the am-I-running-in-Laconica check at the top of each file.
Some syntax fixes in shownotice, showstream, common.

darcs-hash:20080517154701-84dde-8d38da89c5b9cb3b40704adb04a4de880c204181.gz
2008-05-17 11:47:01 -04:00
Evan Prodromou
fac522f4d7 settings and avatars
Did considerable work on the settings section.

Redesigned the DB to allow avatars. Each avatar image has a size and
an URL. There can be multiple avatars per profile, just different sizes.

Added accessors in Profile for avatar. Show the avatar in lots of
places, where it makes sense. Constants for avatar sizes in common.php.

darcs-hash:20080515162844-84dde-fe0630366e247c02ca8ca9d1cc6b963cfce57a26.gz
2008-05-15 12:28:44 -04:00
Evan Prodromou
b6cfd2dffe license block for source code
Added GNU Affero GPL license block to source code.

Added name "LACONICA". I think it should work fine.

darcs-hash:20080514192648-84dde-a430dc438a4e3741c62ccf30ee7f85ecc968b159.gz
2008-05-14 15:26:48 -04:00
Evan Prodromou
67a347bafb considerable coding
darcs-hash:20080514145436-84dde-d0994cb35d3fe8545d3f08abeec3cdfe7559c67d.gz
2008-05-14 10:54:36 -04:00
Evan Prodromou
f0a30cc89d read-only stuff
darcs-hash:20080509021604-84dde-f785fc09dd435fc12741b3a75184e2425721d03d.gz
2008-05-08 22:16:04 -04:00