Commit Graph

22815 Commits

Author SHA1 Message Date
Robin Ward b3165f8435 FIX: If badges are disabled don't show "Top Badges" on summary view 2017-05-04 12:14:32 -04:00
Neil Lalonde c98601129b Move name, avatar, and title fields from profile tab to account tab 2017-05-04 12:04:07 -04:00
Robin Ward de0d13e4ef FIX: Badge filtering was always to the currentUser 2017-05-04 11:58:56 -04:00
Neil Lalonde f4c09e9e90 fix select input widths regression in user preferences 2017-05-04 11:25:22 -04:00
Sam 6a6eed4ed2 DEV: column dropper class for cleaner removal of superflous columns
Also fixes issues during deploy cause target column was renamed in
theme_fields
2017-05-04 10:15:41 -04:00
Arpit Jalan 0bdced165a UX: change timestamp button on mobile was hidden behind date selector 2017-05-04 18:47:25 +05:30
Guo Xiang Tan 489c3bc1cd Disable failing JS tests first. 2017-05-04 16:49:12 +08:00
Guo Xiang Tan 10f34c7ca7 Revert "No need to run migration for QUNIT tests on Travis."
This reverts commit 9d20fbb940.
2017-05-04 15:24:06 +08:00
Guo Xiang Tan 9d20fbb940 No need to run migration for QUNIT tests on Travis. 2017-05-04 15:19:32 +08:00
Guo Xiang Tan 4101db8b36 FIX: Invalid creation of `Theme` in wizard builder. 2017-05-04 11:44:23 +08:00
Guo Xiang Tan 58edd203a9 SECURITY: XSS issue in share popup if invalid link is passed in. 2017-05-04 10:33:59 +08:00
Guo Xiang Tan 94c8410521 FIX: Show share popup only for valid buttons. 2017-05-04 10:31:09 +08:00
Robin Ward b3908a1d7f FIX: The user might be anonymous 2017-05-03 18:39:02 -04:00
Robin Ward 60693240e1 FIX: Filter badges to user on their badges page too 2017-05-03 17:58:59 -04:00
Régis Hanol bf322281e3 Improve handling of inlined images in incoming emails 2017-05-03 23:02:02 +02:00
Régis Hanol 768c63c103 Add 'keep_cid_imgs' option to HTML to Markdown converter to improve incoming email parsing 2017-05-03 23:01:55 +02:00
Jeff Atwood 9d7917f79d minor copyedit 2017-05-03 14:00:20 -07:00
Guo Xiang Tan 3eb920e2b0 Merge pull request #4841 from fantasticfears/webhook-ping
add event name for ping webhooks in the header
2017-05-04 04:54:40 +08:00
Neil Lalonde 7f09bc9a09 Merge pull request #4849 from discourse/prefs
User preferences in tabs
2017-05-03 16:53:26 -04:00
Neil Lalonde 47b816c168 comment test failing on theme widget 2017-05-03 15:33:25 -04:00
Neil Lalonde 389a0e1a1c FIX: emails should use default theme colors 2017-05-03 14:35:13 -04:00
Neil Lalonde 96aee443fa wip js test 2017-05-03 13:49:16 -04:00
Régis Hanol e38014772b FIX: skip hidden <img> (no tracking for you) 2017-05-03 19:40:34 +02:00
Robin Ward b705634ee1 FIX: If you have a badge, filter to you when clicking on it 2017-05-03 13:35:20 -04:00
Régis Hanol c8044c6956 FIX: skip hidden nodes when converting from HTML to Markdown 2017-05-03 19:34:03 +02:00
Robin Ward 09cb61b533 FIX: Jumping to a post that doesn't exist should jump to closest 2017-05-03 13:24:30 -04:00
Régis Hanol bff36de130 FIX: HtmlToMarkdown should not convert empty/bad <img> tags 2017-05-03 18:29:25 +02:00
Régis Hanol c880af8120 FIX: properly trim whitespaces (including those pesky &nbsp; html entities) 2017-05-03 18:04:31 +02:00
Sam dbb6e461aa oops 2017-05-03 11:44:15 -04:00
Neil Lalonde 8bcfea3b0d new outlets for plugins 2017-05-03 11:41:01 -04:00
Sam 342ef5f81a FEATURE: out-of-the-box dark/light user selectable themes 2017-05-03 11:31:33 -04:00
Robin Ward 81190f5d66 FIX: Redirect away from `account-created` if you're logged in 2017-05-03 11:18:01 -04:00
Robin Ward 12fb20fe1b FEATURE: Allow users to resend/update email from confirmation page 2017-05-03 11:18:01 -04:00
Robin Ward b381372184 Use Ember.js for the `/u/account-created` path so we can add controls 2017-05-03 11:18:01 -04:00
Régis Hanol 8048aeac22 FIX: BBCode converter in bulk importers 2017-05-03 16:56:52 +02:00
Régis Hanol edbf12622b FIX: HtmlToMarkdown should not convert empty/bad <a> tags 2017-05-03 16:42:37 +02:00
Régis Hanol 1706036f2b Allow a `post_edit_time_limit` of up to 1 year 2017-05-03 16:06:55 +02:00
Régis Hanol 4b9cc1ad17 import likes & bookmarks in JIVE API importer 2017-05-03 16:00:23 +02:00
Arpit Jalan 75300b6356 improve specs 2017-05-03 17:48:33 +05:30
Arpit Jalan 86f1cc8c92 FIX: don't apply max_emails_per_day_per_user on critical emails 2017-05-03 17:07:39 +05:30
Guo Xiang Tan a470bce8fb Update mail gem to 2.6.5 for a slightly smaller memory footprint. 2017-05-03 17:02:47 +08:00
Guo Xiang Tan 982e3d04f6 PERF: Allow memory to be freed instead of fetching all the objects into memory at once.
```
MemoryProfiler.report do
  Jobs::UserEmail.new.execute(type: :mailing_list, user_id: user.id)
end.pretty_print
```

