34e7d8ddf2
For good measure; trip short error mode in earlier on ajax shownotice
2011-03-14 13:44:39 -07:00
c7e7cc79da
'ajax' param on shownotice action so we can pull items in full html version for realtime
2011-03-14 13:05:30 -07:00
b7d0746694
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
actions/confirmaddress.php
actions/emailsettings.php
actions/hostmeta.php
actions/imsettings.php
actions/login.php
actions/profilesettings.php
actions/showgroup.php
actions/smssettings.php
actions/urlsettings.php
actions/userauthorization.php
actions/userdesignsettings.php
classes/Memcached_DataObject.php
index.php
lib/accountsettingsaction.php
lib/action.php
lib/common.php
lib/connectsettingsaction.php
lib/designsettings.php
lib/personalgroupnav.php
lib/profileaction.php
lib/userprofile.php
plugins/ClientSideShorten/ClientSideShortenPlugin.php
plugins/Facebook/FBConnectSettings.php
plugins/Facebook/FacebookPlugin.php
plugins/NewMenu/NewMenuPlugin.php
plugins/NewMenu/newmenu.css
2011-02-28 15:39:43 -08:00
a159352b65
* improve L10n consistency for English. For example proper punctuation for all button and label titles.
...
* fix some i18n bugs (in-message variables).
* update/add translator documentation.
* remove superfluous whitespace.
2011-02-17 00:40:47 +01:00
9df856e667
Merge branch '0.9.x' into merge
...
Conflicts:
README
actions/hostmeta.php
classes/File_redirection.php
lib/common.php
lib/designsettings.php
lib/router.php
lib/util.php
lib/xmppmanager.php
plugins/OStatus/OStatusPlugin.php
2010-12-07 10:50:05 -08:00
f25accc43e
split out InlineAttachmentList from AttachmentList
2010-11-09 10:45:19 -08:00
551b196a35
doomy doom doom
2010-11-08 15:32:41 -08:00
719b480eaa
use subclassing to change notice list output for single notice
2010-11-08 13:08:59 -05:00
b716d01a41
Merge branch '0.9.x' into 1.0.x
2010-11-03 16:09:49 -07:00
6e03456753
Migrate some more code from manually constructing "fullname (nickname)" to using Profile->getFancyName(). Encapsulates common logic and allows for localization of the parens.
2010-11-03 13:10:42 -07:00
7765ddae81
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
README
lib/default.php
2010-10-18 12:17:11 -07:00
7c05b0dafc
options to nofollow external links in notices
2010-10-18 11:29:52 -04:00
5c4723919f
Merge branch '0.9.x' into 1.0.x
2010-10-04 13:06:40 -07:00
59119482ca
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
...
Conflicts:
actions/hostmeta.php
actions/imsettings.php
classes/User.php
lib/adminpanelaction.php
lib/channel.php
lib/default.php
lib/router.php
lib/util.php
2010-10-04 12:54:36 -07:00
5c19d33b27
Bugfix in FB-sharing header for empty profile avatar
2010-10-01 14:42:12 -07:00
8b8450f9ad
Add helper metadata on individual notice pages to aid sharing to Facebook (use poster's avatar as image, indicate the text content)
2010-09-30 18:21:38 -07:00
fd779009b8
Add Start/EndShowNoticeItem event hooks to single notice page
2010-09-29 16:35:12 -07:00
64cdbe6c55
Ticket #2750 : fixes to HTTP caching behavior across login/logout boundaries
...
* now ignoring if-modified-since if we failed an etag if-none-match comparison, per spec
* now including a hash of user id/nickname in most etags, so we'll update the view properly after login/logout
For API methods, checking the API-auth'ed user. (Many change results to include things like 'you're subscribed to this user' or 'this is one of your favorites', so user info is again needed)
There'll still be some last-modified stamps that aren't including user info properly, probably.
2010-09-20 13:42:58 -07:00
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
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
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
c89e1865f7
Merge branch 'testing' into 0.9.x
2010-03-15 12:45:38 -07:00
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
d2c4ff5f7c
Ticket 2239: white space before apostrophe in metadata of status of notice
2010-03-13 11:54:04 -08:00
e9995b0f6a
Create IM plugin, Pluginize XMPP, Create AIM plugin
2010-01-27 13:48:35 -05:00
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
088081675f
Revert "Remove more contractions"
...
This reverts commit 5ab709b739
2009-11-09 20:01:46 +01:00
5ab709b739
Remove more contractions
...
* doesn't
* won't
* isn't
* don't
2009-11-08 23:32:15 +01:00
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
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
df86aa7214
define LACONICA and accept LACONICA for backwards compatibility
2009-08-26 10:41:36 -04:00
865b716f09
change LACONICA to STATUSNET
2009-08-25 18:42:34 -04:00
ae883ceb9b
change controlyourself.ca to status.net
2009-08-25 18:19:04 -04:00
d35b2d3f3c
change laconi.ca to status.net
2009-08-25 18:16:46 -04:00
c8b8f07af1
change Laconica and Control Yourself to StatusNet in PHP files
2009-08-25 18:12:20 -04:00
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
418a5a95ab
Change the notice type defines all into class constants and adapt all files.
2009-08-20 13:11:22 -04:00
7eda7295e4
oEmbed provider does not use the twitter api library classes any more
2009-08-11 21:15:42 -04:00
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
3ebf817e36
use 410 Gone for deleted notices
2009-08-04 06:05:04 -04:00
9ed117dc3a
Move the oembed endpoint to /main/oembed
2009-07-17 12:33:12 -04:00
6308539c1d
Added oEmbed discovery for attachments and notices
2009-07-15 15:11:29 -04:00
aea546c122
notice should show user design
2009-07-02 08:21:54 -04:00
e2becdb251
use a subclass for single notice items to show attachments
2009-06-23 07:25:18 -07:00
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
4ec1c33307
correct last-modified date for shownotice.php
2009-05-30 21:45:11 -04:00
b8de793556
Changed ul to ol and added xoxo for notice lists.
2009-05-29 02:38:38 +00:00
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
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
3d8a8aa03c
redirect to original URL or URI for remote notices
2009-03-19 11:36:24 -04:00
Brion Vibber
Zach Copley
Siebrand Mazeland
Brion Vibber
Evan Prodromou
Craig Andrews
Ciaran Gultnieks
Evan Prodromou
Marcel van der Boom
Sarven Capadisli