summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-09-27Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.xEvan Prodromou
2009-09-27moderator can delete another user's noticeEvan Prodromou
2009-09-27show delete button when user has deleteOthersNotice rightEvan Prodromou
2009-09-27let hooks override standard user rightsEvan Prodromou
2009-09-27user rightsEvan Prodromou
2009-09-27Merge DeleteAction class into DeletenoticeActionEvan Prodromou
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-27Fix some bugs in the URL linkification, and fixed the unit test.Craig Andrews
2009-09-27Merge commit 'refs/merge-requests/1633' of ↵Craig Andrews
git://gitorious.org/statusnet/mainline into 0.9.x
2009-09-27Fix URL linkification test cases for addition of 'title' attribution with ↵Brion Vibber
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-27Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.xEvan Prodromou
2009-09-27fix for a misnamed variable in subscription function in the "create ↵unknown
simulation data" script
2009-09-25Added hook for notice item. After <li> and Before </li>. AllowsSarven Capadisli
authors to include aside data to their notice items
2009-09-24Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.xEvan Prodromou
2009-09-24Move configuration defaults to new module and variableEvan Prodromou
Moved the default values of $config to $default. The code for setting up $default is moved to lib/default.php.
2009-09-24Left a couple debugging statements in (removed)Zach Copley
2009-09-24Output If-Modified-Since header for all RSS 1.0 feeds (again)Zach Copley
2009-09-24Merge branch '0.8.x' into 0.9.xEvan Prodromou
Conflicts: EVENTS.txt
2009-09-24Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.xEvan Prodromou
Conflicts: install.php lib/noticeform.php
2009-09-24Merge remote branch 'statusnet/0.8.x' into 0.9.xCraig Andrews
Conflicts: EVENTS.txt actions/requesttoken.php classes/File.php install.php lib/action.php lib/noticeform.php
2009-09-24Merge branch 'master' into 0.8.xEvan Prodromou
2009-09-24Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.8.xEvan Prodromou
2009-09-24Revert "move scripts to just before </body>, add event for scripts that need ↵Evan Prodromou
to be in <head>" This reverts commit a5ed805aeabab3930d066b2777dbab9663bc487f. It shouldn't have gone on the stable branch.
2009-09-24Implemented join and leave groups api methodsCraig Andrews
2009-09-24implemented etag and last modifiedCraig Andrews
2009-09-24Fixed broken Piwik plugin - was not using the supplied site codeCiaranG
2009-09-23move scripts to just before </body>, add event for scripts that need to be ↵Evan Prodromou
in <head>
2009-09-23some UI fixesEvan Prodromou
2009-09-23Using timeline string instead of title for WindowName because IE doesn'tSarven Capadisli
like names with whitespace.
2009-09-23Added JavaScript to initialize the poped WindowSarven Capadisli
2009-09-23Some layout and rendering adjustment for Realtime pluginSarven Capadisli
2009-09-23Created addPop() for Realtime plugin and added param to include iconurlSarven Capadisli
2009-09-23move some stuff around for realtimeEvan Prodromou
2009-09-23hack around address hack in util.jsEvan Prodromou
2009-09-23Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.8.xEvan Prodromou
Conflicts: plugins/Realtime/realtimeupdate.js
2009-09-23Add some more realtime feedsEvan Prodromou
2009-09-23Do realtime popup with PHP instead of JavascriptEvan Prodromou
Move the realtime detection code to PHP extension rather than JavaScript.
2009-09-23JavaScript fixes for IESarven Capadisli
2009-09-23Revert "Added realtime streams for all and showstream timelines"Evan Prodromou
This reverts commit 49e91ec7d068fa7b98576207696d2192418baf5b.
2009-09-23Revert "Fixed indenting"Evan Prodromou
This reverts commit 182257cbbf1557c2671b1995c9126c45b0bd8e79.
2009-09-23Revert "Made it slighly more compact with less jQuery selection"Evan Prodromou
This reverts commit c9bc3900909a85b9b4be31c4dac7f809127a8bf0.
2009-09-23Revert "Added a check for any URL param. If found, strips them out before"Evan Prodromou
This reverts commit 13de845e95da9ea579516c4480789819c9a26edd.
2009-09-23Merge branch '0.8.x' into 0.9.xEvan Prodromou
Conflicts: actions/requesttoken.php classes/File.php install.php lib/noticeform.php
2009-09-23Revert "When viewing a page in https, all links to non-actions (links to ↵Evan Prodromou
CSS, JS, etc) should be https. Fixes the mixed content warnings that browsers display." This reverts commit 20997619b353faa94591800fbfc02bc19a4cdce3. The commit doesn't take into account having different servers (theme server, avatar server) and being able to set HTTPS for some but not all.
2009-09-23revert output buffering (costly) for ETags (low priority)Evan Prodromou
2009-09-23Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.8.xEvan Prodromou
2009-09-22Allow some punctuation instead of just spaces before @user, !group, and #tagCraig Andrews
2009-09-22Link hrefs are the short url, and title is the long urlCraig Andrews
2009-09-21Make link href the long url so users can tell where links are goingCraig Andrews
2009-09-21Use new queue handler eventCraig Andrews
2009-09-21Fix typo is default hub urlCraig Andrews