Commit Graph

136 Commits

Author SHA1 Message Date
Sarven Capadisli
d1893a1ca9 Changed notice source and location order 2009-11-19 14:27:20 +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
b10f362ede Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x 2009-11-08 23:33:58 +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
fc5002015b Revert "* [Cc]an't -> [Cc]annot"
This reverts commit 0ab17f382b.
2009-11-08 23:28:51 +01:00
Siebrand Mazeland
104a47e4a2 Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x 2009-11-08 23:22:50 +01:00
Siebrand Mazeland
0ab17f382b * [Cc]an't -> [Cc]annot
* [Cc]ould't -> [Cc]ould not
2009-11-08 23:22:38 +01:00
Evan Prodromou
1de9496c7f fix constant for deleteothersnotice 2009-11-07 22:26:03 -05:00
Evan Prodromou
49dd54315f show notice location in notice list 2009-10-29 16:16:02 -04:00
Evan Prodromou
ee236e68df show delete button when user has deleteOthersNotice right 2009-09-27 21:11:45 -04:00
Sarven Capadisli
d3d9913be0 Added hook for notice item. After <li> and Before </li>. Allows
authors to include aside data to their notice items
2009-09-25 12:47:14 +00:00
Sarven Capadisli
0fa2bbe581 Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.8.x 2009-09-20 12:55:34 +02:00
Craig Andrews
6af71f2cd2 Show context link if this notice starts a conversation 2009-09-18 17:37:59 -04:00
Sarven Capadisli
4b7881c64e Removed trailing single space in author @title 2009-09-18 19:32:51 +02:00
Craig Andrews
57feeb566a Add a parameter named 'inreplyto' to the 'notice/new' page, so urls can inclue 'inreplyto' id's. Also add 'inreplyto' to the urls sent in emails. 2009-09-11 22:37:37 -04: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
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
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
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
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
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
Robin Millette
7c772e1d63 Removed another bit of dead (commented out) code. 2009-06-14 15:48:46 -04: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
Robin Millette
e120cb1a53 Uploaded content now displays in overlay (and removed var_dump crap) 2009-06-10 14:17:46 -04:00
Evan Prodromou
4df1ea49ec Merge branch '0.8.x' into userdesign
Conflicts:
	actions/designsettings.php
2009-06-09 21:51:24 -07:00
Robin Millette
27af3c67a2 Improve file upload and attachment interface. 2009-06-09 15:18:12 -04:00
Robin Millette
ebeb5f744c Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into upload
Conflicts:

	js/util.js
	lib/attachmentlist.php
2009-05-31 17:12:04 -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
648d967226 Merge branch '0.8.x' into userdesign
Conflicts:
	lib/attachmentlist.php
	lib/noticelist.php
2009-05-26 23:24:01 -04:00
Robin Millette
af700ea277 Let's you upload a file with a notice and have it shown with other attachments. 2009-05-26 21:20:04 -04:00
Sarven Capadisli
01dad57298 Markup cleanup for attachments 2009-05-25 15:53:19 -04:00
Robin Millette
5f3acc2527 Removed big clip and replaced with smaller inline one next to each URL (in a notice) that's actually an attachment. Overlay (popup) on click. 2009-05-24 21:13:42 -04:00
Robin Millette
bd70caace8 Only show number of attachments if > 1 2009-05-24 18:06:19 -04:00
Robin Millette
b5ac6e31f2 Rearranged attachment info to only appear on each applicable notice page and thru an ajax popup. 2009-05-24 04:43:34 -04:00
Evan Prodromou
d60c399d82 remove old, unused PersonalAction and StreamAction 2009-05-23 23:40:27 -04:00
Sarven Capadisli
9f23807af4 Removed inline styles from notice list items 2009-05-22 02:47:34 +00:00
Robin Millette
9261e48ef0 Removed dead code. 2009-05-18 19:23:18 -04:00
Robin Millette
fecb8c706d Attachments and their list now provide "ajax" view. Also added a few sidebars relating tags and attachments. 2009-05-15 15:04:58 -04:00
Evan Prodromou
95bb1c6a99 in context link for conversations 2009-04-03 16:16:39 -04:00
Evan Prodromou
7b02d9d2e1 Merge branch 'master' into 0.7.x 2009-03-30 11:11:33 -04:00
Evan Prodromou
a68836acb4 add full name title to notice list link 2009-03-30 10:38:26 -04:00
Evan Prodromou
fe426a3152 welcome notice, default sub for new users 2009-03-28 17:36:39 -04:00
Evan Prodromou
343cd6f205 Move common_avatar_* functions to Avatar
Moved the common_avatar_* functions to the Avatar class. Typically
either as methods on the object or as static methods. Replaced all the
uses of the functions in other modules.
2009-02-06 03:55:48 -05:00
Sarven Capadisli
18593afee7 If user is not logged in, then notice-options container shouldn't be
outputted.
2009-02-01 23:37:54 +00:00
Evan Prodromou
d86622da33 don't show reply for anon user 2009-01-28 09:17:12 -05:00
Robin Millette
597245ffc3 make avatar bigger on single notice pages 2009-01-23 04:52:39 +00:00
sarven
0daf242100 Using util.js to set onclick reply anchor 2009-01-23 02:43:18 +00:00
sarven
9376003871 Mailbox markup for Inbox/Outbox direct notices
Please enter the commit message for your changes.
2009-01-21 05:27:16 +00:00
Evan Prodromou
02b49e3f87 Reformat notice list code 2009-01-19 16:35:04 +00:00
sarven
5a81b6d04e Added @title to input submit (reusing $label value until we really
need to make it custom)
2009-01-17 20:57:48 +00:00
sarven
607e65be81 Delete notice markup and styles 2009-01-17 02:32:13 +00:00
sarven
179ad6c13b showReplyLink 2009-01-16 01:33:42 +00:00
sarven
d3092274c2 Merge branch 'uiredesign' of ../evan into uiredesign 2009-01-15 23:47:43 +00:00
Evan Prodromou
e697faf23b Add some includes to noticelist 2009-01-15 23:43:58 +00:00
sarven
a18351bc39 Published title 2009-01-15 23:32:02 +00:00
sarven
7ce054b1ed Wrapper for notices 2009-01-15 22:31:32 +00:00
sarven
8b34598127 Changed to class 2009-01-15 22:19:40 +00:00
Evan Prodromou
c52d49f2fa Fix some formatting in list items 2009-01-15 21:19:44 +00:00
Evan Prodromou
7233e89be6 Merge ../csarven into uiredesign
Conflicts:

	lib/action.php
