Shashi Gowda
|
31c1177970
|
Merge branch '1.0.x' into people_tags_rebase
Conflicts:
EVENTS.txt
actions/peopletag.php
actions/tagother.php
classes/Notice.php
js/util.js
js/util.min.js
lib/accountprofileblock.php
lib/action.php
lib/activityobject.php
lib/command.php
lib/personalgroupnav.php
plugins/OStatus/OStatusPlugin.php
|
2011-03-22 07:56:25 +05:30 |
|
Zach Copley
|
3692a09095
|
Extended profile - add nav link to new profile block
|
2011-03-16 10:30:57 -07:00 |
|
Evan Prodromou
|
410ca34ce9
|
remove edit link from profileblock
|
2011-03-16 09:59:36 -04:00 |
|
Evan Prodromou
|
07d9cca004
|
fix bug with undefined variable
|
2011-03-16 09:57:10 -04:00 |
|
Evan Prodromou
|
3d68474e14
|
move UserProfile actions to account profile block
|
2011-03-16 09:57:10 -04:00 |
|
Evan Prodromou
|
e5133f8150
|
add accountprofileblock and make defaultprofileblock use it
|
2011-03-16 09:57:08 -04:00 |
|