Sarven Capadisli
9465a4d5c6
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-13 20:28:39 +01:00
Sarven Capadisli
171bf3093a
Dialogbox for OStatus remote subscription
2010-02-13 20:28:05 +01:00
Sarven Capadisli
1cb94e0be6
Added dialogbox styles for OStatus subscribe form
2010-02-13 19:07:21 +01:00
Sarven Capadisli
4d050f96f3
Added XHR channel for OStatus Subscribe button
2010-02-13 18:49:14 +01:00
Sarven Capadisli
f30af7047b
Updated feed subscription form markup
2010-02-13 18:46:10 +01:00
Sarven Capadisli
24394269fa
Updated OStatus form markup
2010-02-13 18:44:41 +01:00
Sarven Capadisli
f6e766d5ac
Using the new remote subscription event and updated subscribe label
2010-02-13 18:42:00 +01:00
Sarven Capadisli
fc19179bc5
Added event hook to remote subscription
2010-02-13 18:40:36 +01:00
Evan Prodromou
269b4711eb
Merge branch 'ssleverything' into testing
2010-02-13 12:39:15 -05:00
Zach Copley
f3a82e787c
Add OStatus PuSH hub and Salmon links back into user and group feeds
2010-02-12 19:02:27 -08:00
Brion Vibber
f8a459a88a
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-02-12 15:32:12 -08:00
Brion Vibber
d6f1df8b76
fix for Atom notice output: correct check against conversation & current id
2010-02-12 15:30:23 -08:00
Brion Vibber
38f42d56bc
Session fix for PHP 5.3 configurations where cookies are excluded from $_REQUEST via request_order in php.ini (Fedora 12, MacPorts known to be affected)
2010-02-12 15:24:15 -08:00
Zach Copley
506c2d7491
Initial upgraded Atom output for group timelines
2010-02-12 12:24:29 -08:00
Brion Vibber
122c8677b7
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
2010-02-12 11:18:35 -08:00
Brion Vibber
fd3c9334bf
PHP 5.3 compatibility hack for DB_DataObject
...
statusnet.links.ini file could not be read anymore due to the entry for nonce containing a comma in its key value.
PHP's parse_ini_file() function no longer allows commas in keys, and rejects the *ENTIRE FILE* if it's present, breaking various automatic joins.
2010-02-12 11:15:12 -08:00
Brion Vibber
22025e3b7b
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-12 18:58:29 +00:00
Brion Vibber
b39047d95b
OStatus: prep work for sending notifications on sub/unsub/join/leave/favorite/unfavorite via Salmon; needs to be completed and hooked up once feed gen is fixed.
2010-02-12 18:54:48 +00:00
Sarven Capadisli
47f6b0afc9
Revert "Added 'pre' to pick up Palm Pre's UA string:"
...
This reverts commit 094565b4aa
.
On second thought, "pre" is probably the stupidest way of
differentiating one agent from another. Need a different solution.
2010-02-12 18:30:27 +01:00
Sarven Capadisli
094565b4aa
Added 'pre' to pick up Palm Pre's UA string:
...
Mozilla/5.0 (webOS/1.3.5.1; U; en-US) AppleWebKit/525.27.1 (KHTML,
like Gecko) Version/1.0 Safari/525.27.1 Pre/1.0
2010-02-12 18:20:13 +01:00
Sarven Capadisli
b57e3dfae2
More style generalisation for dialogbox
2010-02-12 14:16:38 +01:00
Sarven Capadisli
42679a22dc
Extracted default values for dialogbox layout and uniqe for form_repeat
2010-02-12 12:04:14 +01:00
Sarven Capadisli
3c79448cd8
Moved colour properties out of base stylesheet
2010-02-12 11:37:47 +01:00
Sarven Capadisli
fd527b8de1
Moved colour properties out of base stylesheet
2010-02-12 11:34:23 +01:00
Evan Prodromou
320532560f
flesh out salmon endpoint
2010-02-12 00:43:16 -05:00
Evan Prodromou
5f94efc454
stub for activities
2010-02-12 00:42:42 -05:00
Brion Vibber
bc46621af2
OStatus sub setup code cleanup and partial group fixes (needs more work after the Atom updates are done)
2010-02-12 01:11:46 +00:00
Zach Copley
525358fa10
Fix retarded spelling mistake
2010-02-11 17:08:50 -08:00
Zach Copley
3beddffc39
ostatus:attention links in Notice Atom output
2010-02-11 16:29:27 -08:00
Brion Vibber
8e6b52e899
OStatus: renamed feedinfo table to ostatus_profile -- will cover remote ostatus people and groups whether a subscription's active or not (maintains identity over unsub/resub, and between subscribers and subscribees)
2010-02-12 00:22:16 +00:00
Brion Vibber
e08657d56c
OStatus: correct parsing of georss:point for max interop (commas allowed, whitespace not strictly defined)
2010-02-11 22:42:36 +00:00
Evan Prodromou
31461e120f
let files go to SSL dir too
2010-02-11 17:06:57 -05:00
Evan Prodromou
3018683718
let backgrounds be put under SSL
2010-02-11 17:03:31 -05:00
Evan Prodromou
b96af33d97
put Javascript files under SSL
2010-02-11 16:59:39 -05:00
Zach Copley
c465f675d9
Make Atom timelines in the API use Atom10feed
2010-02-11 13:56:05 -08:00
Zach Copley
c8d5c8442f
Added some boilerplate class comments, etc.
2010-02-11 13:56:05 -08:00
Zach Copley
e2c0f59414
Some upgrades to Atom output for OStatus
2010-02-11 13:56:05 -08:00
Zach Copley
ce3c3be1bf
Utility classes for atom feeds
2010-02-11 13:56:05 -08:00
Evan Prodromou
d6869cde7b
let avatars be served over SSL
2010-02-11 16:51:15 -05:00
Evan Prodromou
5175b5062e
default theme ssl to null
2010-02-11 16:48:15 -05:00
Evan Prodromou
316ed3f86b
null theme ssl setting means 'guess'
2010-02-11 16:47:47 -05:00
Evan Prodromou
a6ab9c4a3e
Themes can be served from an SSL server
2010-02-11 16:42:58 -05:00
Brion Vibber
1773d12a24
OStatus: save Salmon postback URI in feed subscription info, if provided. Will need it for sub/unsub postbacks and other notifications.
2010-02-11 20:12:48 +00:00
Brion Vibber
21bfbc43ad
OStatus: fix salmon link on Atom feeds; add a url spec for group feeds as well (endpoint needs impl)
2010-02-11 20:02:17 +00:00
Brion Vibber
20714d1f35
OStatus fix: include feed profile at notice text processing time, fixes replies
2010-02-11 19:44:03 +00:00
Siebrand Mazeland
fc431e565a
Localisation updates for !StatusNet from !translatewiki.net !sntrans
2010-02-11 09:36:54 +01:00
Brion Vibber
71151b2583
OStatus: garbage collect unused PuSH subscriptions when the last local subscriber unsubs
2010-02-11 00:09:20 +00:00
Brion Vibber
4ae760cb62
OStatus PuSH fixes:
...
* HMAC now calculated correctly - confirmed interop with Google's public hub
* Can optionally use an external PuSH hub, set URL in $config['ostatus']['hub']
(may have issues in replication environment, and will ping the hub for every
update rather than just those with subscribers) Internal hub will still function
when this is set, but won't be advertised. Warning: setting this, then turning
it off later will break subscriptions as that hub will no longer receive pings.
2010-02-10 22:58:39 +00:00
Brion Vibber
162868afdb
OStatus update: now using standard save/delivery for incoming ostatus messages -- they get reflected to realtime and everything! woooo
...
Group delivery may still need some munging
2010-02-10 21:18:53 +00:00
Brion Vibber
7752612ef6
fix hubdistrib
2010-02-10 20:47:42 +00:00