IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2026-09-05 04:40:41 -05:00
Code Issues Packages Projects Releases Wiki Activity
17,525 Commits 1,018 Branches 579 Tags
90100378b8425d3d511e1eb00c23a6eb1650baae
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robin Ward 617dc42cd9 Merge pull request #3975 from techAPJ/category-user 
FIX: changing topic from one watched category to another watched category makes topic 'new' again
 2016-01-28 10:53:29 -05:00
Robin Ward 57c3d65777 Change d-editor to use _ instead of * for italics. 2016-01-18 14:54:54 -05:00
Robin Ward 1f290a8336 FIX: Rebake all HTML due to handlebars upgrade 2016-01-18 12:46:54 -05:00
Robin Ward 7b755c3280 FIX: Precompiler should apply get magic too 2016-01-15 14:26:10 -05:00
Robin Ward 4bbbdd8dc4 SECURITY: Upgrade Ember to fix CVE-2015-7565. Also upgrade Handlebars 2016-01-15 13:57:45 -05:00
Robin Ward 7a28338a07 Revert "SECURITY: Upgrade Ember to fix CVE-2015-7565" 
This reverts commit 211521df4f.
 2016-01-15 11:39:07 -05:00
Robin Ward 211521df4f SECURITY: Upgrade Ember to fix CVE-2015-7565 2016-01-15 11:31:02 -05:00
Robin Ward 166c56ee0d Merge pull request #3958 from halfstrik/master 
FIX: Incorrect subfolder authors urls when embedding
 2016-01-13 10:20:41 -05:00
Robin Ward 1f8586168b FIX: Incorrect subfolder urls when embedding 2016-01-12 12:38:49 -05:00
Robin Ward 19c630e7c2 FIX: Missing username key 2016-01-11 11:50:58 -05:00
Robin Ward 2a84db73b5 Support IP addresses for embeddable hosts 2016-01-11 11:06:32 -05:00
Robin Ward e0c4987e68 Merge pull request #3950 from techAPJ/enum 
Enums that are used in tables need to be stable
 2016-01-08 10:30:23 -05:00
Robin Ward 1a1f2ff5ee Merge pull request #3949 from bgr11n/bugfix/fix_password_validator 
fixed password validator on equality with email
 2016-01-06 10:32:49 -05:00
Robin Ward 29e5ab0121 Revert "remove blue from "similar to" topic excerpts" 
This reverts commit 33669f97e4.
 2016-01-04 15:43:30 -05:00
Robin Ward c8f90a3973 FIX: On mobile forgot password was broken 2016-01-04 15:24:36 -05:00
Robin Ward 0ba1e8a76f Merge pull request #3937 from tgxworld/implement_#_category 
FEATURE: Autolinking to category using hashtags.
 2016-01-04 11:14:28 -05:00
Robin Ward ed7d64c87e Merge pull request #3948 from discoursehosting/origin/nabble-importer 
Extended Nabble importer functionality
 2016-01-04 11:01:24 -05:00
Robin Ward 8af5c7385e Merge pull request #3944 from abbasfaisal/410-gone-fix 
FIX: When 410 is received, display proper error message instead of generic.
 2015-12-31 10:44:23 -05:00
Robin Ward 87391fcfe9 Merge pull request #3945 from tgxworld/fix_pluralization_again 
FIX: Do not override existing translations.
 2015-12-31 10:35:15 -05:00
Robin Ward f0694d491a Merge pull request #3943 from gdpelican/plus-one-via-email 
Allow +1 via email
 2015-12-30 15:55:55 -05:00
Robin Ward 74780c1688 Add more server side unicode replacements for emoji 2015-12-30 14:46:52 -05:00
Robin Ward b17e5c99cc PERF: Use a regexp for unicode replacements 2015-12-30 14:35:25 -05:00
Robin Ward c064dc1322 FEATURE: Perform a server side replacement of unicode emoji 2015-12-29 16:28:27 -05:00
Robin Ward fd6bbc69e2 FIX: On chrome, focusing on a recently changed textarea would scroll 2015-12-29 14:59:12 -05:00
Robin Ward a42826f2ae Merge pull request #3939 from scossar/clickable-category-logo 
FEATURE: make category logo clickable
 2015-12-29 13:42:18 -05:00
Robin Ward 75eb3ae664 Merge pull request #3931 from tgxworld/fix_pluralize 
FIX: Pluralization error when only a pluralization key is overridden.
 2015-12-29 10:21:23 -05:00
Robin Ward 55a5154323 Merge pull request #3933 from gschlager/phpbb3-importer 
FIX: Correctly import users and passwords from phpBB 3.1
 2015-12-29 10:20:56 -05:00
