Commit Graph

23164 Commits

Author SHA1 Message Date
Robin Ward
29755be139 Remove bundle-audit, it is not updated frequently enough 2017-05-18 12:31:19 -04:00
Sam
e7c2ad41ca Move discourse dev data out of tmp
Fix watch for restart so it works with puma
2017-05-18 11:36:24 -04:00
Régis Hanol
4fb335f1f0 FIX: don't process the same incoming email more than once 2017-05-18 16:43:07 +02:00
Régis Hanol
13e489b4ca replace the upload type whitelist with a sanitizer 2017-05-18 12:13:13 +02:00
Arpit Jalan
8e5b0c79ae FIX: allow images to be uploaded in wizard 2017-05-18 13:53:23 +05:30
Guo Xiang Tan
f4cc71d643 Allow username and password to be passed via ENV for smoke test. 2017-05-18 12:17:31 +08:00
Régis Hanol
80435cf2af Add mutex around incoming email processing 2017-05-18 01:09:51 +02:00
Sam
2a5a01af2e improve error on theme upload, add gif to allowed uploads 2017-05-17 16:29:09 -04:00
Sam
851876acfa update miniprofiler to clean up errors 2017-05-17 15:35:18 -04:00
Robin Ward
1870089cf1 Include latest onebox fix 2017-05-17 15:21:40 -04:00
Sam
17f75bc95e FIX: bump mini profiler to support sub folders 2017-05-17 13:51:31 -04:00
Neil Lalonde
cbe8e05f79 disable test that fails randomly 2017-05-17 12:46:50 -04:00
Neil Lalonde
a0f03936ff FIX: saving invisible primary group field that you don't belong to 2017-05-17 12:46:50 -04:00
Robin Ward
f8c503186e FIX: If there's an error downloading, don't raise it 2017-05-17 12:38:18 -04:00
Robin Ward
9090c7b05b FIX: Admin groups editor was showing extra page when exactly 50 records 2017-05-17 11:50:17 -04:00
Sam
bdd4a9e69d update nokogiri 2017-05-17 11:33:20 -04:00
Robin Ward
6d5fe73422 FIX: Sometimes the topic timeline wasn't docking 2017-05-17 11:05:58 -04:00
Guo Xiang Tan
e4d557cdb9 Partially revert 92118dd1d1. 2017-05-17 21:42:31 +08:00
Guo Xiang Tan
0306863d71 Fix the build on travis. 2017-05-17 21:35:22 +08:00
Régis Hanol
a1b8a3b52b FIX: supports bare <li> when converting html to markdown 2017-05-17 15:05:11 +02:00
Guo Xiang Tan
92036616db Make test less vulnerable to changes. 2017-05-17 19:30:13 +08:00
Guo Xiang Tan
b0e4555a86 Allow Basic Authentication to be set in smoke test. 2017-05-17 19:24:43 +08:00
Guo Xiang Tan
4b3b54da70 Make sure we log the backtrace as well. 2017-05-17 16:31:53 +08:00
Jeff Atwood
5b73da9c87 add Seth Godin's text for daily email limits 2017-05-17 01:26:15 -07:00
Jeff Atwood
db06dd8032 remove labels from tag edit buttons in header 2017-05-17 01:18:31 -07:00
Guo Xiang Tan
3df46833b3 Fix the build. 2017-05-17 16:14:06 +08:00
Jeff Atwood
be722543c1 less scary warning for email daily limit reached 2017-05-16 20:02:21 -07:00
Guo Xiang Tan
92118dd1d1 FIX: Use observer to rerender widget instead. 2017-05-17 10:29:50 +08:00
Guo Xiang Tan
0984763013 Remove use of rescue nil in migration. 2017-05-17 09:18:49 +08:00
Guo Xiang Tan
eccfab6a19 Use execute instead of exec_sql in migration. 2017-05-17 09:18:42 +08:00
Jeff Atwood
83d3938df9 remove welcome invitation to reply
.. not needed in a post-discobot world of 1.8 release
2017-05-16 15:29:11 -07:00
Jeff Atwood
3958b87c5c Merge pull request #4867 from punit2502/master
Added Elastic Email
2017-05-16 15:13:35 -07:00
Sam
6a1f579c6e FIX: don't search for plugins in nested subdirectories 2017-05-16 17:28:56 -04:00
Robin Ward
5d494cf158 FIX: Broken back button on account URLs 2017-05-16 17:21:52 -04:00
Sam
68df8f4427 FIX: only trigger notification level change if it actually changes
avoids double ajax call every time notification level changes
2017-05-16 16:52:39 -04:00
Jared Reisinger
645f648ea7 Merge remote-tracking branch 'upstream/master' into admin-user-pagination 2017-05-16 13:36:47 -07:00
Robin Ward
733b0009cb FIX: Don't memoize the currentUser in case some plugins use it too early 2017-05-16 16:35:18 -04:00
Sam
763f156d91 FIX: require re-activation if SSO changes email and updates it 2017-05-16 16:18:18 -04:00
Sam
4424fd81b8 add a tiny bit of extra protection 2017-05-16 16:08:42 -04:00
Sam
4b449914b8 FIX: admins could never remove self from messages 2017-05-16 16:06:24 -04:00
Sam
6ddd8d9166 FIX: when entering topics "tracking" would not be set
There was a timing issue when subscribing to messages for topics.

Old flow:

- We generate JSON for topic
- We subscribe to messages for topic

New flow:

- We keep track of last id in the topic message bus channel
- We generate JSON
- We subscribe to messages for topic starting at saved message id

This ensures that there is complete overlap for message consumption
and that there are no cases where an update may go missing due to timing
2017-05-16 15:04:21 -04:00
Neil Lalonde
7821400141 FEATURE: staff can set a timer to remind them about a topic 2017-05-16 14:49:50 -04:00
David Taylor
058cde1fc5 Use bundle exec for docker_dev rake 2017-05-16 17:18:45 +01:00
mcmcclur
a307ad6517 Update crawler_detection.rb
Add HTTrack to the list of detected crawlers so that Discourse will serve vanilla HTML per https://meta.discourse.org/t/a-basic-discourse-archival-tool/62614/25
2017-05-16 11:17:05 -04:00
Rafael dos Santos Silva
2e152f4d39 FIX: Use latest docker image for dev 2017-05-16 12:05:11 -03:00
Leo McArdle
59922ce0a4 FEATURE: remove table wrapping posts in notification emails 2017-05-16 10:37:53 -04:00
Guo Xiang Tan
6a3c20561a Merge pull request #4868 from rimian/patch-6
Bump ruby version
2017-05-16 16:46:42 +08:00
Régis Hanol
2826f98bb9 update JIVE API importer 2017-05-16 10:22:44 +02:00
Rimian Perkins
b40a83571e Bump ruby version 2017-05-16 15:02:24 +10:00
Robin Ward
941adca958 FIX: If you refresh New, clear the incoming topics text 2017-05-15 16:57:09 -04:00