Before:
```
Total allocated: 180096119 bytes (1962025 objects)
Total retained:  2194 bytes (16 objects)

allocated memory by gem
-----------------------------------
  66979096  activerecord-4.2.8
  43507184  nokogiri-1.7.1
  43365188  mail-2.6.4
   5960201  activesupport-4.2.8
   5056267  discourse/lib
   4835284  rack-mini-profiler-0.10.1
   3825817  arel-6.0.4
   2186088  i18n-0.8.1
   1719330  discourse/app
```

After:
```
Total allocated: 161935975 bytes (1473940 objects)
Total retained:  2234 bytes (17 objects)

allocated memory by gem
-----------------------------------
  45430264  activerecord-4.2.8
  43568627  nokogiri-1.7.1
  43430754  mail-2.6.4
  11233878  rack-mini-profiler-0.10.1
   5260825  activesupport-4.2.8
   5054491  discourse/lib
   2186088  i18n-0.8.1
   1822494  arel-6.0.4
```
2017-05-03 17:01:57 +08:00
Guo Xiang Tan 90cd35c496 PERF: Reduce allocated memory when generating mailing list email.
Before: 10590714 bytes
After: 5303394 bytes
2017-05-03 16:59:44 +08:00
Guo Xiang Tan 8d04afc01b Update OJ. 2017-05-03 16:52:02 +08:00
Guo Xiang Tan 862052fca8 Update `rack-mini-profiler`. 2017-05-03 16:52:02 +08:00
Arpit Jalan cdce060a38 FIX: don't apply max emails per day per user to forgot password 2017-05-03 14:02:37 +05:30
Neil Lalonde 2503241ce5 FEATURE: rebuild user preferences page to use tabs 2017-05-02 16:52:18 -04:00
Sam f5f4c36795 Increase autospec qunit timeout to 600 seconds
Correct it so it refocuses on correct runner after running a test
JS tests can not focus on line so skip in vim mode
2017-05-02 16:02:14 -04:00
Sam 946f25098f Refactor theme fields so they support custom theme defined vars
This paves the way to allowing themes to specify uploads and so on.
2017-05-02 16:02:14 -04:00
Arpit Jalan 1f6ffd5fb0 Update Translations 2017-05-02 16:08:55 +05:30