Evan Prodromou
3377bc2ccf
RepliesAction uses default local nav
2011-03-01 16:06:29 -05:00
Evan Prodromou
0fef2cb66d
personal group nav uses current user
2011-03-01 16:04:36 -05:00
Evan Prodromou
64ab7b7d07
use default local nav for public action
2011-03-01 16:00:07 -05:00
Evan Prodromou
8c03e8b0b3
use default local nav for allaction
2011-03-01 15:59:01 -05:00
Evan Prodromou
c925a4d181
search actions show the search menu in object area
2011-03-01 15:54:43 -05:00
Evan Prodromou
805d14577d
subscriber actions show the profile menu in object area
2011-03-01 15:54:32 -05:00
Evan Prodromou
0e1a221423
add object menu to actions, default empty
2011-03-01 15:52:46 -05:00
Evan Prodromou
7d77bdcc48
move top-level navigation to default local navigation
2011-03-01 06:30:51 -05:00
Evan Prodromou
dba2aaa59f
new mega-menu for default local navigation
2011-03-01 06:30:27 -05:00
Evan Prodromou
d8cbc20a79
method to show submenus
2011-03-01 06:29:24 -05:00
Evan Prodromou
a64c6c5015
all nav menus use menu superclass
2011-03-01 06:00:03 -05:00
Evan Prodromou
d6d3dfda81
AdminPanelNav has own module, uses Menu
2011-03-01 05:51:00 -05:00
Evan Prodromou
903053caec
primary and secondary nav use menu superclass
2011-03-01 05:46:03 -05:00
Evan Prodromou
c8d6a77d8a
common superclass for menu widgets
2011-03-01 05:45:38 -05:00
Zach Copley
e109b2592f
Merge branch '0.9.x' into 1.0.x
2011-02-28 16:41:24 -08:00
Zach Copley
22c2695c22
Merge commit 'refs/merge-requests/153' of git://gitorious.org/statusnet/mainline into merge-requests/153
2011-02-28 16:36:59 -08:00
Zach Copley
f3ffc8bc46
Missed a couple of conflicts
2011-02-28 15:51:46 -08:00
Zach Copley
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
Brion Vibber
babdc430f9
Switch Twitter bridge settings page to be a ProfileSettingsAction, as ConnectSettingsAction is gone
2011-02-28 12:22:21 -08:00
Brion Vibber
8cdf8cf33e
Fix for schema_version checksum table when checking schemas before the table's been added. :)
2011-02-28 11:19:47 -08:00
Brion Vibber
836f4ea6ea
fix - Notice: Undefined variable: action in /Library/WebServer/Documents/mublog/lib/action.php on line 521
2011-02-28 11:02:38 -08:00
Brion Vibber
061c8d959b
Merge branch 'extprofile' into 0.9.x
2011-02-28 10:45:53 -08:00
Brion Vibber
2bd9532ebe
Merge branch 'master' into 0.9.x
2011-02-28 10:18:18 -08:00
macno
dc41e3dc2d
API group actions join/leave now handle same events of web UI action
2011-02-28 11:56:02 +01:00
macno
c246c17d3e
If there's a DB error, script returns after catching the exception
2011-02-28 11:53:11 +01:00
Brion Vibber
6a6584741f
Fix for ticket #2248 : flickr etc URLs that contain @ in the paths etc no longer accidentally trip the mailto: thingy
2011-02-25 15:46:35 -08:00
Brion Vibber
e00483d703
Test case for ticket #2248 : flickr URLs with @ in the path get misinterpreted as mailto
2011-02-25 15:38:24 -08:00
Siebrand Mazeland
4e3537a12b
* add support for Friulian
...
* move a line around for sorting reasons
2011-02-26 00:34:46 +01:00
Siebrand Mazeland
78eed32781
Localisation updates from http://translatewiki.net .
2011-02-26 00:34:44 +01:00
Brion Vibber
9ec395b07a
Workaround for reply timeline since_id issue: save the notice.created value into reply.modified, so we can key off it as expected.
...
As a hack this removes the mysql_timestamp bit from the field settings on reply.modified so that our value actually gets saved. This *should* work ok as long as system timezone is set correctly, which we now set to UTC to match when connecting.
2011-02-25 13:22:13 -08:00
Evan Prodromou
1508193df4
fix layout of form with magic hoohaw
2011-02-25 13:18:28 -08:00
Evan Prodromou
62a5f270d6
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2011-02-25 12:56:40 -08:00
Evan Prodromou
2b995c943f
allow access to confirm first for not-logged-in users
2011-02-25 12:56:21 -08:00
Brion Vibber
880b1b666e
Merge branch 'master' into 0.9.x
2011-02-25 12:24:18 -08:00
Brion Vibber
534bed9d74
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2011-02-25 12:24:18 -08:00
Brion Vibber
55b1f3d84c
Scalability work on user backup stream generation.
...
UserActivityStream -- used to create a full activity stream including subscriptions, favorites, notices, etc -- normally buffers everything into memory at once. This is infeasible for accounts with long histories of serious usage; it can take tens of seconds just to pull all records from the database, and working with them all in memory is very likely to hit resource limits.
This commit adds an alternate mode for this class which avoids pulling notices until during the actual output. Instead of pre-sorting and buffering all the notices, empty spaces between the other activities are filled in with notices as we're making output. This means more smaller queries spread out during operations, and less stuff kept in memory.
Callers (backupaccount action, and backupuser.php) which can stream their output pass an $outputMode param of UserActivityStream::OUTPUT_RAW, and during getString() it'll send straight to output as well as slurping the notices in this extra funky fashion.
Other callers will let it default to the OUTPUT_STRING mode, which keeps the previous behavior.
There should be a better way to do this, swapping out the stringer output for raw output more consitently.
2011-02-25 12:15:38 -08:00
Samantha Doherty
7f50315168
Quick fix for popular notices in cleaner theme.
2011-02-25 13:43:21 -05:00
Brion Vibber
052ae2d88a
Test cases for Unicode hashtags
2011-02-25 10:25:13 -08:00
Brion Vibber
0291c6f7cd
Merge branch 'unicode-tag' into 0.9.x
2011-02-25 10:17:03 -08:00
Brion Vibber
59a413cf5e
Merge branch 'master' into 0.9.x
2011-02-25 10:16:00 -08:00
Samantha Doherty
09a3db628c
First revision of new theme, cleaner.
2011-02-25 12:00:55 -05:00
Evan Prodromou
81bcdfe2be
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2011-02-25 08:02:26 -08:00
Evan Prodromou
7c192dabe2
Let users who aren't allowed to login confirm their email separately
2011-02-25 08:01:41 -08:00
Evan Prodromou
ecfb3b9288
allow passing an url to email confirmation function
2011-02-25 08:00:55 -08:00
Zach Copley
17176ee445
Merge branch 'json-activities' into 0.9.x
2011-02-25 00:15:26 -08:00
Zach Copley
77c280a48b
Revert "FacebookBridge - Add lots of debug output (revert me)"
...
This reverts commit c44a622449
.
2011-02-24 14:21:50 -08:00
Zach Copley
7d50189ec2
FacebookBridge - Don't hinder autoloading if the Facebook ID and secret aren't set
2011-02-24 13:57:21 -08:00
Zach Copley
de6d46ea4b
FacebookBridge - dequeue messages that aren't bound for Facebook
2011-02-24 13:29:56 -08:00
Zach Copley
c44a622449
FacebookBridge - Add lots of debug output (revert me)
2011-02-24 12:59:37 -08:00
Zach Copley
65dbf485e4
FacebookBridge - make a huge fuss if we can't create a valid Facebookclient
2011-02-24 12:52:31 -08:00