Commit Graph

14245 Commits

Author SHA1 Message Date
Guo Xiang Tan b59dfb86f4 UX: Include group name in email when group is invited to a PM.
https://meta.discourse.org/t/xyz-invited-you-to-a-message-but-really-invited-a-group-im-in/65996
2017-07-26 15:51:44 +09:00
Guo Xiang Tan 93130b15e3 Fix invalid CSS syntax. 2017-07-26 10:38:34 +09:00
Guo Xiang Tan e3ac6585bd FIX: Search by topic_id should not be restricted by `SiteSetting.min_search_term_length`. 2017-07-26 09:52:39 +09:00
cpradio feb423d07a Update ul padding/margin to match ol.
https://meta.discourse.org/t/numbers-cut-off-in-long-list/59856/16?u=cpradio
2017-07-25 18:54:28 -04:00
Sam ec2506c32b Merge pull request #4996 from ryantm/patch-2
safely call html_safe on category description
2017-07-25 15:34:07 -04:00
Sam 17d56a4cb7 FEATURE: use Markdown for image pasted in as opposed to IMG tags 2017-07-25 15:11:38 -04:00
Ryan Mulligan f3f7dd02d1 safely call html_safe on category description
The `categories.description` column is not modified as "not null", so it is possible for the description to be nil. This changes the code not call html_safe on nil.
2017-07-25 11:40:02 -07:00
Sam 0d66a41753 Merge pull request #4989 from begrif/html-safe-category-desc
Stop Rails from escaping the HTML in this description.
2017-07-25 13:41:30 -04:00
Robin Ward f2e592c1ab UX: Apply `btn-flat` class to flat buttons on posts 2017-07-25 12:00:19 -04:00
Robin Ward 3152eabbb0 UX: Use flat button style for bulk selection 2017-07-25 12:00:19 -04:00
Robin Ward 5da848088a UX: Refactor composer buttons into flat buttons 2017-07-25 12:00:19 -04:00
Régis Hanol d67fe4c674 FIX: block all emails associated to a user when destroying their record 2017-07-25 17:44:46 +02:00
Guo Xiang Tan 601064a95a Remove stray debugger. 2017-07-25 22:51:47 +09:00
Guo Xiang Tan bdf1be65a3 FIX: Broken topic invite button. 2017-07-25 22:48:10 +09:00
Joffrey JAFFEUX 8556d3c27f FIX: emoji-picker do not reload all everything when changing diversity 2017-07-25 12:23:38 +02:00
Joffrey JAFFEUX 22c5fb20b4 FIX: emoji-picker broken and skipped specs 2017-07-25 12:23:38 +02:00
Régis Hanol c7c93e7159 FEATURE: new 'strip image metadata' site setting 2017-07-25 11:48:39 +02:00
Guo Xiang Tan 6c0a29698b Fix JS tests failing when running in `RAILS_ENV=test`.
Fixes the following error:

