54795f2c41Merge branch 'twitter-import' into 0.8.x
Zach Copley
2009-04-24 14:29:56 -07:00
6eb5a2566fSome clean up -- this still doesn't work, yet. The processes all lose their database connections, including the parent process.
Zach Copley
2009-04-24 14:27:31 -07:00
d71fbe9d96fixed subscriptions dropdown action
Robin Millette
2009-04-24 20:28:39 +00:00
f2f4e8c586Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Robin Millette
2009-04-24 20:01:25 +00:00
c008c0d4a5fixed trac#1215, 1216, 1217 and 1219: subscribers/subscriptions people tagclouds.
Robin Millette
2009-04-24 20:01:03 +00:00
4a86823d06check for existence of xmlrpc extension in LinkbackPlugin
Evan Prodromou
2009-04-24 13:31:03 -04:00
5e7664e25fMerge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Evan Prodromou
2009-04-24 13:31:18 -04:00
ecb09fb864check for existence of xmlrpc extension in LinkbackPlugin
Evan Prodromou
2009-04-24 13:31:03 -04:00
12867d114dUI for server errors.
Sarven Capadisli
2009-04-24 17:22:43 +00:00
83ba1b0b5eThe real 7 seconds (7000) timeout for XHR posting.
Sarven Capadisli
2009-04-23 21:51:49 +00:00
2bdf192dabXHR alerts for server-side errors: 404, 502, 503, 504. There is also a 7 second timeout if the server doesn't get back with a response.
Sarven Capadisli
2009-04-23 21:35:21 +00:00
a9df5eab10insert into user's inbox at Web time
Evan Prodromou
2009-04-23 10:38:51 +00:00
1c0d82de3b8-char limit on transports
Evan Prodromou
2009-04-23 10:09:08 +00:00
fe3241183efix join a group link from user homepage when he hasn't posted anything yet
Robin Millette
2009-04-23 01:03:17 +00:00
5f82ce18f0Script to import friends timelines from Twitter
Zach Copley
2009-04-21 19:09:27 -07:00
ec5e06a542Suppress errors when checking for the existence of files that might be restricted by open_basedir - should resolve issue #1310
CiaranG
2009-04-21 23:36:15 +01:00
4cb0a92980Add feed2omb to notice sources
CiaranG
2009-04-21 20:43:57 +01:00
0dd90461cdMerge branch '0.7.x' of git://gitorious.org/laconica/mgrdcm-twitapibools into review/master
Adrian Lang
2009-04-20 13:09:05 +02:00
558fa2743eMerge branch '0.7.x' of git://gitorious.org/laconica/bAvatar-clone without the unintended deletion.
Adrian Lang
2009-04-20 12:15:12 +02:00
8d4738d956Merge branch '0.7.x' into 0.8.x
Sarven Capadisli
2009-04-19 23:40:26 +00:00
046e5b23bbMerge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Evan Prodromou
2009-04-18 19:36:41 -07:00
e9213043a8add reply_to index to notice
Evan Prodromou
2009-04-18 19:36:25 -07:00
00777479d5Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
Robin Millette
2009-04-18 21:14:53 +00:00
39c0e3a9effix 0.7.x 0.8.x merge conflict in register.php
Robin Millette
2009-04-18 21:14:31 +00:00
48846c3805Fixing spaces/tabs.
Dan Moore
2009-04-18 15:54:23 -04:00
b764c3be78This should change the JSON representation of the booleans 'following' and 'notifications', but unlike the previous change, I was unable to test this.
Dan Moore
2009-04-18 15:42:44 -04:00
90fb7be99aBringing the presentation of boolean variables (favorited, truncated, profile_background_tile) and the result from friendships/exist in JSON results from the Twitter Compatible API in line with what the real Twitter API does.
Dan Moore
2009-04-18 15:33:36 -04:00
eec323b5b7Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Robin Millette
2009-04-18 19:08:48 +00:00
4b54a418f3trac#1215, 1216, 1217 and 1219: subscribers/subscriptions people tagclouds
Robin Millette
2009-04-18 19:08:33 +00:00
7196410bb0shortening links in notices from XMPP
Tobias Diekershoff
2009-04-18 19:00:20 +02:00
0e6da4f1bestore invite code in session so openidfinish can find it
Evan Prodromou
2009-04-17 12:52:26 -07:00
8edd7001f4Add a few events (hooks): RegistrationTry, RegistrationForData, ProfileFormData and ProfileSaveForm.
Robin Millette
2009-04-16 17:34:19 +00:00
bd41896f4aMerge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Evan Prodromou
2009-04-17 13:41:34 -07:00
81714c6c31counter() after val() reset to avoid (weird) bug.
Sarven Capadisli
2009-04-17 20:14:06 +00:00
e43a5214b4Merge branch '0.7.x' into 0.8.x
Sarven Capadisli
2009-04-17 19:52:39 +00:00
231c61a7ebstore invite code in session so openidfinish can find it
Evan Prodromou
2009-04-17 12:52:26 -07:00
b22f446df2Clear notice char counter for direct messages as well.
Sarven Capadisli
2009-04-17 19:51:20 +00:00
cb645558a5Fixed file that was removed by mistake.
Robin Millette
2009-04-17 17:35:51 +00:00
2873940265Fixed file that was removed by mistake.
Robin Millette
2009-04-17 17:31:22 +00:00
2e06d5a2cbfile was removed by mistake.
Robin Millette
2009-04-17 17:24:41 +00:00
c024ee935afile was removed by mistake.
Robin Millette
2009-04-17 17:23:12 +00:00
e5094c3359fix merge conflict 0.7.x 0.8.x in util.php and register.php.
Robin Millette
2009-04-17 17:04:05 +00:00
2eb1eb8683Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Robin Millette
2009-04-17 16:47:18 +00:00
21873b806dcosmetic fixes.
Robin Millette
2009-04-17 16:46:49 +00:00
34d904b180Ticket 1404. Showing the link to the members list page.
Sarven Capadisli
2009-04-17 01:11:38 +00:00
6848e93cd5Merge branch '0.8.x' into twitter-import
Zach Copley
2009-04-16 15:00:58 -07:00
864c4066a6Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Sarven Capadisli
2009-04-16 21:59:40 +00:00
c3a44d2ab9form_notice textarea is cleared on successful direct message post.
Sarven Capadisli
2009-04-16 21:57:42 +00:00
4d0e4f733bMake API dates more compatible with Twitter - ticket 1432
Zach Copley
2009-04-16 14:40:57 -07:00
bac3ee95c9Abort the xmpp-related daemons immediately if xmpp is disabled in the config, otherwise they chew up *lots* of CPU doing nothing
CiaranG
2009-04-16 21:07:59 +01:00
ed05569716Add an even (hook): StartPersonalGroupNav.
Robin Millette
2009-04-16 17:58:52 +00:00
a4238e97d7Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Robin Millette
2009-04-16 17:34:40 +00:00
362cac0a96Add a few events (hooks): RegistrationTry, RegistrationForData, ProfileFormData and ProfileSaveForm.
Robin Millette
2009-04-16 17:34:19 +00:00
2772b0f7cescript to report stats from a cron job
Evan Prodromou
2009-04-16 10:17:58 -07:00