2009-01-15 20:54:03 +00:00
Evan Prodromou
082db2ad7d A little further with notice lists 2009-01-15 20:19:32 +00:00
sarven
901b2acc9f Resaved. 2009-01-15 00:57:01 +00:00
sarven
1b66ac64b7 Refactored show() into showNotice(), showNoticeInfo(),
showNoticeOptions(). Kept the existing naming convention for the rest
of the methods the same for now.
2009-01-15 00:54:16 +00:00
sarven
c50a6bc523 Updated:
showNoticeLink()
2009-01-15 00:36:17 +00:00
sarven
35645308dc Updated:
showNoticeSource()
showReplyTo()
2009-01-15 00:30:06 +00:00
sarven
46b1e2fcec showReplyTo() update 2009-01-15 00:21:59 +00:00
sarven
442dcfde0e showAuthor() minor update. Using a single anchor to wrap both avatar and
nickname instead of two anchors.
2009-01-15 00:03:06 +00:00
Evan Prodromou
17ece0777b incorrect label on notice list file comment
darcs-hash:20081223191430-84dde-7f50fbf9c39c3f397196ffca318d51de6624d7c9.gz
2008-12-23 14:14:30 -05:00
Evan Prodromou
20af192796 bring lib/noticelist.php into line with PEAR code standards
darcs-hash:20081223190851-84dde-ecad63595159aca2ae014325c9af29a9ace21c3d.gz
2008-12-23 14:08:51 -05:00
Evan Prodromou
9d7a567ecc two undefined variables in noticelist.php
darcs-hash:20081220204320-84dde-cc64afc5ad47f07ace499fe932f59f898dd8f0dd.gz
2008-12-20 15:43:20 -05:00
Sarven Capadisli
c0977dfa1b XHR response fix for IE
darcs-hash:20081216063751-efd22-42fa56ae88c444b80d96c25236733e90f8609fc5.gz
2008-12-16 01:37:51 -05:00
Evan Prodromou
816f87fd27 link error with notice sources
darcs-hash:20081212054448-84dde-14b0bdbd5ce2848a171d565bc0b17902ddb10ed3.gz
2008-12-12 00:44:48 -05:00
Evan Prodromou
da32755959 fix source name
darcs-hash:20081212041543-84dde-47540bac9f755be3101b7e403ae8940c90003f33.gz
2008-12-11 23:15:43 -05:00
Evan Prodromou
677a05ff1e $profile -> $this->profile in noticelistitem
darcs-hash:20081211233039-84dde-9bcacf8f114025052a208e1068e58d570db05f15.gz
2008-12-11 18:30:39 -05:00
Evan Prodromou
b1838f14b6 fixup function names for show_avatar() and show_nickname()
darcs-hash:20081211232921-84dde-9dba2a8d0fe3aa970f433973ef8c4ddf7c5e8928.gz
2008-12-11 18:29:21 -05:00
Evan Prodromou
801af524e4 remove unused $notice param from NoticeListItem::show()
darcs-hash:20081211232811-84dde-658ffc41153b3ffcf7243baa0faa0c3b09a493f0.gz
2008-12-11 18:28:11 -05:00
Evan Prodromou
170c457c96 don't use undefined source_link; instead, just link
darcs-hash:20081211231925-5ed1f-b01d6ef925de540f4a671c0814d8715127a4c98d.gz
2008-12-11 18:19:25 -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