b0b8d36439
registered_user_id can be null
2011-05-23 17:23:54 -04:00
cb283be071
Add registered_user_id column to invitation
...
It's valuable for us to know which, if any, invitations have been converted.
2011-05-23 16:40:48 -04:00
22f6151a10
Annihilate profile_tag_inbox.
2011-04-14 19:45:31 +00:00
ced00cf0bd
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
2011-04-05 10:28:05 +05:30
82a357947d
add force_scope flag to User_group
2011-04-04 16:24:43 -04:00
57198a7464
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
...
Conflicts:
actions/tagother.php
lib/subscriberspeopleselftagcloudsection.php
lib/subscriptionspeopleselftagcloudsection.php
2011-04-04 13:26:27 +05:30
4f5355a9f2
add the private_stream attribute to User
2011-03-30 08:16:30 -04:00
5a2bab07b2
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
...
Conflicts:
actions/tagother.php
classes/Profile.php
classes/Profile_tag.php
js/util.min.js
2011-03-30 15:47:42 +05:30
e862dcdb8a
Merge branch '1.0.x' into limitdist2
2011-03-28 21:56:34 -04:00
df5def8ce4
Work in progress: subscription approval policy field in place on user, hooked up to settings. Queue not 100% tidied up, no UI for queue or management yet.
2011-03-28 15:13:59 -07:00
7f74aa6c20
Add scope bitmap for notices
2011-03-22 11:56:28 -04:00
bf121a695a
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
...
Conflicts:
classes/Profile.php
2011-03-22 07:59:06 +05:30
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
0bec9cfdbc
Add request_queue table and user_group.join_policy column, for upcoming join & subscription moderation.
...
UI for setting the join policy is in, but not yet used.
2011-03-21 13:51:13 -07:00
32f4daf44d
Notice saves its object type
2011-03-07 14:20:55 -05:00
1b1a427237
DB_DataObjects for people tags
2011-03-06 23:28:03 +05:30
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
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
b483a0549f
Merge branch '1.0.x' into schema-x
...
Conflicts:
plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
2010-10-25 13:14:33 -07:00
ca489631db
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
actions/subscriptions.php
lib/router.php
lib/xmppmanager.php
lib/xmppoutqueuehandler.php
2010-10-25 13:08:57 -07:00
e56385a7bb
Use a new table (oauth_token_association) to associate authorized
...
request tokins with OAuth client applications and profiles.
2010-10-20 17:21:04 -07:00
3d6a0f730d
Revert DB change for OAuth. Change compound key for oauth_application_user
...
back to (profile_id, application_id). I think we can get away without
a DB change by only issuing one anonymous access token per user.
2010-10-20 11:41:04 -07:00
e8b6d7c946
Add support for an anonymous OAuth consumer. Note: this requires a
...
small DB tweak. Oauth_application_user needs to have the primary
compound key: (profile_id, application_id, token).
http://status.net/open-source/issues/2761
This should also make it possible to have multiple access tokens
per application.
http://status.net/open-source/issues/2788
2010-10-19 20:54:53 -07:00
4f7eae8702
Add stub schema_version table
2010-10-19 15:38:53 -07:00
5414396a2e
IM cleanup on 1.0.x branch:
...
* Fake_XMPP back to Queued_XMPP, refactor how we use it and don't create objects and load classes until we need them.
* fix fatal error in IM settings while waiting for a Jabber confirmation.
* Caching fix for user_im_prefs
* fix for saving multiple transport settings
* some fixes for AIM & using normalized addresses for lookups
2010-04-30 15:29:05 -07:00
14adb7cc41
Give users more control over URL shortening
...
Users and administrators can set how long an URL can be before it's
shortened, and how long a notice can be before all its URLs are
shortened. They can also turn off shortening altogether.
Squashed commit of the following:
commit d136b390111e1c851ff34d29ca0b91a9c6a3bace767ff2f7ec1e21af42a6869a6be0f59c0c9863d57a1dd5798fd259c37ad2
2010-04-26 02:40:36 -04:00
714d920fae
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
classes/statusnet.ini
db/statusnet.sql
lib/jabber.php
lib/xmppmanager.php
2010-03-08 17:22:23 -05:00
3aee8e0448
Fix a few keys that got dropped from statusnet.ini by mistake
2010-02-25 21:46:53 -08:00
8f42d37593
Add 'mainpage' to User_group
...
Add the mainpage attribute to user_group objects.
2010-02-25 09:24:29 -05:00
ddc3671b6a
recover user_openid tables, which got lost in generation
2010-02-24 23:32:20 -05:00
68a10970f9
fixup exe bits
2010-02-24 23:30:14 -05:00
bd68154772
Make user_group able to handle remote groups
...
We add a local_group table to store data about local groups. It has
the unique key for nickname, so /group/<nickname> looks up here.
Updated DB data object classes and data files.
2010-02-24 23:28:41 -05:00
c187bf5597
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
EVENTS.txt
db/statusnet.sql
lib/queuemanager.php
2010-02-24 20:52:45 -05:00
ed46a38ecf
- conversation.uri needs to be nullable
...
- factory method for creating new local conversations
2010-02-17 01:11:14 -08:00
a2f8c5da17
New Conversation DO to handle remote notices as conversation roots
2010-02-16 23:30:08 -08:00
32084e33a2
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
lib/queuemanager.php
2010-02-16 10:25:57 -05:00
4180ab74d9
OAuth app name should not be null
2010-02-05 02:09:58 +00:00
8d320d7cc2
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-05 02:08:37 +00:00
82f1119073
OAuth app name should not be null
2010-02-05 01:24:21 +00:00
a020e23086
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
2010-02-04 11:56:07 -08:00
6215b9788c
add nickname as unique key for user_group table
2010-02-03 11:53:31 -05:00
057ec1fcea
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
EVENTS.txt
lib/imqueuehandler.php
lib/jabber.php
lib/util.php
plugins/Xmpp/Sharing_XMPP.php
2010-02-02 17:00:10 -05:00
df2a081265
OAuth app names should be unique.
2010-02-02 08:50:01 +00:00
59d16cf16a
OAuth app names should be unique.
2010-02-01 20:58:30 +00:00
e9995b0f6a
Create IM plugin, Pluginize XMPP, Create AIM plugin
2010-01-27 13:48:35 -05:00
6efbf2777a
Add verifier and verified callback to token for OAuth 1.0a
2010-01-24 16:36:05 -08:00
d33040089d
Remove verifier from Oauth_application_user (not needed there)
2010-01-24 16:36:05 -08:00
c2337ab47c
Decided we didn't need to keep the token secret in the
...
Oauth_application_user record
2010-01-24 16:36:02 -08:00
c473a39a7d
Associate request tokens with OAuth apps and app users
2010-01-24 16:36:02 -08:00
035c475b45
It might help if I checkd in statusnet.ini.
2010-01-24 16:36:02 -08:00
Evan Prodromou
Shashi Gowda
Brion Vibber
Zach Copley
Craig Andrews