Commit graph

9378 commits

Author SHA1 Message Date
Régis Hanol
70177fabf5 Merge pull request #2526 from awesomerobot/master
adding some topic layout flexibility
2014-07-10 18:05:24 +02:00
Kris Aubuchon
5aaaa9b915 Merge remote-tracking branch 'upstream/master'
Conflicts:
	app/assets/stylesheets/desktop/topic-post.scss
2014-07-10 11:45:25 -04:00
Kris Aubuchon
f20a5e2c30 adding some topic layout flexibility 2014-07-10 11:40:31 -04:00
Neil Lalonde
21d3785622 Merge pull request #2517 from ninjasphere/fix_avatar_refresh_task_name
FIX: avatars:regenerate rake task is now avatars:refresh
2014-07-10 11:31:52 -04:00
Neil Lalonde
c6a313d458 Seed categories with capitalized names 2014-07-10 11:28:49 -04:00
Sam
d277932b22 Update logster 2014-07-10 17:59:23 +10:00
Jeff Atwood
61e87a1bbc make sure /top looks OK on mobile 2014-07-10 00:57:30 -07:00
Jeff Atwood
d053ad07fb we don't want danger color on mobile category 2014-07-10 00:47:25 -07:00
Jeff Atwood
a56db77172 copyedit 2014-07-10 00:43:41 -07:00
Jeff Atwood
4215b6347c quick temporary fix for wrapping right gutter 2014-07-10 00:43:41 -07:00
Sam
27f85e5451 FIX: allow for subdirectorys for cdn assets 2014-07-10 17:29:38 +10:00
Sam
6019e3f257 FIX: remove hardcoding from middleware stack so we can control it 2014-07-10 17:01:21 +10:00
Sam
5032c96486 FIX: disable x accl redirect for CDN assets
We need to keep headers in tact
2014-07-10 16:32:46 +10:00
Jeff Atwood
e4a7f652cc grammar tweak. It's shorter too! 2014-07-09 23:08:01 -07:00
Jeff Atwood
4654bb3688 Merge pull request #2524 from techAPJ/patch-3
Improve invite email copy
2014-07-09 22:47:23 -07:00
Jeff Atwood
3deba15c18 minor copyedits 2014-07-09 22:35:50 -07:00
Arpit Jalan
2f6c984c8c Improve invite email copy 2014-07-10 10:57:40 +05:30
Sam
103e2ebba9 FIX: properly support sendfile on all routes
FIX: disable unused etags
2014-07-10 15:18:51 +10:00
Jeff Atwood
95282a4c6d add badge glyph to edit button 2014-07-09 22:01:03 -07:00
Jeff Atwood
0d9aacec24 Merge pull request #2523 from techAPJ/patch-3
FIX: include topic title and domain name in topic invite mail
2014-07-09 21:38:17 -07:00
Arpit Jalan
8395da5bd0 FIX: include topic title and domain name in topic invite mail 2014-07-10 10:05:28 +05:30
Sam
c5d3db9148 FIX: there is no trust_level_5 2014-07-10 12:17:13 +10:00
Sam
2f8d139ec0 BUGFIX: incorrect ordering in category permissions
FEATURE: UI for categories that we allow badges on
2014-07-10 12:02:16 +10:00
Sam
928848c0a8 FEATURE: First Link badge 2014-07-10 12:02:16 +10:00
Jeff Atwood
97979c1a32 Merge pull request #2522 from awesomerobot/master
adapting the layout to fit more viewports
2014-07-09 17:28:32 -07:00
Sam
d54c28adc1 FIX: better whitelisting 2014-07-10 09:59:54 +10:00
Kris Aubuchon
291459bb91 first steps to making discourse more responsive 2014-07-09 19:56:35 -04:00
Sam
9828a268b9 Fix: whitelist regex for bbcode too wide 2014-07-10 09:17:04 +10:00
Régis Hanol
a52c80e2a8 FEATURE: automatic image orientation fix 2014-07-09 23:59:57 +02:00
Neil Lalonde
362adb0498 FIX: add site setting email_site_title, which overrides title in reply by email address in case the title has invalid characters 2014-07-09 16:44:18 -04:00
Régis Hanol
fab2c8f816 Create vbulletin.rb 2014-07-09 22:44:06 +02:00
Régis Hanol
5212c1785d Create vanilla.rb 2014-07-09 22:43:40 +02:00
Régis Hanol
ef44b6218d FEATURE: better mobile upload experience (upload the picture right away) 2014-07-09 22:40:22 +02:00
Jeff Atwood
0a643353cf slight improvements to invite email copy 2014-07-09 12:57:04 -07:00
Jeff Atwood
71b18ce5e2 minor copyedit on invites 2014-07-09 12:45:01 -07:00
Neil Lalonde
88d1e25354 Merge pull request #2521 from techAPJ/patch-3
FEATURE: include topic context in topic invite
2014-07-09 13:24:44 -04:00
Arpit Jalan
223bbc3da3 FEATURE: include topic context in topic invite 2014-07-09 21:23:20 +05:30
Régis Hanol
27f7730fe8 fix the build 2014-07-09 17:39:38 +02:00
Neil Lalonde
c113b5d270 FEATURE: phpbb 3 import script 2014-07-09 11:18:29 -04:00
Régis Hanol
6b45b635f8 FIX: properly whitelist <code> classes needed for syntax highlighting 2014-07-09 16:27:47 +02:00
Sam
9ffcbfca98 FIX: disable whitelist temporarily
more complete fix to follow
2014-07-09 22:13:27 +10:00
Sam
21bc20169e FIX: stop stacking, stuff was upgraded dialogs 2014-07-09 16:43:54 +10:00
Sam
0d281d9de6 FIX: Firefox chucks exceptions on localStorage with cookies disabled 2014-07-09 16:15:52 +10:00
Sam
9c14385a86 FEATURE: explain which badges can be titles 2014-07-09 16:03:53 +10:00
Sam
8fcc019ff8 FIX: only allow badge title selection if it exists 2014-07-09 15:31:49 +10:00
Sam
e32e96dabb FEATURE: new badges
- Pay it forward renamed to first like
- First flag
- First share
2014-07-09 12:17:39 +10:00
Jeff Atwood
0317e503b3 minor copyedit 2014-07-08 17:00:50 -07:00
Jeff Atwood
1c3dff2013 we don't use %{site_password} any more 2014-07-08 16:58:39 -07:00
Jeff Atwood
1ee3cf8c1d fix some minor 404 search page issues 2014-07-08 15:57:41 -07:00
Jeff Atwood
92d42a43fd remove unnecessary quote spacing on expand replies 2014-07-08 14:56:10 -07:00