27539e15e1
Allow whitespace around % scaler in markdown image syntax ( #5000 )
2017-07-26 10:54:20 -04:00
ea0e90b2b0
Merge branch 'master' into search_posts_with_images
2017-07-26 10:15:55 -04:00
febd7621ea
Qunit plugin rake tasks ( #4985 )
...
* Allow running specific plugin tests using ENV variables
* Add a `rake plugin:qunit` task to match the existing `rake plugin:spec` task
* Improve docker.rake to allow running specific plugin qunit tests
* Purge cache before and after qunit tests
* Stop module auto-loader trying to auto-load tests
* Use URL query parameters to pass config into Qunit, avoiding caching issues
* Oops, searchParams doesn’t work in phantomJS. Parse the URL manually.
* Escape ampersands before passing URL to phantomJS, otherwise multiple parameters go wrong
2017-07-26 09:07:46 -04:00
917d186303
REFACTOR: Reduce number of queries sent to the DB.
2017-07-26 17:20:00 +09:00
3a46ea8bad
Sanitize SQL arguments to prevent injections.
2017-07-26 17:20:00 +09:00
3d330f8c5e
Merge pull request #4998 from gschlager/phpbb3
...
phpBB3 importer: Fix permalink generation
2017-07-26 09:52:40 +02:00
f9627f4533
UX: Don't show empty user list for groups without members.
2017-07-26 16:11:06 +09:00
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
d3a975e99a
Improve specs to check top level stylesheets for SCSS compilation errors.
...
https://meta.discourse.org/t/fwd-growth-institute-pm-error-in-css-on-embed/66824/4
2017-07-26 10:50:51 +09:00
93130b15e3
Fix invalid CSS syntax.
2017-07-26 10:38:34 +09:00
e3ac6585bd
FIX: Search by topic_id should not be restricted by `SiteSetting.min_search_term_length`.
2017-07-26 09:52:39 +09:00
96267f0845
Merge pull request #4960 from discourse/category-description-error
...
FIX: Explicit error when category description post is bad
2017-07-26 08:54:22 +09:00
5b72844a9f
Merge pull request #4999 from cpradio/fix-padding-for-ul
...
Update ul padding/margin to match ol.
2017-07-25 16:06:18 -07:00
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
32ef30cff9
phpBB3 importer: Permalink for first post of each topic was missing
2017-07-25 23:29:56 +02:00
658c2f52c0
add diagnostics for flaky test
2017-07-25 17:09:13 -04:00
ad8643bfe2
attempt to stablise spec in travis
2017-07-25 16:58:19 -04:00
ccbcbd0343
remove 2 failures that happen if discobot booted
2017-07-25 16:08:03 -04:00
a20bb931b1
FIX: specs failed if discourse-push-notifications booted
2017-07-25 15:52:53 -04:00
ec2506c32b
Merge pull request #4996 from ryantm/patch-2
...
safely call html_safe on category description
2017-07-25 15:34:07 -04:00
5be52fa821
phpBB3 importer: Use permalink normalization for category links
2017-07-25 21:14:46 +02:00
17d56a4cb7
FEATURE: use Markdown for image pasted in as opposed to IMG tags
2017-07-25 15:11:38 -04:00
d8c27e3871
Merge branch 'master' into search_posts_by_filetype
2017-07-25 14:41:20 -04:00
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
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
8317fb12e0
FIX: don't escape html of poll options
2017-07-25 13:38:19 -04:00
f2e592c1ab
UX: Apply `btn-flat` class to flat buttons on posts
2017-07-25 12:00:19 -04:00
3152eabbb0
UX: Use flat button style for bulk selection
2017-07-25 12:00:19 -04:00
5da848088a
UX: Refactor composer buttons into flat buttons
2017-07-25 12:00:19 -04:00
d67fe4c674
FIX: block all emails associated to a user when destroying their record
2017-07-25 17:44:46 +02:00
400a55eca3
Merge pull request #4995 from davidtaylorhq/qunit-warmup
...
Improve “server warmup” check for qunit rake task
2017-07-25 11:39:32 -04:00
f2d5bcd439
Stop writing to STDOUT/ERR during tests
2017-07-25 11:37:25 -04:00
4ad864892b
Improve “server warmup” check for qunit rake task
2017-07-25 16:31:30 +01:00
c5b5c861f6
extend wait_for in case redis chokes up in test
2017-07-25 11:29:12 -04:00
283d42d6f3
FEATURE: allow bisect and rspec seed
2017-07-25 11:09:51 -04:00
c86028f9a5
remove poinless fails from CI
...
rails master is simply not working now at all, no point testing with it
2017-07-25 09:57:32 -04:00
601064a95a
Remove stray debugger.
2017-07-25 22:51:47 +09:00
14ce24eb9a
Merge pull request #4993 from dmacjam/fix_sidekiq_documentation
...
FIX: run sidekiq command documentation
2017-07-25 22:48:47 +09:00
bdf1be65a3
FIX: Broken topic invite button.
2017-07-25 22:48:10 +09:00
d29f213632
Fix sidekiq command in docs to start all queues instead of only critical.
2017-07-25 15:46:09 +02:00
d89d279416
Update UserEmail primary key sequence when performing bulk import.
2017-07-25 19:15:22 +05:30
2d45b3fc6d
Add infinite loading to full page search.
2017-07-25 15:33:25 +02:00
5166b5460a
Merge pull request #4994 from LeoMcA/unrecognized-error-email
...
add link to /about page in email rejection messages
2017-07-25 12:42:37 +02:00
e4fa6a4c92
add link to /about page in email rejection messages
2017-07-25 11:26:29 +01:00
8556d3c27f
FIX: emoji-picker do not reload all everything when changing diversity
2017-07-25 12:23:38 +02:00
22c5fb20b4
FIX: emoji-picker broken and skipped specs
2017-07-25 12:23:38 +02:00
c7c93e7159
FEATURE: new 'strip image metadata' site setting
2017-07-25 11:48:39 +02:00
933711a771
Merge pull request #4990 from quangbuule/add-charset-when-bulk-import-vbulletin
...
Add charset preference when bulk importing vBulletin
2017-07-25 09:57:21 +02:00
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
8a362a1c3c
Reset ActiveRecord cache after dropping columns.
2017-07-25 15:36:30 +09:00
David Taylor
Neil Lalonde
Guo Xiang Tan
Régis Hanol
Guo Xiang Tan
Jeff Atwood
cpradio
Gerhard Schlager
Sam
Ryan Mulligan
Robin Ward
Jakub Macina
Arpit Jalan
Leo McArdle
Joffrey JAFFEUX