Evan Prodromou
ff782f1d97
Thread by conversation, not id
2011-04-15 18:28:36 -04:00
Evan Prodromou
2dd81d9a5c
add a threading notice stream class
2011-04-15 18:20:54 -04:00
Evan Prodromou
97bae46da1
Revert "Add threading notice stream class to threaded pages"
...
This reverts commit 97a8bae4a9
2011-04-15 18:20:06 -04:00
Evan Prodromou
97a8bae4a9
Add threading notice stream class to threaded pages
...
For those pages where threading is important, we now have an extra filtering stream
class to skip stuff in conversations that have "already" been seen.
2011-04-15 18:17:48 -04:00
Brion Vibber
37a37e1dd5
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-04-15 15:14:21 -07:00
Brion Vibber
79190c87b2
Fix regression in inline replies to newly added messages (regression from my fixes w/ the realtime stuff)
2011-04-15 15:03:20 -07:00
Evan Prodromou
4176a05f20
Merge branch '1.0.x' into testing
2011-04-15 18:01:00 -04:00
Evan Prodromou
0925b96840
Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x
2011-04-15 17:55:43 -04:00
Zach Copley
aad3372db9
Capitalization
2011-04-15 21:19:30 +00:00
Zach Copley
e47a2a3bca
Merge branch 'lists_fixes' into 1.0.x
2011-04-15 21:07:06 +00:00
Shashi Gowda
2daf6769d1
Add link to lists doc to Help page
2011-04-16 02:34:25 +05:30
Zach Copley
da6822c1f0
Merge branch 'lists_fixes' into 1.0.x
2011-04-15 20:50:04 +00:00
Shashi Gowda
679a9cee99
Lists user documentation
2011-04-16 02:05:14 +05:30
Shashi Gowda
22e50ad7bb
Merge remote-tracking branch '1.0.x' into lists_fixes
2011-04-16 01:01:01 +05:30
Shashi Gowda
b78e5de474
Profile::getOwnedTags -> Profile::getLists, first argument is the current user, or the user accessing the lists.
2011-04-16 00:52:58 +05:30
Evan Prodromou
6d5b6d98b5
Merge branch '1.0.x' into testing
2011-04-15 14:57:41 -04:00
Siebrand Mazeland
c27b9c0722
Update translator documentation.
...
i18n/L10n updates.
Whitespace updates.
2011-04-15 15:07:35 +02:00
Siebrand Mazeland
55b58f0f1f
Update translator documentation.
2011-04-15 10:20:34 +02:00
Siebrand Mazeland
44bdc2ddaf
Remove obsolete code.
...
Update translator documentation.
2011-04-15 10:12:49 +02:00
Siebrand Mazeland
abcfde4d7d
i18n fixes for xgettext issue with contructions like "<<< END_OF_INSTRUCTIONS".
...
Update translator documentation.
FIXMEs added. Asking Zach on IRC to have a look at them.
2011-04-15 09:55:09 +02:00
Siebrand Mazeland
edb467978d
Fix incorrect translator documentation.
2011-04-15 09:31:30 +02:00
Samantha Doherty
9bfb7f0888
Style for invite button.
2011-04-15 02:29:01 -04:00
Evan Prodromou
8df3fcd19f
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-04-14 23:58:02 -04:00
Evan Prodromou
1c2d4de469
scale down the thumbnail image if necessary
2011-04-14 23:57:30 -04:00
Evan Prodromou
2df98fc240
auto-fill bookmark data
2011-04-14 23:44:01 -04:00
Samantha Doherty
acaf86c973
Include Lato font in neo theme.
2011-04-14 23:20:49 -04:00
Evan Prodromou
41a883aeab
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into prefillbookmark
2011-04-14 21:55:16 -04:00
Zach Copley
335390f2ca
Merge branch 'onboarding-remix' into 1.0.x
...
* onboarding-remix:
* Show the right menus in the aside after successful registration * Events surrounding successful registration output
2011-04-14 15:46:40 -07:00
Zach Copley
951ee1faff
* Show the right menus in the aside after successful registration
...
* Events surrounding successful registration output
2011-04-14 15:45:05 -07:00
Zach Copley
bef1ed75b5
Merge branch '1.0.x' of git@gitorious.org:statusnet/mainline into 1.0.x
2011-04-14 22:29:11 +00:00
Evan Prodromou
3d9dc111a2
class on the invite link
2011-04-14 18:28:37 -04:00
Shashi Gowda
7224ca571c
List timeline cache blowing wasn't working. fixed.
2011-04-14 22:28:25 +00:00
Evan Prodromou
41dc9ca497
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
...
Conflicts:
classes/Profile.php
2011-04-14 18:28:03 -04:00
Evan Prodromou
3df69fe5ba
show invite button in public
2011-04-14 18:19:59 -04:00
Evan Prodromou
0cc73b3b2a
show invite button section on home page
2011-04-14 18:19:18 -04:00
Evan Prodromou
873b1fb186
invite button section
2011-04-14 18:19:09 -04:00
Evan Prodromou
f512e3df40
breakup Section::show()
2011-04-14 18:18:39 -04:00
Evan Prodromou
9eba121339
better title for active groups
2011-04-14 18:16:27 -04:00
Evan Prodromou
e5a84bfca2
better title for active groups
2011-04-14 18:16:10 -04:00
Evan Prodromou
93bfacad3b
no object nav for invite
2011-04-14 18:15:47 -04:00
Shashi Gowda
161b672db2
List timeline cache blowing wasn't working. fixed.
2011-04-15 03:39:27 +05:30
Zach Copley
70c8de4354
Remove bogus parameters from function declaration (was throwing a warning)
2011-04-14 15:07:54 -07:00
Evan Prodromou
9208c94b29
don't show private lists; correct link in header
2011-04-14 17:27:26 -04:00
Evan Prodromou
edee3995c2
no All groups link
2011-04-14 17:14:57 -04:00
Evan Prodromou
2581e46a25
hide tagsub from stats
2011-04-14 17:03:32 -04:00
Evan Prodromou
6e5e486dc8
hide searchsub from stats
2011-04-14 17:03:23 -04:00
Evan Prodromou
c8a58c924b
show lists as a comma-separated list in sidebar
2011-04-14 17:03:10 -04:00
Evan Prodromou
90e6eab68e
show user's lists in sidebar
2011-04-14 16:57:50 -04:00
Evan Prodromou
14308c21db
Don't show featuredusersection by default
2011-04-14 16:25:13 -04:00
Evan Prodromou
a2d1eb399f
disable sms, email by post by default
2011-04-14 16:24:56 -04:00
