Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,934 Commits 215 Branches 500 Tags 886 MiB
Commit Graph

7934 Commits

Author SHA1 Message Date
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
Jeff Atwood 294eff9262 more 14.04 refinements 2014-04-17 14:08:35 -07:00
Jeff Atwood b8acf8df75 update to ubuntu 14.04 2014-04-17 13:59:13 -07:00
Robin Ward 64faee0935 Break down new topic counts by category if a digest contains many. 2014-04-17 16:42:40 -04:00
Robin Ward 0e56157212 Basic "Also, there are x new topics" text for the digest 2014-04-17 16:04:26 -04:00
Robin Ward fd4007eefc FIX: Don't sort the new topics by score since the Top logic is already 
sorting them by score.
 2014-04-17 15:43:24 -04:00
Robin Ward 564b1d86b0 Digest should exclude muted topics. 2014-04-17 15:27:11 -04:00
Robin Ward 89aa2380c6 Use "Top" logic for digest emails. Leave out muted categories. 2014-04-17 15:22:19 -04:00
Robin Ward 2341118570 Add categories to the first topics in the email digest 2014-04-17 15:22:19 -04:00
Régis Hanol b2cb4b27a1 Merge pull request #2273 from paully21/development-branch 
Add blurb of post to search results via API
 2014-04-17 21:06:03 +02:00
Régis Hanol bda47c2bf8 Merge pull request #2274 from vikhyat/badge-system 
Fix user_badges n+1 query
 2014-04-17 21:05:48 +02:00
Neil Lalonde 890e53cd6e Remove the default_invitee_trust_level+1 privilege from trust level 3. 2014-04-17 15:05:15 -04:00
Neil Lalonde 87e5e4b8d0 Use a real link to docker manager in new version email 2014-04-17 14:36:26 -04:00
Neil Lalonde 6c7863bbba Show installed version on dashboard after upgrade 2014-04-17 14:26:44 -04:00
Robin Ward a57f802048 If there's a `TopicEmbed` record for a url, we don't have to crawl it. 
This should help sites like Boing Boing where sometimes links are
crawled before saved in WordPress.
 2014-04-17 14:00:22 -04:00
Robin Ward ffc1634193 FIX: Only show link clicks on the title of a onebox, not repeatedly in 
its body.
 2014-04-17 13:01:44 -04:00
Robin Ward 87682f7539 FIX: Don't include image meta data when embedded in an email 2014-04-17 12:32:51 -04:00