Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,573 Commits 210 Branches 500 Tags 857 MiB
Commit Graph

5421 Commits

Author SHA1 Message Date
Jeff Atwood 504e971bda fix PM participant alignment on mobile 2014-07-12 22:17:54 -07:00
Jeff Atwood f378004a41 embedded quote colors were wrong, THANKS OBAMA 2014-07-12 01:31:26 -07:00
Jeff Atwood fe95597ce8 very minor mobile layout tweaks 2014-07-12 01:04:25 -07:00
Jeff Atwood b8d9781739 minor mobile topic list tweaks 2014-07-12 00:44:01 -07:00
Jeff Atwood 0068ac9124 fix mobile layout of /faq /tos /privacy 2014-07-12 00:04:22 -07:00
Kris Aubuchon 8da4046d79 minor alignment fixes on badge page w/description 2014-07-12 00:36:01 -04:00
Kris Aubuchon 9398504332 fixing appearance of horizontal scrollbar on topic list at about 996px wide 2014-07-12 00:12:50 -04:00
Régis Hanol edba5c631f FEATURE: reject accounts created with an email address similar to a known spammer email 2014-07-12 01:59:43 +02:00
Régis Hanol b526cdc55c Revert "FEATURE: reject accounts created with an email address similar to a known spammer email" 
This reverts commit 39be48a441.

Conflicts:
	spec/models/screened_email_spec.rb
 2014-07-12 01:01:37 +02:00
Kris Aubuchon 1ef4a12a9d fixing onebox image width bug 2014-07-11 18:04:32 -04:00
riking 783454ebe1 Fix /p/post/user route not saving referrals 
Make user id optional for /p/id/uid
Add /posts/id/raw route for debugging failed post processing
 2014-07-11 14:44:07 -07:00
Neil Lalonde d45c50f4bb Merge pull request #2529 from riking/email 
Two light commits for email
 2014-07-11 16:30:58 -04:00
Jeff Atwood 314f154def line up modal nav pills better 2014-07-11 13:28:51 -07:00
riking 07d8d5ed75 Change default email_in minimum trust to 2 
Also, rename MinTrustToCreateTopicSetting to TrustLevelSetting, and apply it to more settings
 2014-07-11 12:35:59 -07:00
Neil Lalonde d13dbaaa36 FEATURE: enter key in site setting input saves it 2014-07-11 14:44:30 -04:00
Régis Hanol 46218c7a3a BUGFIX: multiple sub/sup 2014-07-11 15:27:42 +02:00
Régis Hanol 39be48a441 FEATURE: reject accounts created with an email address similar to a known spammer email 2014-07-11 15:09:46 +02:00
Sam c113c36db7 correct badge query 2014-07-11 17:35:34 +10:00
Sam 833c50c460 FEATURE: Read Faq badge 2014-07-11 17:32:29 +10:00
Sam 89fc989adb FEATURE: First Quote badge 2014-07-11 14:17:43 +10:00
Jeff Atwood ed3bebfebe switch /faq to /guidelines in a bunch of places 2014-07-10 15:30:58 -07:00
Jeff Atwood cf61ef7138 category-list-item only used in mobile layout 2014-07-10 13:28:53 -07:00
Jeff Atwood eeeb374ec9 remove word "subcategories" from mobile cat page 2014-07-10 13:08:39 -07:00
Jeff Atwood 91af347dfa remove legacy category "footer" styles 2014-07-10 13:02:15 -07:00
Neil Lalonde 09959d315a Merge pull request #2525 from eyalev/rtl-support 
Add RTL support.
 2014-07-10 14:25:16 -04:00
Neil Lalonde e565ae2528 FEATURE: /guidelines route will always show our FAQ, ignoring the faq_url site setting 2014-07-10 12:58:41 -04:00
Eyal Levin d7139555e5 Add RTL support. 2014-07-10 19:36:19 +03: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
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 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
Arpit Jalan 2f6c984c8c Improve invite email copy 2014-07-10 10:57:40 +05:30
Jeff Atwood 95282a4c6d add badge glyph to edit button 2014-07-09 22:01:03 -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
Régis Hanol ef44b6218d FEATURE: better mobile upload experience (upload the picture right away) 2014-07-09 22:40:22 +02:00
Arpit Jalan 223bbc3da3 FEATURE: include topic context in topic invite 2014-07-09 21:23:20 +05:30
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 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
Neil Lalonde e84e72dfcd Merge pull request #2520 from techAPJ/fix_invite_search 
FIX: selectively disappear invite search box
 2014-07-08 17:55:10 -04:00
