Evan Prodromou
a19b194a31
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-09-26 15:06:49 -04:00
Evan Prodromou
e1ac3ad868
missing \n in ja translation
2011-09-26 15:04:49 -04:00
Samantha Doherty
70355c0edd
Updated RTL.css for neo
2011-09-26 15:01:12 -04:00
Evan Prodromou
eb711321c3
Merge branch '1.0.x' into testing
2011-09-26 14:10:43 -04:00
Samantha Doherty
76821df931
Whoops quick fix fornewschool conversations.
2011-09-26 08:41:40 -04:00
Samantha Doherty
800c7a616b
A little style for oldschool conversation layout.
2011-09-26 08:27:04 -04:00
Samantha Doherty
b0ee583270
Tiny layout fix for QnA.
2011-09-26 08:26:38 -04:00
Zach Copley
634fb64c11
Facebook bridge mostly working again with new OAuth 2.0 flow
2011-09-26 05:32:19 +00:00
Siebrand Mazeland
c9c8c9ffdc
Remove punctuation in e-mail subject. Spotted by OsamaK.
2011-09-26 00:10:34 +02:00
Siebrand Mazeland
e7dac240ef
Localisation updates from http://translatewiki.net .
2011-09-26 00:01:00 +02:00
Evan Prodromou
a844c423a9
Merge branch '1.0.x' into testing
2011-09-24 10:18:09 -04:00
Evan Prodromou
379b3f5384
Merge branch 'streammode' into 1.0.x
2011-09-24 10:17:17 -04:00
Evan Prodromou
8e04dce947
Old-school settings page
...
A page to set or remove old-school settings.
2011-09-24 10:14:45 -04:00
Evan Prodromou
ea1a11a087
site-wide option to enable old-school settings
2011-09-24 09:46:13 -04:00
Evan Prodromou
ae0b4d49c7
optional conversation tree view
2011-09-24 09:29:12 -04:00
Evan Prodromou
61a3ccf2bf
users can choose to just see nicknames in streams
2011-09-24 07:19:52 -04:00
Evan Prodromou
ddc121c085
New table for all old-school UI prefs
2011-09-24 07:12:34 -04:00
Evan Prodromou
02a30cf47c
start using stream mode prefs instead of separate parameter
2011-09-23 17:50:38 -04:00
Evan Prodromou
66c97a1a1e
switch between conversation and stream for public and group
2011-09-23 17:28:54 -04:00
Evan Prodromou
dba9d71abd
Support mode in all
2011-09-23 17:18:21 -04:00
Samantha Doherty
9995d9b5a4
Make addressee groups italic.
2011-09-23 16:42:12 -04:00
Zach Copley
118e84be19
Update to latest Facebook PHP sdk
2011-09-22 15:47:55 -07:00
Evan Prodromou
e3460d9b24
Merge branch 'master' of gitorious.org:statusnet/mainline
2011-09-22 16:31:26 -04:00
Evan Prodromou
8fa816c324
don't use potentially bad Profile values
2011-09-22 16:29:31 -04:00
Zach Copley
8e501584b4
Use array_merge instead of array_replace (same effect, and array_merge works with PHP versions < 5.3)
...
fixes http://status.net/open-source/issues/3393
2011-09-22 12:54:22 -07:00
Zach Copley
c2da445699
Use array_merge instead of array_replace (same effect, and array_merge works with PHP versions < 5.3)
...
fixes http://status.net/open-source/issues/3393
2011-09-22 12:53:31 -07:00
Zach Copley
6f0cb0b23f
Merge branch 'site-profile-fixes'
...
* site-profile-fixes:
Use array_merge instead of array_replace (same effect, and array_merge works with PHP versions < 5.3)
Update RTL stylesheet for neo.
2011-09-22 12:52:38 -07:00
Zach Copley
4c91dc4546
Use array_merge instead of array_replace (same effect, and array_merge works with PHP versions < 5.3)
...
fixes http://status.net/open-source/issues/3393
2011-09-22 12:51:24 -07:00
Samantha Doherty
2287f29c57
Update RTL stylesheet for neo.
2011-09-22 12:50:40 -07:00
Samantha Doherty
f65fa42e15
Update RTL stylesheet for neo.
2011-09-22 09:27:36 -04:00
Samantha Doherty
b15aea653d
Improved browser compatibility for various gradients.
2011-09-22 09:27:15 -04:00
Samantha Doherty
39cf27c0e9
A little more IE style cleanup.
2011-09-22 09:26:03 -04:00
Samantha Doherty
bcb0709401
Only load theme-specific IE stylesheets if they exist.
2011-09-22 09:22:08 -04:00
Samantha Doherty
5711655d7b
Quick update of theme README file.
2011-09-22 09:19:46 -04:00
Evan Prodromou
d214d4533c
don't cause an error on non-user profile in api
2011-09-21 17:15:55 -04:00
Evan Prodromou
642901f4ae
No such path 'index', so redirect to home timeline
2011-09-21 16:33:10 -04:00
Evan Prodromou
d594c83a5a
Merge commit 'refs/merge-requests/159' of git://gitorious.org/statusnet/mainline into merge-requests/159
2011-09-21 16:31:38 -04:00
Evan Prodromou
59043dca7f
Merge commit 'refs/merge-requests/164' of git://gitorious.org/statusnet/mainline into merge-requests/164
...
Conflicts:
classes/Avatar.php
I ignored the code in Avatar; it's a different patch.
2011-09-21 15:39:44 -04:00
Evan Prodromou
7d64d8c78c
Merge commit 'refs/merge-requests/165' of git://gitorious.org/statusnet/mainline into merge-requests/165
...
Conflicts:
lib/noticelist.php
2011-09-21 15:33:52 -04:00
Evan Prodromou
12588b1cf7
Merge commit 'refs/merge-requests/166' of git://gitorious.org/statusnet/mainline into merge-requests/166
2011-09-21 15:24:17 -04:00
Evan Prodromou
ad726a15de
Use an event to signal that IM settings are available
...
Rather than enumerating available classes, define an event that sets a
flag indicating that there's an IM plugin available. Implemented in
implugin.php, so all IM plugins that use that class should
work. Others can hook the event, too.
2011-09-21 15:15:59 -04:00
Evan Prodromou
c48cdc7d50
Merge commit 'refs/merge-requests/169' of git://gitorious.org/statusnet/mainline into merge-requests/169
2011-09-21 15:09:05 -04:00
Evan Prodromou
0d2cf719c7
Merge commit 'refs/merge-requests/170' of git://gitorious.org/statusnet/mainline into merge-requests/170
2011-09-21 15:05:41 -04:00
Evan Prodromou
1014e295ee
bad sprintf format for new follow activity notices
2011-09-21 10:18:16 -04:00
Evan Prodromou
838c3988ee
Change defaults for ActivityPlugin to only log joins and follows
2011-09-21 10:15:34 -04:00
Evan Prodromou
5df47bc659
Merge branch 'testing'
2011-09-21 10:07:20 -04:00
Ciaran Gultnieks
084bb851aa
Make im confirmation codes work instead of sending an invalid URL
2011-09-21 12:25:12 +01:00
Zach Copley
58b9f83a02
Allow repeats to flow through the Twitter bridge
2011-09-21 05:23:47 +00:00
Zach Copley
c9cbc31481
Don't send notices from the ActivityPlugin to Twitter
2011-09-21 02:31:51 +00:00
Zach Copley
b6b13a6bc7
Don't access current user without session
2011-09-21 00:40:27 +00:00
