Sarven Capadisli
a68663588e
Merge branch '0.8.x' into 0.9.x
2009-09-28 17:55:09 +00:00
Sarven Capadisli
f6d67781a1
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2009-09-28 18:07:11 +02:00
Evan Prodromou
00b1242607
Merge branch 'master' of git@gitorious.org:statusnet/mainline
2009-09-27 23:35:49 -04:00
Zach Copley
120a84593e
Forgot to add home_timeline to the list of methods that only require
...
bareauth.
2009-09-27 23:35:27 -04:00
Zach Copley
4e6c730207
Forgot to add home_timeline to the list of methods that only require
...
bareauth.
2009-09-27 20:23:35 -07:00
Zach Copley
bf3699105a
Forgot to add home_timeline to the list of methods that only require
...
bareauth.
2009-09-27 20:23:03 -07:00
Zach Copley
6b7a007ef2
Forgot to add home_timeline to the list of methods that only require
...
bareauth.
2009-09-27 20:21:16 -07:00
Evan Prodromou
acd9c4baf9
Merge branch 'master' of git@gitorious.org:statusnet/mainline
2009-09-27 21:58:06 -04:00
Zach Copley
1710082f04
Make statuses/home_timeline return the same thing as statuses/friends_timeline to support apps trying to use the new retweet API method.
2009-09-27 21:57:45 -04:00
Evan Prodromou
3afcdc18f7
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2009-09-27 21:15:14 -04:00
Evan Prodromou
ee9856c452
moderator can delete another user's notice
2009-09-27 21:14:49 -04:00
Evan Prodromou
ee236e68df
show delete button when user has deleteOthersNotice right
2009-09-27 21:11:45 -04:00
Evan Prodromou
38345d0783
let hooks override standard user rights
2009-09-27 21:11:45 -04:00
Evan Prodromou
6c069312e2
user rights
2009-09-27 21:11:45 -04:00
Evan Prodromou
a8d1b7e9c2
Merge DeleteAction class into DeletenoticeAction
...
The DeleteAction class checked for notice information, and only had
one subclass: DeletenoticeAction. I couldn't figure out any other
class that would subclass it, so I combined the two into a single class.
2009-09-27 21:10:17 -04:00
Zach Copley
f3820cc85d
Fix nickname in feed title
2009-09-27 17:27:42 -07:00
Zach Copley
d392cbed7d
Route aliases: replies -> mentions and home_timeline -> friends_timeline
2009-09-27 17:23:11 -07:00
Zach Copley
44dd8f833d
Broke mentions API method out into its own action
2009-09-27 17:17:57 -07:00
Zach Copley
eac388a3cb
Forgot to commit the routes for the new actions
2009-09-27 17:17:03 -07:00
Zach Copley
99d2999b5c
Broke out public_timeline and user_timeline into their own actions
2009-09-27 16:57:06 -07:00
Zach Copley
37bdc060c5
phpcs on apifriendstimeline.php, apiauth.php and apibareauth.php
2009-09-27 15:33:46 -07:00
Zach Copley
dfa955bfda
- Output entity tag
...
- More comments for function blocks
2009-09-27 14:11:12 -07:00
Craig Andrews
fc2426d7ce
Fix some bugs in the URL linkification, and fixed the unit test.
2009-09-27 16:52:15 -04:00
Craig Andrews
7f3c1ac2be
Merge commit 'refs/merge-requests/1633' of git://gitorious.org/statusnet/mainline into 0.9.x
2009-09-27 12:57:25 -04:00
Brion Vibber
3ff8514f5e
Fix URL linkification test cases for addition of 'title' attribution with long URL in f3c8fccc
...
After removing 103 false positives, this leaves 4 actually broken tests, showing two failure modes for mail links:
* 'mail without mailto' formatting shortcut in common_linkify didn't get the 'title' attribute added with the other URLs
* links including mailto: protocol are being incorrectly expanded to http: protocol in the long URL
2009-09-27 12:54:38 -04:00
Sarven Capadisli
3694058976
Changed terminology for poping a window
2009-09-27 14:24:31 +00:00
Evan Prodromou
f9bb35369a
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2009-09-27 10:11:10 -04:00
Sarven Capadisli
c012b278f0
Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2009-09-27 16:10:02 +02:00
Sarven Capadisli
60335fcbdf
Draw a line to indicate new (unread) notice in a timeline since window
...
blur. Inspired by Pidgin's Markerline plugin.
2009-09-27 14:06:39 +00:00
Sarven Capadisli
fc682ecede
Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2009-09-27 15:04:38 +02:00
Sarven Capadisli
22332555cf
Aligned notice_data-attach input
2009-09-27 12:59:01 +00:00
Sarven Capadisli
7466887a2f
Adjusted form_notice width
2009-09-27 12:43:40 +00:00
Sarven Capadisli
3bba451021
Aligning notice_data-attach from top
2009-09-27 12:40:35 +00:00
Sarven Capadisli
8904f0f67d
Removing only notie_data-text label from view
2009-09-27 12:38:40 +00:00
Sarven Capadisli
c66a884ff5
Increated content width
2009-09-27 12:26:01 +00:00
Sarven Capadisli
3bc55e7b8b
Reduced form_notice margin bottom
2009-09-27 12:22:56 +00:00
Sarven Capadisli
7c335c28da
Updated window resize
2009-09-27 12:21:49 +00:00
Sarven Capadisli
4d92d7d52f
Removed form_notice label and h1 from view
2009-09-27 12:15:37 +00:00
unknown
73c9204537
fix for a misnamed variable in subscription function in the "create simulation data" script
2009-09-27 13:58:48 +02:00
Sarven Capadisli
74d537c834
Using a relative value for the form_notice note location instead
2009-09-27 11:54:45 +00:00
Sarven Capadisli
a51339a219
Don't really need the header container. Adjusted some CSS instead
2009-09-27 11:49:18 +00:00
Sarven Capadisli
7d843b1122
jQuery.prepend takes a single param
2009-09-27 11:31:34 +00:00
Sarven Capadisli
db9bc253cb
Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2009-09-27 13:21:28 +02:00
Brion Vibber
9235c1437e
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
2009-09-26 15:23:17 -07:00
Sarven Capadisli
2b6dfbdf2b
A different go at the realtime button location. Button is in a
...
prominent location.
2009-09-26 20:25:47 +00:00
Sarven Capadisli
81aada2144
Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2009-09-26 19:33:15 +02:00
Zach Copley
ccc7caf932
Merge branch 'refactor-api' of git@gitorious.org:~zcopley/statusnet/zcopleys-clone into refactor-api
2009-09-25 16:59:51 -07:00
Zach Copley
de5ff19713
Moved basic auth stuff into its own classes
2009-09-25 16:58:35 -07:00
CiaranG
bc2a0f550b
Updated Piwik plugin documentation to new addPlugin() installaation method
2009-09-25 21:25:20 +01: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