Jeff Atwood aff6e4c5eb spacing can't be asymmetric 2014-07-08 14:47:58 -07:00
Jeff Atwood 5fee34a0fb bit more margin spacing on topic summary links 2014-07-08 14:45:49 -07:00
Neil Lalonde df8b25d2f5 FEATURE: don't demote trust level 3 users who were promoted less than SiteSetting.leader_promotion_min_duration days ago 2014-07-08 17:39:49 -04:00
Arpit Jalan eea3884e14 FIX: selectively disappear invite search box 2014-07-09 03:03:08 +05:30
Neil Lalonde 04e5c59598 Merge pull request #2519 from techAPJ/fix_invite_search 
FIX: don't hide invite search box while filtering
 2014-07-08 16:14:50 -04:00
Jeff Atwood 1e7a9a24db add glyph to sign in button on topic private page 2014-07-08 11:48:09 -07:00
Régis Hanol 7658b72556 BUGFIX: S3 backups failed when using a region 
TRIVIAL: updated fog gem to latest version (1.22.1)
BUGFIX: fixed algorithm used to remove old backups
 2014-07-08 20:46:08 +02:00
Arpit Jalan e53651972d FIX: don't hide invite search box while filtering 2014-07-08 23:59:12 +05:30
Jeff Atwood ba06a6b0d2 didn't need to move gutter watermark up 2014-07-08 11:17:24 -07:00
Jeff Atwood 719ec0801d add hellip; to Show Full Post 2014-07-08 10:55:15 -07:00
Sam 9ee93aad5b FIX: letter avatars to live in uploads directory, add last modified 2014-07-08 17:20:27 +10:00
Sam aca0aa8e56 FIX: missing last modified on avatars 2014-07-08 17:16:29 +10:00
Jeff Atwood 059c0ff5e1 only dim the post actions, not the Replies badge 2014-07-07 23:39:21 -07:00
Jeff Atwood 2f27a7f182 another show summary as btn-primary 2014-07-07 22:41:41 -07:00
Jeff Atwood 349c0bd7af make show summary a btn-primary 2014-07-07 22:17:38 -07:00
Sam efd6bf1490 FIX: set last modified date on CDN assets 2014-07-08 14:48:20 +10:00
Sam 81682b74b7 Feature: Paying it forward badge 2014-07-08 14:26:53 +10:00
Sam 8e31fe4835 FIX: select context when search triggered via CTRL-F 2014-07-08 12:40:51 +10:00
Sam fcbc7729b6 FIX: missing BBCODE whitelists 
FEATURE: ability whitelist a RegExp
 2014-07-08 10:33:59 +10:00
Régis Hanol 59b5ba7c0f BUGFIX: IP lookup wasn't working when using HTTPS 
REFACTOR: the ip locator into a ip-lookup component
 2014-07-07 22:18:18 +02:00
Neil Lalonde 18fafa12a2 Add admin and moderator classes to usernames so they can be styled 2014-07-07 14:48:25 -04:00
Régis Hanol ab3d664ce0 BUGFIX: share alert styling with mobile 2014-07-07 17:46:32 +02:00
Régis Hanol b0815e8ace BUGFIX: make sure category selector never gets focus on mobile 2014-07-07 17:35:52 +02:00
Sam 0f25bbeaf7 FEATURE: Editor badge 2014-07-07 17:55:40 +10:00
Sam ee3f7362e6 Merge pull request #2501 from techAPJ/bulk-invite-5 
FEATURE: redeem Invite when user sign up
 2014-07-07 15:14:35 +10:00
Sam e8539ff411 Merge pull request #2515 from borhub/fix-compose-panel-overflow-on-800x480-android 
Mobile: Fix parts of reply panel out of viewport
 2014-07-07 15:12:15 +10:00
Sam f37c3dc916 FIX: hoisting not handling duplicate content 2014-07-07 15:01:08 +10:00
Boris 59e55a1fa7 Fix not all content in reply panel visible due to panel overflowing on small Androids with keyboard up 2014-07-07 12:32:20 +10:00
Kris Aubuchon c8fea4090e fixing PM title alignment 2014-07-06 00:08:07 -04:00
Sam 4a25c86d61 FIX: correct duplicate granting 2014-07-05 18:32:06 +10:00
Sam ebc8dd6c95 Merge pull request #2510 from awesomerobot/master 
fixing title truncation issues in firefox
 2014-07-05 16:50:10 +10:00
