Commit Graph

23450 Commits

Author SHA1 Message Date
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
Robin Ward dd0cb6a117 FIX: Add missing test 2017-05-15 16:57:09 -04:00
Sam c40ac5abe6 FIX: resize events for ace were not triggered correctly 2017-05-15 16:10:07 -04:00
Sam 7a4e825671 we should use fancy title if available 2017-05-15 15:45:29 -04:00
Sam be8dd403df FEATURE: use fancy title in notifications 2017-05-15 15:38:30 -04:00
Robin Ward 31f27006e1 FIX: We can download protocol relative urls 2017-05-15 15:32:55 -04:00
Robin Ward f7c46df804 FIX: Only mark all as rendered after *everything* is rendered 2017-05-15 15:12:10 -04:00
Robin Ward 570c2c1b88 FIX: Use `bundle exec` for `bundle-audit` 2017-05-15 15:05:53 -04:00
Sam f114d63de4 correctly pick the selected theme based on what is loaded 2017-05-15 14:34:24 -04:00
Robin Ward e865a44b93 FIX: Forgot to lock gem 2017-05-15 13:35:28 -04:00
Robin Ward e7827ee715 Add `bundle-audit` to our test script 2017-05-15 13:34:30 -04:00
Robin Ward ecf8db15d9 Adds bundle auditing to travis 2017-05-15 13:25:55 -04:00
Robin Ward e6c6ea79fa Add bundle-audit for security auditing 2017-05-15 13:24:37 -04:00
Robin Ward bd0bb879e5 FIX: Don't count likes from system users in the new user of the month 2017-05-15 13:14:32 -04:00
Sam e1dd543a93 FEATURE: allow users to select theme on single device 2017-05-15 12:48:16 -04:00