Evan Prodromou
61419038e5
Merge branch '0.8.x' into 0.9.x
...
Conflicts:
README
2009-11-02 18:11:45 -05:00
Evan Prodromou
f0fc12b0a7
script to make someone a group admin
2009-11-02 18:06:27 -05:00
Evan Prodromou
edb2713026
correct name in registeruser
2009-11-02 18:06:09 -05:00
Evan Prodromou
eee033ae7c
script to register a user
2009-11-02 17:28:03 -05:00
Zach Copley
b9ce23d0c2
Rework MailDaemon to use the MediaFile class for uploads
2009-10-28 22:24:20 +00:00
Zach Copley
78e5a5980a
Extract out Facebook app stuff into a plugin
2009-10-20 16:32:30 -07:00
Zach Copley
09dfb08a39
Merge branch '0.9.x' into TwitterBridgePlugin
2009-10-20 06:06:10 +00:00
Evan Prodromou
fc61b71625
merge from testing
2009-10-19 18:12:00 -04:00
Eric Helgeson
acf2b19463
Ignoring Sent from my* line in mail (iPhone/Pre)
2009-10-19 12:52:25 -04:00
Zach Copley
0bbc05c1d5
Merge branch '0.9.x' into TwitterBridgePlugin
2009-10-16 23:42:02 +00:00
Zach Copley
0fd8e758ad
Make queuing and daemons work via events
2009-10-14 04:50:16 +00:00
Evan Prodromou
67c387c6a0
Merge branch '0.8.x' into 0.9.x
...
Conflicts:
install.php
2009-10-13 17:25:54 -04:00
Eric Helgeson
c4028f1d07
define LACONICA for compatibility on scripts
...
fixup_conversations.php fixes
2009-10-13 13:34:28 -04:00
Zach Copley
b4b992bca7
Merge branch '0.9.x' into pluginize-twitter-bridge
...
* 0.9.x: (247 commits)
Added in credits.
Use site's name for basic auth realm
Make apigroupcreate.php pass phpcs
Took out some unnecessary intializations
Implemented create group api
CamelCase all function names in the API code
These same params are used in most API actions; moved to base API class
Missed some of the references to the old TwitterApiAction - removed
Remove more redundant $formats
Remove dead code
Move all basic auth output and processing to base classes
$format is used by every API action. Set it in the base class.
Delete action/api.php and rename lib/twitterapi.php to lib/api.php
New actions for blocks via API
fix FBConnect so it doesn't muffle EndPrimaryNav
don't write session if it's unchanged
Fixed facebook connect primary nav to hide search option when site is private and user is not logged in
Fixed facebook connect primary nav to obey sms/twitter/openid settings
Fixed facebook connect login nav to obey openid settings
Fixed facebook connect nav to obey sms/twitter disabled
...
2009-10-13 09:36:26 -07:00
Evan Prodromou
a6d4adc398
Revert "Open tags should have closing tags"
...
This reverts commit aeca8807db
2009-10-08 11:41:39 -04:00
Eric Helgeson
aeca8807db
Open tags should have closing tags
2009-10-05 12:55:55 -04:00
Evan Prodromou
c5047fd90a
Merge branch '0.8.x' into 0.9.x
...
Conflicts:
classes/Profile.php
2009-10-04 03:07:37 -04:00
Evan Prodromou
2d85d61907
better handling of y response in deleteuser.php
2009-10-02 15:46:00 -04:00
Evan Prodromou
54b22c0c0b
script to permanently delete a user
2009-10-02 15:42:58 -04:00
Evan Prodromou
d103522ff3
check the schema
2009-10-01 15:11:12 -04:00
Evan Prodromou
a41ed1a66a
Merge branch '0.9.x' into schema
2009-10-01 11:30:04 -04:00
Evan Prodromou
89ac81c344
remove string-checks from code using Notice::saveNew()
2009-09-29 17:25:52 -04:00
Craig Andrews
7f3c1ac2be
Merge commit 'refs/merge-requests/1633' of git://gitorious.org/statusnet/mainline into 0.9.x
2009-09-27 12:57:25 -04:00
unknown
73c9204537
fix for a misnamed variable in subscription function in the "create simulation data" script
2009-09-27 13:58:48 +02:00
Evan Prodromou
e206324f24
statusize schema-related modules
2009-09-23 09:20:04 -04:00
Evan Prodromou
bd8a2dbfd6
test script for schema code
2009-09-23 09:17:01 -04:00
Evan Prodromou
fe4751de50
add the plugin daemon
2009-09-21 14:44:16 -04:00
Evan Prodromou
f6c70ea327
have to provide full path for daemons
2009-09-21 14:42:20 -04:00
Evan Prodromou
98924a80d7
'easy' way to handle notices at queue time
2009-09-21 14:39:22 -04:00
Evan Prodromou
6a088afd4b
you can add a daemon to getvaliddaemons
2009-09-21 14:29:43 -04:00
Zach Copley
9d87313eae
Merge branch '0.9.x' into pluginize-twitter-bridge
...
Conflicts:
plugins/TwitterBridge/twitterauthorization.php
2009-09-08 16:02:57 -07:00
Craig Andrews
a535ccdc4e
Merge remote branch 'laconica/0.8.x' into 0.9.x
...
Conflicts:
lib/common.php
lib/twitter.php
2009-09-02 16:42:15 -04:00
Zach Copley
a0a376bf0e
Take out unnecessary defines
2009-08-28 17:55:58 +00:00
Zach Copley
36c104fb34
Make SyncTwitterFriends and TwitterStatusFetcher daemons use both HTTP Basic Auth as well as OAuth
2009-08-28 07:02:27 +00:00
Evan Prodromou
5d09b6b3f0
Merge branch '0.8.x' into 0.9.x
...
Conflicts:
EVENTS.txt
actions/finishremotesubscribe.php
actions/postnotice.php
actions/public.php
actions/remotesubscribe.php
actions/showstream.php
actions/updateprofile.php
actions/userauthorization.php
classes/laconica.ini
lib/common.php
lib/oauthstore.php
lib/omb.php
2009-08-27 11:16:45 -07:00
Evan Prodromou
df86aa7214
define LACONICA and accept LACONICA for backwards compatibility
2009-08-26 10:41:36 -04:00
Evan Prodromou
e3a53251c0
last scrub of Laconica -> StatusNet
2009-08-26 03:33:43 -04:00
Zach Copley
5efe588174
Moved the rest of the Twitter stuff into the TwitterBridge plugin
2009-08-26 00:59:06 +00:00
Evan Prodromou
3567b9d708
global search and replace for laconica -> statusnet
2009-08-25 18:53:24 -04:00
Evan Prodromou
99e3b1723b
update names in shell scripts
2009-08-25 18:43:48 -04:00
Evan Prodromou
865b716f09
change LACONICA to STATUSNET
2009-08-25 18:42:34 -04:00
Evan Prodromou
ae883ceb9b
change controlyourself.ca to status.net
2009-08-25 18:19:04 -04:00
Evan Prodromou
d35b2d3f3c
change laconi.ca to status.net
2009-08-25 18:16:46 -04:00
Evan Prodromou
4737563b95
a distributed -> the distributed
2009-08-25 18:14:12 -04:00
Evan Prodromou
c8b8f07af1
change Laconica and Control Yourself to StatusNet in PHP files
2009-08-25 18:12:20 -04:00
Evan Prodromou
077955cb1d
merge problem with scripts/twitterstatusfetcher
2009-08-25 17:58:44 -04:00
Evan Prodromou
c87e1de017
Rename Laconica to StatusNet
2009-08-25 17:56:10 -04:00
Evan Prodromou
ff87732053
Merge branch '0.8.x' into testing
...
Conflicts:
actions/twitterauthorization.php
lib/oauthclient.php
lib/twitter.php
lib/twitterapi.php
lib/twitteroauthclient.php
scripts/twitterstatusfetcher.php
2009-08-24 16:55:49 -04:00
Evan Prodromou
27aeba01dd
Better (hopefully) database connection management for child processes
...
Conflicts:
scripts/twitterstatusfetcher.php
2009-08-24 11:55:46 -04:00
Zach Copley
fd9d653eb3
Make TwitterStatusFetcher daemon work with OAuth
2009-08-24 11:53:43 -04:00