Kris Aubuchon 5bd6168deb fixing title truncation issues for firefox 2014-07-05 02:16:33 -04:00
Sam 8298929b67 FIX: autocomplete quirks 2014-07-05 11:45:13 +10:00
Kris Aubuchon f0f47fd045 truncating long names in the @ autocompleter 2014-07-04 20:43:49 -04:00
Sam cf60bed719 FIX: username search logic was stemming and not ordering right 2014-07-05 09:11:41 +10:00
Neil Lalonde 5bcfb6ee38 FIX: don't show 'About category' topics on the 404 page 2014-07-04 16:18:17 -04:00
Robin Ward 2e0832fa71 TWEAK: Add the category description beside the logo, if present. 2014-07-04 15:35:02 -04:00
Robin Ward 914f0c3512 FIX: Don't surround oneboxes by paragraphs 2014-07-04 15:12:30 -04:00
Robin Ward 7ab98bb0e7 FIX: Missing formatting for oneboxes in preview 2014-07-04 14:15:07 -04:00
Robin Ward a64b954fca Merge pull request #2507 from techAPJ/invite-patch-1 
REFACTOR: move all conditions to guardian
 2014-07-04 13:52:57 -04:00
Arpit Jalan 48f86181bf REFACTOR: move all conditions to guardian 2014-07-04 23:04:19 +05:30
Robin Ward 43b997c1ce TRIVIAL: Santiize some extra attributes from images 2014-07-04 13:22:48 -04:00
Robin Ward 689afbfb7a FIX: Try to match a selected element in a combo box, even if it 
has a value of 0.
 2014-07-04 13:11:43 -04:00
Robin Ward 4237099db3 ES6: More modal views 2014-07-04 11:50:40 -04:00
Robin Ward abf6ffcaa0 Merge pull request #2504 from riking/patch-2 
Pretty sure anons can't open the composer
 2014-07-04 10:11:03 -04:00
Régis Hanol 3d94c671db BUGFIX: explicit code is often better... 2014-07-04 16:05:50 +02:00
Régis Hanol 609d1e05cd FEATURE: optimize the hell out of letter avatars 2014-07-04 13:27:17 +02:00
Jeff Atwood bd13576dee Merge pull request #2506 from techAPJ/invite-patch-1 
FEATURE: show Invite button to admin for private topics
 2014-07-04 03:24:31 -07:00
Jeff Atwood 8de5f014fc FEATURE: fit a bit more on the progress bar 2014-07-04 02:44:49 -07:00
Arpit Jalan 4649494e53 FEATURE: show Invite button to admin for private topics 2014-07-04 15:09:07 +05:30
Sam 650e9348f3 FIX: multiple grant not working correctly 2014-07-04 17:41:03 +10:00
Sam c2fa382471 Merge pull request #2505 from awesomerobot/master 
fixing d-dropdown heading overlap
 2014-07-04 16:52:37 +10:00
riking 043a1db4e1 Pretty sure anons can't open the composer 2014-07-03 23:26:52 -07:00
Kris Aubuchon 42fdb9bc9c fixing d-dropdown heading overlap 2014-07-04 02:20:41 -04:00
Jeff Atwood c6ece058f0 Merge pull request #2502 from awesomerobot/master 
truncating loooooooooong name fields
 2014-07-03 20:56:52 -07:00
Kris Aubuchon d74d5fb39e truncating loooooooooong name fields 2014-07-03 23:40:49 -04:00
Sam dc9b6b53ad PERF: editor could be crashed if you entered huge inline blocks 2014-07-04 12:49:50 +10:00
Jeff Atwood 5d7992884a BUG: mobile category drop-down had extra space 2014-07-03 16:10:15 -07:00
Jeff Atwood ff8a119550 BUG: mobile category drop-down styles looked bad 2014-07-03 15:29:46 -07:00
Jeff Atwood e934680a56 BUG: mobile user profile field names invisible 2014-07-03 15:20:18 -07:00
Robin Ward fc1ce96dbb FIX: Change the approach to sanitization. Includes a more detailed API 
for allowing classes and attributes for only certain tag names.
 2014-07-03 16:55:36 -04:00
