 Shashi Gowda
|
bf121a695a
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
|
13 years ago |
 Brion Vibber
|
942887ca8c
Split up some list/form classes, and get the 'approve' and 'cancel' links on group member queue working.
|
13 years ago |
|
Brion Vibber
|
471a480587
Logic to have group joins turn into pending joins automatically when group is set to mod; allow users to cancel their pending group requests.
|
13 years ago |
|
Brion Vibber
|
a54eb0941e
Tweaking request_queue -> group_join_queue, easier to deal with the indexes and keys and caching this way.
|
13 years ago |
|
Brion Vibber
|
541dfa04fe
Switch things from calling Group_member::join & leave & calling events manually to running through Profile::joinGroup() && Profile::leaveGroup(), with the events encapsulated.
|
13 years ago |
 Evan Prodromou
|
9af92f94bd
function for checking scope rules for Profile
|
13 years ago |
|
Shashi Gowda
|
1b1a427237
DB_DataObjects for people tags
|
13 years ago |
|
Brion Vibber
|
d09aa9c947
Workaround for bug causing fatal error during favoriting; Profile::getCurrentNotice() was returning an ArrayList instead of a Notice directly due to pulling through Profile::getNotices(). This caused failure in Fave::addNew() which specifies it wants a Notice. Caused failure of the 'fav' IM command.
|
13 years ago |
 Zach Copley
|
b7d0746694
Merge branch '0.9.x' into 1.0.x
|
13 years ago |
|
Zach Copley
|
17176ee445
Merge branch 'json-activities' into 0.9.x
|
13 years ago |
|
Evan Prodromou
|
f743a233ab
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
|
13 years ago |
|
Evan Prodromou
|
1525acdca1
Extend authorization framework to cover login and API use
|
13 years ago |
|
Zach Copley
|
29ce5dd19a
Reinstate profile_info in author/actor
|
13 years ago |
|
Brion Vibber
|
98b1fe07c6
Blow user:site_owner cache when granting/revoking 'owner' role
|
13 years ago |
|
Brion Vibber
|
454a980bd4
Fix for failure/exception on subscription/subscriber lists when deleted profiles are stuck in cached list.
|
13 years ago |
|
Zach Copley
|
df19e88323
Atom output - Reinstate activity:actor and activity:subject
|
13 years ago |
|
Brion Vibber
|
e211e6228d
Merge branch '0.9.x' into 1.0.x
|
14 years ago |
|
Brion Vibber
|
90c7ff1983
Merge branch 'master' into 0.9.x
|
14 years ago |
|
Brion Vibber
|
d3d9797496
Prevent group creation by silenced users.
|
14 years ago |
|
Brion Vibber
|
26baad63f2
Merge branch '0.9.x' into 1.0.x
|
14 years ago |
|
Evan Prodromou
|
9a6ceb3303
Merge branch 'righttoleave' into 0.9.x
|
14 years ago |
|
Brion Vibber
|
d8a3a88ec8
Merge branch '0.9.x' into 1.0.x
|
14 years ago |
|
Brion Vibber
|
4adf551f9f
Update sorting for user tagged timelines (indexing was bad before and remains bad -- we need some DB changes to make this one nice)
|
14 years ago |
|
Brion Vibber
|
4cd3a0756b
Update notice sorting for profile streams; extract more common code to Notice::addSinceId() and Notice::addMaxId()
|
14 years ago |
|
Brion Vibber
|
bf20258f4b
Merge branch '0.9.x' into 1.0.x
|
14 years ago |
|
Evan Prodromou
|
75aaa98462
define rights for account maintenance and default rules
|
14 years ago |
|
Zach Copley
|
bb55784e90
Move getConnectedApps() from Profile to User, where it belongs
|
14 years ago |
|
Evan Prodromou
|
7285bbc93b
Subscription stream functions
|
14 years ago |
|
Brion Vibber
|
9df856e667
Merge branch '0.9.x' into merge
|
14 years ago |
 Brion Vibber
|
407663fb40
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
|
14 years ago |
