fe7848e8b8
Merge branch '0.8.x' into 0.9.x
...
Conflicts:
actions/twitapistatuses.php
2009-09-29 18:03:10 -04:00
5309910b9b
Twitter API returns server errors in preferred format
2009-09-29 17:57:31 -04:00
5252c43804
move HTTP error code strings to class variables
2009-09-29 17:43:45 -04:00
4298f28eae
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2009-09-29 17:26:09 -04:00
89ac81c344
remove string-checks from code using Notice::saveNew()
2009-09-29 17:25:52 -04:00
0a57d1ccee
change string return from Notice::saveNew to exceptions
2009-09-29 17:16:07 -04:00
155ba6c103
stop overwriting created timestamp on group edit
2009-09-29 09:12:44 -04:00
a68663588e
Merge branch '0.8.x' into 0.9.x
2009-09-28 17:55:09 +00:00
f6d67781a1
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2009-09-28 18:07:11 +02:00
4e6c730207
Forgot to add home_timeline to the list of methods that only require
...
bareauth.
2009-09-27 20:23:35 -07:00
6b7a007ef2
Forgot to add home_timeline to the list of methods that only require
...
bareauth.
2009-09-27 20:21:16 -07:00
3afcdc18f7
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2009-09-27 21:15:14 -04:00
ee9856c452
moderator can delete another user's notice
2009-09-27 21:14:49 -04:00
ee236e68df
show delete button when user has deleteOthersNotice right
2009-09-27 21:11:45 -04:00
38345d0783
let hooks override standard user rights
2009-09-27 21:11:45 -04:00
6c069312e2
user rights
2009-09-27 21:11:45 -04:00
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
fc2426d7ce
Fix some bugs in the URL linkification, and fixed the unit test.
2009-09-27 16:52:15 -04:00
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
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
3694058976
Changed terminology for poping a window
2009-09-27 14:24:31 +00:00
f9bb35369a
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2009-09-27 10:11:10 -04:00
c012b278f0
Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2009-09-27 16:10:02 +02:00
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
fc682ecede
Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2009-09-27 15:04:38 +02:00
22332555cf
Aligned notice_data-attach input
2009-09-27 12:59:01 +00:00
7466887a2f
Adjusted form_notice width
2009-09-27 12:43:40 +00:00
3bba451021
Aligning notice_data-attach from top
2009-09-27 12:40:35 +00:00
8904f0f67d
Removing only notie_data-text label from view
2009-09-27 12:38:40 +00:00
c66a884ff5
Increated content width
2009-09-27 12:26:01 +00:00
3bc55e7b8b
Reduced form_notice margin bottom
2009-09-27 12:22:56 +00:00
7c335c28da
Updated window resize
2009-09-27 12:21:49 +00:00
4d92d7d52f
Removed form_notice label and h1 from view
2009-09-27 12:15:37 +00:00
73c9204537
fix for a misnamed variable in subscription function in the "create simulation data" script
2009-09-27 13:58:48 +02:00
74d537c834
Using a relative value for the form_notice note location instead
2009-09-27 11:54:45 +00:00
a51339a219
Don't really need the header container. Adjusted some CSS instead
2009-09-27 11:49:18 +00:00
7d843b1122
jQuery.prepend takes a single param
2009-09-27 11:31:34 +00:00
db9bc253cb
Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2009-09-27 13:21:28 +02:00
2b6dfbdf2b
A different go at the realtime button location. Button is in a
...
prominent location.
2009-09-26 20:25:47 +00:00
81aada2144
Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2009-09-26 19:33:15 +02:00
bc2a0f550b
Updated Piwik plugin documentation to new addPlugin() installaation method
2009-09-25 21:25:20 +01:00
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
ced6bb1c4e
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2009-09-24 22:26:51 -04:00
ecb75561af
Move configuration defaults to new module and variable
...
Moved the default values of $config to $default. The code for
setting up $default is moved to lib/default.php.
2009-09-24 22:25:30 -04:00
b617c608ea
Left a couple debugging statements in (removed)
2009-09-24 15:28:25 -07:00
e566219299
Output If-Modified-Since header for all RSS 1.0 feeds (again)
2009-09-24 15:10:55 -07:00
93b7e60115
Merge branch '0.8.x' into 0.9.x
...
Conflicts:
EVENTS.txt
2009-09-24 17:24:15 -04:00
78cec7ab87
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
install.php
lib/noticeform.php
2009-09-24 17:22:51 -04:00
49bce941a9
Merge remote branch 'statusnet/0.8.x' into 0.9.x
...
Conflicts:
EVENTS.txt
actions/requesttoken.php
classes/File.php
install.php
lib/action.php
lib/noticeform.php
2009-09-24 17:15:54 -04:00
b5b3690eef
Merge branch 'master' into 0.8.x
2009-09-24 17:15:36 -04:00
Evan Prodromou
Sarven Capadisli
Zach Copley
Craig Andrews
Brion Vibber
unknown
CiaranG