Brion Vibber
712db3a897
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
2009-10-12 11:10:06 -07:00
Craig Andrews
f719720e8a
Merge remote branch 'statusnet/0.8.x' into 0.9.x
...
Conflicts:
lib/common.php
2009-10-11 13:39:10 -04:00
Craig Andrews
006cfc528e
Merge commit 'refs/merge-requests/1723' of git://gitorious.org/statusnet/mainline into 0.8.x
2009-10-11 13:21:18 -04:00
Craig Andrews
6f12ed5f91
Merge commit 'refs/merge-requests/1730' of git://gitorious.org/statusnet/mainline into 0.8.x
2009-10-11 13:20:02 -04:00
Craig Andrews
1f21e5ee79
Merge commit 'refs/merge-requests/1738' of git://gitorious.org/statusnet/mainline into 0.8.x
2009-10-11 13:17:59 -04:00
Craig Andrews
96d32fb8d0
Implemented create group api
2009-10-11 13:13:15 -04:00
Brion Vibber
3f27f3138e
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
2009-10-10 19:36:14 -07:00
Evan Prodromou
e9d7f18f0c
fix FBConnect so it doesn't muffle EndPrimaryNav
2009-10-09 14:06:08 -04:00
Evan Prodromou
88e7092d23
don't write session if it's unchanged
2009-10-09 10:39:56 -04:00
Jeffery To
c597aba342
Fixed facebook connect primary nav to hide search option when site is private and user is not logged in
2009-10-09 11:52:03 +08:00
Jeffery To
d13b0c385d
Fixed facebook connect primary nav to obey sms/twitter/openid settings
2009-10-09 11:50:04 +08:00
Jeffery To
b8f8c41c18
Fixed facebook connect login nav to obey openid settings
2009-10-09 11:31:55 +08:00
Jeffery To
11e36b18cc
Fixed facebook connect nav to obey sms/twitter disabled
2009-10-09 11:25:31 +08:00
Jeffery To
2dc66035ba
Fixed twitter defaulting to disabled
2009-10-09 11:16:04 +08:00
Evan Prodromou
a6d4adc398
Revert "Open tags should have closing tags"
...
This reverts commit aeca8807dbce951beccbc3fb0e5a4ae5600e5e5f.
We specifically DON'T have closing tags so we don't get errors with
whitespace after the closing tag.
I realize this is less of an issue with scripts, but we should still
not use closing tags.
2009-10-08 11:41:39 -04:00
Jeffery To
daaa1d4790
Don't show search suggestions for private sites
2009-10-08 12:49:30 +08:00
Jeffery To
838c13063a
Fixed E_NOTICE when returnto isn't set
2009-10-07 17:28:30 +08:00
Jeffery To
9449a1e39c
Fixed E_NOTICE when the "lite" parameter isn't included in the request
2009-10-07 17:28:29 +08:00
Jeffery To
87f5c53dd0
Fixed E_NOTICE - GroupList expects an owner object in the constructor, not an array of search terms
2009-10-07 16:18:05 +08:00
Sarven Capadisli
f7d86f1cc6
Returning false seems to fix IE from reclaiming window focus. I think
...
'WTF' best describes this behaviour. Further investigation required.
2009-10-06 16:04:36 +00:00
Sarven Capadisli
81199d0258
Aligning notice attach label from right instead of left
2009-10-06 15:51:06 +00:00
Sarven Capadisli
7fe1facc99
Fixed IE background image alignment for attach, favour and disfavour
2009-10-06 15:40:56 +00:00
Sarven Capadisli
d37bf29bba
Fixed nudge and direct message background image alignment
2009-10-06 15:40:28 +00:00
Sarven Capadisli
e63a435868
Using 'CSS sprites' for common icons for the identica theme. Default
...
theme will follow after some tests.
2009-10-06 17:16:28 +02:00
Eric Helgeson
aeca8807db
Open tags should have closing tags
2009-10-05 12:55:55 -04:00
Brion Vibber
c0feb550b0
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
2009-10-05 09:01:51 -07:00
Sarven Capadisli
7a33125a6c
Added hook to wrap the notice form data block
2009-10-05 14:17:55 +00:00
Brion Vibber
4462a1c636
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
2009-10-04 16:16:52 -07:00
Sarven Capadisli
2f065d687d
Unnecessary selector bit
2009-10-04 23:53:02 +02:00
Sarven Capadisli
a4e972482f
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2009-10-04 23:50:55 +02:00
Sarven Capadisli
df8cce2788
Removed obsolete iphone theme (pre v0.7)
2009-10-04 16:51:43 +00:00
Sarven Capadisli
c600d38467
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2009-10-04 13:15:36 +02:00
Evan Prodromou
affe00276a
remove spurious readme from Orbited
2009-10-04 04:11:10 -04:00
Evan Prodromou
650d2e2f8e
Merge branch 'orbited' into 0.9.x
2009-10-04 04:10:24 -04:00
Evan Prodromou
091e7b908b
need to show scripts at end of body in RealtimePlugin
2009-10-04 04:10:15 -04:00
Evan Prodromou
27ff66c9de
Some changes required from Orbited debugging
2009-10-04 04:05:40 -04:00
Sarven Capadisli
e87a70e20b
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2009-10-04 10:01:53 +02:00
Evan Prodromou
035978270d
Update OrbitedPlugin to work with RealtimePlugin framework
2009-10-04 03:15:59 -04:00
Evan Prodromou
9c2d0879e9
updated OrbitedPlugin to use RealtimePlugin
2009-10-04 03:15:59 -04:00
Evan Prodromou
630dcda56f
remove unused files for OrbitedPlugin
2009-10-04 03:15:59 -04:00
Evan Prodromou
0d6314052f
rename plugin
2009-10-04 03:15:59 -04:00
Evan Prodromou
22b4a66de3
copy Comet plugin to Orbited
2009-10-04 03:15:59 -04:00
Evan Prodromou
9c460d591e
move scripts to just before </body>, add event for scripts that need to be in <head>
2009-10-04 03:14:39 -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
18f4a7eaea
reformat Notice.php
2009-10-03 20:34:40 -04:00
Brenda Wallace
bcdf31c639
added all them doxygens
2009-10-04 11:14:26 +13:00
Sarven Capadisli
d1a5a49875
Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.8.x
2009-10-03 22:07:41 +00:00
Sarven Capadisli
5528c0cd3d
Using CDATA for autofocus script
2009-10-03 22:06:51 +00:00
Sarven Capadisli
2e8fcd7059
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2009-10-03 20:50:21 +02:00
Brenda Wallace
00c0becd56
more doxygen
2009-10-03 17:48:38 +13:00
