Commit Graph

7950 Commits

Author SHA1 Message Date
Kris Aubuchon
2c44f724f4 fixing the composer that I just re-broke 2014-04-21 11:54:57 -04:00
Robin Ward
b9ca124756 Support for /my/preferences to automatically redirect to the logged in
user.
2014-04-21 11:52:11 -04:00
Robin Ward
61e6eae728 FIX: /topics/period routes were broken 2014-04-21 10:26:24 -04:00
Robin Ward
4dc20e6855 FIX: Sanitize custom quote attributes 2014-04-21 10:19:39 -04:00
Régis Hanol
faec113710 Merge pull request #2285 from awesomerobot/master
desktop composer fix
2014-04-21 15:58:23 +02:00
Kris Aubuchon
5fd874b74a desktop composer fix 2014-04-21 09:56:10 -04:00
Jaime Iniesta
2c3a10aa5b fixes user specs about ampersands in gravatar URLs 2014-04-21 10:52:58 +02:00
Jeff Atwood
f676264a67 stray S 2014-04-20 22:54:04 -07:00
Jeff Atwood
7e3dd43e9a missed a pin copy 2014-04-20 22:52:26 -07:00
Jeff Atwood
48b987c397 admin quick start guide improvements 2014-04-20 22:50:43 -07:00
Jeff Atwood
1ee039f786 fix pin message copy 2014-04-20 22:45:48 -07:00
Jeff Atwood
4932ee5dd5 add section on User Trust to admin quickstart 2014-04-20 16:33:42 -07:00
Jaime Iniesta
6084cb969d escape gravatar URLs to comply with W3C standards
This fixes an HTML validation error due to & not being properly escaped on the gravatar URLs.
2014-04-21 00:46:00 +02:00
Jeff Atwood
7aecf5f6ef Merge pull request #2283 from awesomerobot/master
pulling some more styles out of desktop/mobile to common/base
2014-04-20 12:24:29 -07:00
Kris Aubuchon
e4d1aaa290 pulling some more styles out of desktop/mobile to common/base 2014-04-20 15:17:11 -04:00
Kris Aubuchon
bffeba5e3b pulling some more styles out of desktop/mobile to common/base 2014-04-20 15:16:06 -04:00
Jeff Atwood
cd86343598 Merge pull request #2280 from awesomerobot/master
initial move of common desktop/mobile styles to common/base
2014-04-19 12:00:17 -07:00
Kris Aubuchon
3f102a98da initial move of common desktop/mobile styles to common/base 2014-04-19 14:04:22 -04:00
Erick Guan
6d45f71254 move concerns to the model/concerns 2014-04-19 12:00:40 +08:00
Jeff Atwood
0405324596 Update INSTALL.md 2014-04-18 16:55:00 -07:00
Régis Hanol
2f08832cb7 FEATURE: handle 2 levels of categories in vanilla import 2014-04-19 00:59:20 +02:00
Jeff Atwood
ffda5ad4ac fix english 2014-04-18 12:31:27 -07:00
Jeff Atwood
c9e8aaa502 clarify why email is important 2014-04-18 12:28:10 -07:00
Jeff Atwood
aab1bc35a9 add note about private forum/category 2014-04-18 12:25:47 -07:00
Jeff Atwood
87348b4ada add SSO note to admin quick start 2014-04-18 12:22:49 -07:00
Jeff Atwood
1e8dc719c6 better admin quick start guide 2014-04-18 12:19:13 -07:00
Régis Hanol
454f11e597 FEATURE: new title_sanitize site setting 2014-04-18 21:01:21 +02:00
Régis Hanol
ba0084edee FEATURE: vanilla import 2014-04-18 18:42:31 +02:00
Jeff Atwood
9d3f7d5b80 spell out CDN 2014-04-18 02:51:44 -07:00
Régis Hanol
756ea0178a Merge pull request #2276 from vikhyat/badge-system
Badge system updates
2014-04-18 11:46:19 +02:00
Régis Hanol
b014d66b65 Merge pull request #2277 from vikhyat/fix-title-html
Fix HTML tags in topic titles
2014-04-18 11:37:33 +02:00
Jeff Atwood
cdf473e86a add CDN instructions 2014-04-18 00:55:44 -07:00
Jeff Atwood
b88714fb99 Update INSTALL-digital-ocean.md 2014-04-18 00:02:01 -07:00
Jeff Atwood
b846eb4544 backup size column does not need to be so large 2014-04-17 23:49:58 -07:00
Vikhyat Korrapati
25a080a8e1 Fix HTML tags in topic titles.
We no longer sanitize titles before saving to the database since it
would cause problems like HTML entities showing up when you try to edit
a topic title. It isn't even really necessary since we only render
fancy_title directly and never title.

The escaping logic used here is the same that is used both in lodash and
onebox. See:

1. https://github.com/discourse/onebox/pull/190/files
2. https://github.com/lodash/lodash/blob/2.4.1/dist/lodash.compat.js#L6194
2014-04-18 10:47:00 +05:30
Vikhyat Korrapati
27b62df48b Change "awarded" to "granted". 2014-04-18 09:20:55 +05:30
Vikhyat Korrapati
e6eb16ee73 Fix infinite loading spinner for badges that have not been granted yet. 2014-04-18 09:20:55 +05:30
Vikhyat Korrapati
8113e8d897 Basic UI for selecting gold/silver badges as titles. 2014-04-18 09:20:51 +05:30
Jeff Atwood
f6783775f2 Merge pull request #2275 from techAPJ/guide-image-updates
digital ocean guide ubuntu 14.04 image updates
2014-04-17 20:01:42 -07:00
Vikhyat Korrapati
95b430df72 Link poster expansion "+x more" to user badges page. 2014-04-18 08:24:48 +05:30
Arpit Jalan
2d8e168461 digital ocean guide ubuntu 14.04 image updates 2014-04-18 08:13:37 +05:30
Jeff Atwood
17110a6eba use the actual name 2014-04-17 16:57:54 -07:00
Jeff Atwood
b38e8320e9 some tweaks 2014-04-17 16:57:02 -07:00
Vikhyat Korrapati
4eb7579d04 Notification copy. 2014-04-18 04:04:24 +05:30
Vikhyat Korrapati
5bb3a1a05a Show badges filter in user profiles only when the user has badges. 2014-04-18 04:03:13 +05:30
Jeff Atwood
55a6078188 collapse SSH/Putty line 2014-04-17 15:24:20 -07:00
Jeff Atwood
ab8ba34d42 add better nano screenshot 2014-04-17 15:21:38 -07:00
Jeff Atwood
e960d67d70 update final screenshot, add email section 2014-04-17 15:12:46 -07:00
Jeff Atwood
1d342870c5 match image sizes 2014-04-17 14:19:04 -07:00
Jeff Atwood
c569bdda0d actually, discourse.example.com is better 2014-04-17 14:12:07 -07:00