```
phantomjs /home/tgxworld/work/discourse/vendor/assets/javascripts/run-qunit.js http://localhost:60099/qunit
2017-07-25 16:27:41 +0900: Rack app error handling request { GET /stylesheets/desktop.css }
<Errno::ENOENT: No such file or directory @ rb_sysopen - /home/tgxworld/work/discourse/tmp/stylesheet-cache/desktop.css>
/home/tgxworld/work/discourse/app/controllers/stylesheets_controller.rb:65:in `write'
/home/tgxworld/work/discourse/app/controllers/stylesheets_controller.rb:65:in `show_resource'
/home/tgxworld/work/discourse/app/controllers/stylesheets_controller.rb:9:in `show'
```
2017-07-25 16:31:31 +09:00
awesomerobot 3905d6bc0d mildly lighter @mention 2017-07-24 22:26:14 -04:00
Jeff Atwood df653a2350 Merge pull request #4991 from awesomerobot/master
fixing @mention color
2017-07-24 18:33:00 -07:00
awesomerobot 3dd79b3b3a fixing @mention color 2017-07-24 21:11:14 -04:00
Benjamin Elijah Griffin 4f77ca72a3 Stop Rails from escaping the HTML in this description. 2017-07-24 17:15:15 -07:00
Sam 4da98cdcfe FIX: allow bbcode to be unquoted for default 2017-07-24 18:36:17 -04:00
Neil Lalonde 25097deb39 FIX: saving profile preferences removes name in account preferences 2017-07-24 13:13:50 -04:00
Sam 40abcfc2f5 FIX: smart quote edge case with quotes 2017-07-24 12:21:49 -04:00
Sam Saffron 045a2abcec FEATURE: remove the timecop gem
We should only have one way of mocking time, misuse of timecop
was causing build stability issues
2017-07-24 12:11:10 -04:00
Robin Ward 5dd56a41d9 Merge branch 'master' into master 2017-07-24 12:01:48 -04:00
Neil Lalonde b5a375c70a FIX: oops, real fix for change email instructions 2017-07-24 11:15:55 -04:00
Neil Lalonde 1f1d84c378 FIX: wrong position for change email instructions 2017-07-24 11:14:36 -04:00
Guo Xiang Tan 6b17178533 Validate uniquness of `api_key`. 2017-07-24 21:46:08 +09:00
Joffrey JAFFEUX d9696c98c3 FIX: broken spec 2017-07-24 13:59:36 +02:00
Joffrey JAFFEUX 995d253030 FIX: improves efficiency 2017-07-24 12:42:54 +02:00
Guo Xiang Tan 1b0750d7ef Merge pull request #4983 from tgxworld/group_owners_can_invite_users_to_groups
Group owners can invite users to groups
2017-07-24 16:21:19 +09:00
Guo Xiang Tan 6593f0355f FIX: Exclude `www` in topic map links.
https://meta.discourse.org/t/topic-popular-links-panel-domain-extraction-doesnt-handle-country-tlds/60156/38?u=tgxworld
2017-07-24 10:14:33 +09:00
Guo Xiang Tan 887c3b66f5 Revert "UX: Don't try to figure out root domain."
This reverts commit 7690cc6ca5.
2017-07-24 09:40:57 +09:00
Régis Hanol 65ab5f58fe FIX: keep newlines between paragraphs when quoting a post 2017-07-23 15:25:28 +02:00
David Taylor 2ddf365e3a Fix user stats colour for dark themes 2017-07-22 23:48:31 +01:00
Joffrey JAFFEUX f68e711fb2 FIX: makes emoji filter case insensitive 2017-07-22 22:48:22 +02:00
Jeff Atwood bc9270defb filetype comparison needs to be case insensitive 2017-07-22 13:18:15 -07:00
Joffrey JAFFEUX e2e0221dd7 FIX: make sure there are meaningful titles on the picker 2017-07-22 17:32:12 +02:00
Robin Ward bc3a32385c FIX: Empty lines should be selected for block quotes 2017-07-21 16:32:29 -04:00
Sam 9b4f5710e6 api cleanup for before / after rules 2017-07-21 16:12:11 -04:00
Joffrey JAFFEUX bb35d9fc07 FIX: do not restore scroll on successive click on the same first emoji 2017-07-21 21:42:23 +02:00
Robin Ward 2f8f2aa1dd FEATURE: Whitelists for inline oneboxing 2017-07-21 15:41:47 -04:00
Arpit Jalan 9727977fef Fix the build. 2017-07-22 00:34:39 +05:30
Joffrey JAFFEUX 8c17596aa5 FIX: keep scroll position when adding first recent emoji 2017-07-21 20:57:17 +02:00
Joffrey JAFFEUX cdefb58018 FIX: emoji-picker filtering false positive 2017-07-21 20:42:34 +02:00
Arpit Jalan 6d09fbde44 UX: use down chevron icon to expand "show more links.." 2017-07-22 00:10:37 +05:30
Régis Hanol fff5e2c3a5 Merge pull request #4984 from LeoMcA/unrecognized-error-email
FEATURE: send rejection email for unrecognized errors
2017-07-21 20:40:18 +02:00
Robin Ward 574681dc47 FIX: Show emoji in inline oneboxes 2017-07-21 14:24:48 -04:00