Robin Ward e4adfdb624 Merge pull request #3936 from tgxworld/add_saving_status_to_groups_admin 
Add saving status to groups admin
 2015-12-29 10:18:02 -05:00
Robin Ward f423869e03 FIX: forgot end :) 2015-12-23 16:43:39 -05:00
Robin Ward d792c0a1d7 Should not be active in dev mode 2015-12-23 16:39:56 -05:00
Robin Ward eab9ad7b27 FIX: Was refocusing on resize events 
This was annoying on small screens in desktop mode, where a keyboard
appearing would refocus on the search bar and make it impossible to
dismiss.
 2015-12-23 15:17:00 -05:00
Robin Ward d1ebb9d0b5 FIX: I18n Fallbacks were not applying correctly 2015-12-23 12:09:18 -05:00
Robin Ward 67c08e8aae FIX: Broken tests for slightly_smiling 2015-12-22 16:07:28 -05:00
Robin Ward 78916ea896 FIX: Transparent background for emoji one slightly_smiling 2015-12-22 15:32:52 -05:00
Robin Ward b9d276dc76 Use proper slightly_smiling in emoji one and twitter sets 2015-12-22 15:29:20 -05:00
Robin Ward 3095dd160e Add slightly_smiling emoji and use it as default smile. 2015-12-22 14:40:49 -05:00
Robin Ward faaafe2163 Update emoji one 2015-12-22 13:44:06 -05:00
Robin Ward f3748ce0a9 Add new outlet for plugin notifications, plus use right alignment 2015-12-11 16:42:21 -05:00
Robin Ward b2c73e7045 UX: On mobile use a dropdown for topic controls instead of many buttons 2015-12-11 15:09:09 -05:00
Robin Ward ccf5b1584d Unsubscribe link needn't be sanitized 2015-12-11 10:06:25 -05:00
Robin Ward df19a27753 FIX: Don't sanitize header_instructions 2015-12-10 18:15:32 -05:00
Robin Ward 6c2dee29a8 UX: Upgrade Font Awesome to 4.5.0 2015-12-10 17:19:23 -05:00
Robin Ward 12735e61cf Update Twitter emoji 2015-12-10 17:06:17 -05:00
Robin Ward fd5f984401 Update Google emoji 2015-12-10 16:20:28 -05:00
Robin Ward 8abc090637 Update Apple emoji 2015-12-10 15:31:04 -05:00
Robin Ward fe8c74d0b6 FIX: Flag button broken at the bottom of a topic 2015-12-09 17:08:04 -05:00
Robin Ward 4820d5c7b0 REVERT: message bus changes 2015-12-08 15:32:31 -05:00
Robin Ward d22a479c61 FIX: Error filtering for overidden values with no query 2015-12-08 12:49:37 -05:00
Robin Ward b781b6aea3 Add header_instructions overridable translation for email headers. 2015-12-07 16:52:33 -05:00
Robin Ward cd1dd18f01 Revert "PERF: move message bus to the front of the middleware stack" 
I suspect this commit is preventing Sidekiq from running inprocess.
 2015-12-07 14:57:23 -05:00
Robin Ward 4e80323567 FIX: Remove useless stub tests 2015-12-07 14:27:43 -05:00
Robin Ward 467485cf47 FIX: Don't show placeholder when triggering one post 2015-12-07 14:21:07 -05:00
Robin Ward 8f1937e88f Clean up PostsWithPlaceholders 2015-12-07 14:21:07 -05:00
Robin Ward 5f995323e1 FIX: Hairline should extend the full width when preview is hidden 2015-12-07 12:51:58 -05:00
Robin Ward d97b2382e6 Don't show placeholders on Android 2015-12-04 17:19:54 -05:00
Robin Ward 420e362bdb FIX: Issues with summaries and our Array 2015-12-04 16:36:16 -05:00
Robin Ward 63ba6c78af FIX: Jump to previously loaded post was broken 2015-12-04 16:20:43 -05:00
Robin Ward 6d38640645 FIX: Remove console.log 2015-12-04 16:00:47 -05:00
Robin Ward 255a5be015 Revert "Cleaner implementation of postsWithPlaceholders and more tests." 
This reverts commit 4c0670a109.
 2015-12-04 15:59:46 -05:00
Robin Ward a51c91ac05 Revert "FIX: Errors with summary views and placeholders" 
This reverts commit 5be3bf80eb.
 2015-12-04 15:59:39 -05:00