Arpit Jalan b301391116 FEATURE: redeem Invite when user sign up 2014-07-04 02:03:04 +05:30
Régis Hanol cfeae239a8 BUGFIX: calling .blur() on the body element unfocus the browser window in IE10 2014-07-03 22:27:10 +02:00
Neil Lalonde 7d5d5862c1 Import optimizations for topic creation: Prevent queuing of most jobs when importing posts and topics. Only do some recalculations at the end of the import. 2014-07-03 16:24:47 -04:00
Robin Ward 4f09317cb3 ES6: A bunch of modal views 2014-07-03 12:39:14 -04:00
Robin Ward e5059137d0 TRIVIAL: Remove log statement 2014-07-03 11:32:10 -04:00
Robin Ward f247ea89b0 TWEAK: Show subcategory name even if there is a logo 2014-07-03 11:31:42 -04:00
riking 0d4163e0a2 FEATURE: Nice error handling page 2014-07-03 07:52:14 -07:00
riking 0612018569 Include the 'textStatus' field in DC.ajax rejection 2014-07-03 07:52:12 -07:00
Sam 5a28609afc FIX: listable badges need more logic 2014-07-03 20:34:26 +10:00
Sam decff6dc85 revert viewport change on mobile 
(truncates stuff on iphone)
 2014-07-03 20:34:13 +10:00
Sam 9157f51618 FEATURE: upgrade font awesome to head 2014-07-03 17:58:12 +10:00
Sam 6bbb083d47 FEATURE: support "unlisted" badges. 2014-07-03 17:44:36 +10:00
Sam db34b534e6 Merge pull request #2494 from techAPJ/bulk-invite-4 
FEATURE: support txt file to be uploaded for bulk invite
 2014-07-03 17:33:16 +10:00
Sam 2ba35ae707 Merge pull request #2498 from awesomerobot/master 
fixing a handful of issues
 2014-07-03 17:32:14 +10:00
Sam 9a9ad9bda8 FEATURE: Badge progress 
- Refactor model so it stores backfill query
- Implement autobiographer
- Remove sample badge
- Correct featured badges to only include a badge once
 2014-07-03 17:29:44 +10:00
Kris Aubuchon aee73d901a fixing a handful of issues 2014-07-02 23:21:45 -04:00
Sam 8701a39044 FIX: improve matching algorithm 2014-07-03 11:29:02 +10:00
Sam 6d8200b1b1 FIX: smarter suppression of name 
match on lowercase, trim.
 2014-07-03 11:20:58 +10:00
Robin Ward 554e5c8482 XSS: Escape the custom title (admin only) when displaying group titles. 2014-07-02 19:55:52 -04:00
Régis Hanol 9b43333f3f TRIVIAL: removes unecessary #if bindings 2014-07-02 23:01:23 +02:00
Régis Hanol e148d2340f removes summary filter when clicking on the likes count in topic lists 2014-07-02 22:58:07 +02:00
Robin Ward 462dcadd01 FEATURE: Subcategory list on parent subcategory page. 2014-07-02 16:47:43 -04:00
Robin Ward 4592916026 ES6: Convert route builders to initializer 
Remove deprecated `Discourse.addInitializer`
 2014-07-02 16:47:43 -04:00
Régis Hanol 9abef57312 BUGFIX: staff counters weren't taking into acount deleted posts/actions 2014-07-02 22:33:18 +02:00
Régis Hanol 7feab2fc99 Revert "background on topic-list, more width on extra-info-wrapper, meta viewport fix" 2014-07-02 16:55:43 +02:00
Jeff Atwood 2a705fff6c Merge pull request #2495 from awesomerobot/master 
background on topic-list, more width on extra-info-wrapper, meta viewport fix
 2014-07-02 07:01:15 -07:00
Kris Aubuchon e0194e69a5 adding background to topic-list, making max-width larger on extra-info-wrapper, and changing viewport config 2014-07-02 09:54:40 -04:00
Arpit Jalan 85ba55dc26 FEATURE: support txt file to be uploaded for bulk invite 2014-07-02 19:21:15 +05:30
Régis Hanol 18f5751f3f BUGFIX: cap image widths in usercards & user profiles 2014-07-02 14:56:09 +02:00
Jeff Atwood 94fd592dfa lock alignment is better with vertical-align:middle 2014-07-02 03:37:10 -07:00
Arpit Jalan aeec5067d5 FEATURE: Send notification by system user for bulk invite 2014-07-02 14:28:57 +05:30