Robin Ward 5be3bf80eb FIX: Errors with summary views and placeholders 2015-12-04 15:10:13 -05:00
Robin Ward 4c0670a109 Cleaner implementation of postsWithPlaceholders and more tests. 2015-12-04 15:10:13 -05:00
Robin Ward 80bdc7333c UX: Show category description beside logo 2015-12-04 12:36:09 -05:00
Robin Ward 83be335c54 FIX: Firefox wasn't focusing on d-editor 2015-12-04 12:13:50 -05:00
Robin Ward 40c8d39137 FEATURE: Reply Placeholders in Stream 2015-12-04 10:02:58 -05:00
Robin Ward 1987a35daf Update postream to use ES2015 syntax and decorators 2015-12-04 10:02:46 -05:00
Robin Ward 949f51ffe0 Remove ajax stubbing from post-stream tests 2015-12-04 10:02:37 -05:00
Robin Ward c8de38c553 Ignore assertions.js for now. 2015-12-01 15:37:16 -05:00
Robin Ward 2006be41cf Split up pretender a bit. It was getting unwieldly. 2015-12-01 15:31:15 -05:00
Robin Ward b0b85725ad If a search for a translation is exactly the value, prioritize it 2015-11-30 15:31:30 -05:00
Robin Ward de88be2fbc Support for "Only show overridden" in site text customization 2015-11-30 15:25:08 -05:00
Robin Ward 222fd00724 FIX: Another missing translation replacement 2015-11-27 17:41:03 -05:00
Robin Ward c4eee825de FIX: Missing site name key 2015-11-27 17:23:43 -05:00
Robin Ward 7181e3cb75 FIX: Missing new education keys 2015-11-27 17:00:43 -05:00
Robin Ward 8c48c12498 FIX: Inserting link wouldn't clear the text field sometimes 2015-11-27 13:32:11 -05:00
Robin Ward c2241ed368 FIX: "Saved!" wasn't resetting when viewing a different email template 2015-11-27 12:51:50 -05:00
Robin Ward 82ef27bb79 FIX: Category not updating below suggested topics 2015-11-27 12:42:32 -05:00
Robin Ward 5a15c4997c Let's be honest: we skip focus for iOS, not touch in general. 2015-11-27 12:23:51 -05:00
Robin Ward 5e93140f85 FEATURE: Can override any translation via an admin interface 2015-11-27 11:35:19 -05:00
Robin Ward 434deb1bd3 SECURITY: Backported XSS fixes from Handlebars 2015-11-24 16:08:08 -05:00
Robin Ward d65ec1af2e Rename ninja_edit_window to editing_grace_period :'( 2015-11-24 14:28:42 -05:00
Robin Ward 49bda0b17d FIX: Improve windows double clicking on words in editor 2015-11-24 13:42:22 -05:00
Robin Ward c76caca109 FIX: Perform the same operation on multilines in d-editor 2015-11-24 13:03:37 -05:00
Robin Ward e573ea29f3 FIX: Pasting images was broken in Firefox 2015-11-23 12:34:49 -05:00
Robin Ward d8734fc542 Fix eslint 2015-11-20 17:16:44 -05:00
Robin Ward 1506eba28d Support for overriding client side translation keys 2015-11-20 17:14:01 -05:00
Robin Ward 1bf2b236cb FIX: Admin section wasn't correctly highlighting some routes 2015-11-20 15:07:04 -05:00
Robin Ward e82145cbf9 Fix broken spec 2015-11-20 14:27:30 -05:00
Robin Ward 8fdd6c18fc SECURITY: XSS Protection on Queued Posts 2015-11-20 14:13:00 -05:00
Robin Ward 83d5b82c84 OOPS, remove console.log 2015-11-20 13:15:00 -05:00
Robin Ward 5056de1d8a FIX: Never show less than 0 replies when embedding 2015-11-20 13:06:00 -05:00
Robin Ward 8eeb027c65 Can revert changes to email templates 2015-11-20 12:30:21 -05:00
Robin Ward c21457d6a7 Revert "REFACTOR: support booting discourse with DISCOURSE_NO_CONSTANTS" 
This reverts commit c0b277d273.
 2015-11-20 10:00:12 -05:00
Robin Ward f5b34d5f53 FEATURE: Admin interface for editing email templates 2015-11-19 16:39:34 -05:00
Robin Ward e168c5fde3 PERF: Much more performant, multisite aware I18n overrides 2015-11-19 16:36:59 -05:00
Robin Ward 7737ea89b1 FIX: Missing fallback logic 2015-11-19 12:35:51 -05:00
Robin Ward 3a1979d03c Update onebox gem 2015-11-19 11:14:17 -05:00
Robin Ward 7f4ca91e06 FIX: I18n overrides should be multisite aware 2015-11-18 16:05:53 -05:00
Robin Ward 2196160549 FIX: Allow emails to begin with a quote (but skip it!) 2015-11-18 15:23:10 -05:00
Robin Ward 4aab904ff6 FIX: Test in phantom environment with different selection defaults 2015-11-18 13:35:36 -05:00