codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-12-18 11:32:24 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
18124 commits 7 branches 179 tags 87 MiB
Commit graph

10836 commits

Author SHA1 Message Date
Sam
3c072cdfc9 Merge branch 'master' of github.com:discourse/discourse 2016-02-24 13:53:43 +11:00
Robin Ward
03068e3556 FIX: User deleted posts weren't red 2016-02-23 13:38:51 -05:00
Robin Ward
84a01599c6 Commenting was *too* good :) 2016-02-23 13:37:08 -05:00
Robin Ward
05a0308663 Finish documenting new PluginAPI 2016-02-23 12:44:52 -05:00
Robin Ward
ef079004da Ability to decorate after post cooked, and rawHtml helper 2016-02-23 12:10:25 -05:00
Arpit Jalan
9de5c340b0 FIX: invite link should not auto-accept invitation if user is already logged in 2016-02-23 12:10:25 -05:00
Sam Saffron
27052717a4 Merge branch 'master' into vdom 2016-02-23 17:23:05 +11:00
Sam Saffron
d59c9badbe correct build 2016-02-23 17:22:41 +11:00
Sam Saffron
10aa1923a4 Merge branch 'master' into vdom 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2016-02-23 17:07:01 +11:00
Sam Saffron
32d3dd22a0 FIX: broken autocomplete on Android 
Android Chrome does not support keypress event, instead use keyup
 2016-02-23 17:06:15 +11:00
Sam Saffron
d0a86f8032 Merge branch 'master' into vdom 2016-02-23 15:58:46 +11:00
Sam Saffron
6d22354ac3 FIX: cleaner error handling for multiple autocomplete matchers 2016-02-23 15:48:39 +11:00
Robin Ward
200da89355 FIX: Broken tests 2016-02-22 22:11:35 -05:00
Robin Ward
5dd81700f1 FIX: Overflow CSS was hiding selecting posts buttons 2016-02-22 22:07:23 -05:00
Duong Tam Chau
cd84a05600 FIX: Remove existing characters when a new emoji is selected. 
When the user choose an emoji from the "More..." option, any previously typed character should be discarded.
 2016-02-22 20:24:06 -05:00
Régis Hanol
8d1da9cedd FEATURE: keep original title when sending email notifications about a PM 2016-02-23 01:34:16 +01:00
Jeff Atwood
6eb8730fce tweak banner close X button a bit 2016-02-22 15:57:31 -08:00
Sam
32c681c96b annotate models 2016-02-23 10:33:53 +11:00
Robin Ward
8bfb5b4e7b Backported double click fix 2016-02-22 16:39:43 -05:00
Robin Ward
d4091d579d Remove profiling information for vdom 2016-02-22 16:31:49 -05:00
Robin Ward
6d06979da6 FIX: Arrow in quotes was pointing the wrong way 2016-02-22 16:19:22 -05:00
Robin Ward
acc20c87b2 FIX: Jump to embedded was not working when the post was far away 2016-02-22 15:58:08 -05:00
Robin Ward
026bba1876 Merge branch 'master' into vdom 2016-02-22 15:28:07 -05:00
Robin Ward
fdf0047f56 A helper for cooked content in a decorator 2016-02-22 15:19:56 -05:00
Neil Lalonde
cab5dd09d3 FIX: broken links on admin dashboard in Top Referrers section 2016-02-22 14:31:13 -05:00
Robin Ward
65553d7b70 Allow custom classes for any widget 2016-02-22 14:09:53 -05:00
Robin Ward
54904133a0 Ability to mount ember views into vdom 
It's slow but can be used as a last resort for old plugins.
 2016-02-22 12:10:34 -05:00
Régis Hanol
780c3ad755 Merge pull request #4008 from joebuhlig/master 
Add tertiary color to email digests
 2016-02-22 14:43:21 +01:00
Joe Buhlig
6763a9923a Added tertiary color to digest 
Added hash to color in helper

Added anchor_color to topic and site name links

Styled the unsubscribe link
 2016-02-22 07:02:21 -06:00
Arpit Jalan
c2caf90de6 FIX: RSS feed must have unique GUID 2016-02-22 18:28:09 +05:30
Régis Hanol
4d981cec53 FIX: don't try to optimize large PNGs (takes too much time) 2016-02-22 12:57:24 +01:00
Jeff Atwood
c9d19c9462 tighten up mobile profile image size 2016-02-22 02:18:34 -08:00
Jeff Atwood
2ab901bec4 adjust bad styling on mobile user page 2016-02-22 02:03:50 -08:00
Jeff Atwood
66fa836d88 we don't want a clear for notification options 2016-02-22 01:53:51 -08:00
Jeff Atwood
23063ea094 mobile needs different post body overflow handling 2016-02-22 01:40:28 -08:00
Jeff Atwood
6a6e3a6a3a FIX: add global hidden overflow on all topic bodies 2016-02-22 01:17:50 -08:00
Guo Xiang Tan
3142eb76dc Revert "FIX: find_by_attribute method in Rails 4.5 is case insensitive." 
This reverts commit 2af587005b.
 2016-02-22 15:55:48 +08:00
Sam
4c0a40f2b0 FIX: publish notification state when notifications are read 
(this clears green and blue bubbles)
 2016-02-22 12:24:51 +11:00
Sam
c404da248a Merge branch 'master' into vdom 2016-02-22 12:20:59 +11:00
Sam
d0337e7f5e FIX: clear notification bubble when notification is read 2016-02-22 12:20:41 +11:00
Gerhard Schlager
eb166e78b6 Don't try to import invalid websites 2016-02-21 17:38:04 +01:00
Robin Ward
e848ea5a99 Depcreate PageTracker in favor of PluginAPI 2016-02-19 16:30:59 -05:00
Robin Ward
9b0b213ba2 FIX: Less safe API for icons 2016-02-19 16:03:26 -05:00
Neil Lalonde
e8d837269b FEATURE: pending flags reminder is sent as a group message to staff instead of sending an email to the contact email site setting. 2016-02-19 15:21:18 -05:00
Robin Ward
8b318f76a1 Expose decoration for plugins such as signatures 2016-02-19 14:46:29 -05:00
Robin Ward
f2f49a5e96 Ability to add text to a poster name icon 2016-02-19 14:22:36 -05:00
Neil Lalonde
97130463d6 FEATURE: show a new modal when suspended users try to log in 2016-02-19 12:19:20 -05:00
Guo Xiang Tan
4858187b0e UX: Don't display span if there is no count. 2016-02-19 15:55:43 +08:00
Guo Xiang Tan
5e329898f6 UX: Don't display span if there is no count. 2016-02-19 15:33:07 +08:00
Sam
ecca7b69bb Merge branch 'master' into vdom 2016-02-19 18:28:57 +11:00
Sam
665a87a32f UX: revert full page search focus on magnifying glass click 2016-02-19 18:28:36 +11:00
Guo Xiang Tan
7a261e5e4f UX: Hide close mobile navigation on click. 2016-02-19 15:22:41 +08:00
Sam
8493057942 Merge branch 'master' into vdom 2016-02-19 17:09:28 +11:00
Sam
02002afd3f clean up hack 2016-02-19 17:08:08 +11:00
Sam
f33cfb698c Merge branch 'master' into vdom 2016-02-19 17:03:42 +11:00
Sam
c230c11707 FEATURE: stop removing empty categories users have access to from /categories page 
This is particularly important for heirarchies of categories where a parent is empty

Also, if we hide the blank category, how are we going to create the first topic?

Old behavior was hacky.
 2016-02-19 17:03:23 +11:00
Sam
29c2423daf Merge branch 'master' into vdom 
# Conflicts:
#	app/assets/javascripts/discourse/views/post.js.es6
 2016-02-19 14:09:31 +11:00
Sam
ab06f86fbe FEATURE: allow users to control how many previous replies they get 
- always means we always send previous replies with every email
- never means we do not
- "unless previously sent" ... is the default, in which we only email you each reply once

The default_email_previous_replies site setting can control this toggle
 2016-02-19 13:57:07 +11:00
Sam
3de390c067 quote fields in case they are still in the db 2016-02-19 13:57:07 +11:00
Régis Hanol
e204144a58 UsernameValidator error messages weren't matching the code 2016-02-18 23:19:14 +01:00
Robin Ward
e277b24671 Support for multiple emojis at once 2016-02-18 17:10:27 -05:00
Robin Ward
4d599612a2 Support for emoji poster icons 2016-02-18 17:03:18 -05:00
Robin Ward
6935925f10 Update Polls plugin to work with new Plugin API 2016-02-18 15:23:43 -05:00
Robin Ward
f6aa1ac37a Migrate onToolbarCreate to the DiscourseAPI 2016-02-18 15:23:43 -05:00
Robin Ward
7b8e313dac Remove unncessary CP 2016-02-18 15:23:43 -05:00
Neil Lalonde
283ff4c7f8 move code for bulk adding users to a group from controller to model 2016-02-18 14:03:08 -05:00
Régis Hanol
abc41c7d5b FIX: sharing a post was broken 2016-02-18 19:28:00 +01:00
Régis Hanol
8a1a9f60a2 FIX: double click counters 2016-02-18 18:42:10 +01:00
Robin Ward
46e4768971 FIX: highlight.js is used, but for highlighting text, not code. 2016-02-18 12:19:00 -05:00
Robin Ward
849c99f83d Remove Discourse.Mobile constants 2016-02-18 12:19:00 -05:00
Robin Ward
ef75f87c8b Remove unused file 2016-02-18 12:19:00 -05:00
Sam
b9bcdb984a Merge branch 'master' into vdom 2016-02-18 16:57:40 +11:00
Sam
f0e942f647 PERF: move 3 more option columns out of the user table 2016-02-18 16:57:22 +11:00
Sam
b11e6ec38e Merge branch 'master' into vdom 2016-02-18 13:20:55 +11:00
Sam
f9c5cded6f Correct live refresh routine for notifications 2016-02-18 13:20:22 +11:00
Robin Ward
c0a6e34610 API for extra post menu buttons and support for solved button 2016-02-17 15:56:30 -05:00
Robin Ward
98f4b3f8a9 FIX: Bad merge 2016-02-17 12:00:08 -05:00
Régis Hanol
8893d711e0 FEATURE: new pop3 polling configuration admin dashboard check 2016-02-17 11:25:49 +01:00
Sam
1e131a120c Merge branch 'master' into vdom 2016-02-17 18:39:11 +11:00
Sam
8981ca41f0 correct acceptance test 2016-02-17 18:38:57 +11:00
Sam
e8f76c335a Merge branch 'master' into vdom 2016-02-17 18:10:12 +11:00
Sam
3829c78526 PERF: shift most user options out of the user table 
As it stands we load up user records quite frequently on the topic pages,
this in turn pulls all the columns for the users being selected, just to
discard them after they are loaded

New structure keeps all options in a discrete table, this is better organised
and allows us to easily add more column without worrying about bloating the
user table
 2016-02-17 18:08:25 +11:00
Robin Ward
63cda22623 Upgrade withPluginApi to support non-api callbacks 2016-02-16 16:44:27 -05:00
Robin Ward
c6456f5c3e Provide an option callback to the API 2016-02-16 16:22:35 -05:00
Robin Ward
1145d204ed FIX: Editing a post wasn't refreshing properly 2016-02-16 15:22:05 -05:00
Robin Ward
5bc1c5130e FIX: Notifying users via flag wasn't refreshing the UX 2016-02-16 14:35:12 -05:00
Robin Ward
ba203b3a94 FIX: Deleting selected wasn't marking them as deleted 2016-02-16 14:27:41 -05:00
Robin Ward
5d9278c098 FIX: Can force all shadow trees to rerender 2016-02-16 14:20:16 -05:00
Robin Ward
9eed95dc7b FIX: Flag button was visible to anon 2016-02-16 12:51:20 -05:00
Robin Ward
cbd90339ca Add some padding to whisper icons 2016-02-16 12:47:54 -05:00
Robin Ward
9d86ffe412 UX: Rerender the like before the promise resolves. 2016-02-16 12:39:09 -05:00
Régis Hanol
63b9d1c645 FIX: sends an email notifcation when a user's post is linked 2016-02-16 18:29:23 +01:00
Robin Ward
3811b8aa4c withPluginAPI shim to updated plugins will not raise errors 2016-02-16 12:25:01 -05:00
Robin Ward
3a78321c63 withPluginApi means you don't have to check for null. 2016-02-16 12:17:22 -05:00
Robin Ward
3ea1f88cdc Merge branch 'master' into vdom 2016-02-16 11:48:42 -05:00
Régis Hanol
bf96025507 link email logs to the post that generate the email notification when available 2016-02-16 16:35:57 +01:00
Régis Hanol
81c6fb318b FIX: show name in preferences when SSO is enabled and is used to override names 2016-02-16 16:09:05 +01:00
Erick Guan
0c6e5befe4 FIX: topic summary description text was conflicts with reply counter 2016-02-16 12:38:51 +01:00
Sam
18d67851c0 Merge branch 'master' into vdom 2016-02-16 11:53:14 +11:00
Sam
2b689d45ff Revert "save height on small screens" 
This reverts commit 37b5905b44.

It is causing too much confusion for little gain
 2016-02-16 11:52:33 +11:00
Régis Hanol
4ad5660615 add slightly more logs when skipping email notifications 2016-02-15 17:53:07 +01:00
Guo Xiang Tan
2af587005b FIX: find_by_attribute method in Rails 4.5 is case insensitive. 
* https://github.com/rails/rails/pull/23690
 2016-02-15 23:05:16 +08:00
Régis Hanol
40b099f1a6 FIX: keep whitespaces when replacing direct link to external images with local images 2016-02-15 12:34:45 +01:00
Sam
bdcd791530 Merge branch 'master' into vdom 2016-02-15 20:47:23 +11:00
Sam
d7400dd10a UX: Stop taking you to user page when compose private message is called 2016-02-15 20:27:29 +11:00
Sam
071d4aec4d Merge branch 'master' into vdom 2016-02-15 20:14:14 +11:00
Sam
e083fb44f4 FIX: cope with unset notifications on the component 2016-02-15 20:13:55 +11:00
Sam
1dc168a7e6 Merge branch 'master' into vdom 2016-02-15 19:29:59 +11:00
Sam
dd6ebde824 FIX: Always ensure notifications are treated as read once clicked 
UX: improve messaging so notifications list is far more stable
PERF: improve performance of notifcation lookup queries

- Add feature "SetTransientHeader" that allows shipping info to server
   in the next Ajax request
- remove local storage hack used for notifications
- amend lookupStale to return hydrated objects, move logic into store
- stop magically clearing various notifications (likes, invitee accepted, group_summary, granted badge)
 2016-02-15 19:29:47 +11:00
Sam
1f062ae2fd PERF: improve performance of consistency query 2016-02-15 19:29:47 +11:00
Sam Saffron
8e9a8472f4 FEATURE: don't move muted messages back into inbox 2016-02-15 10:56:39 +11:00
Sam
b878598418 Merge branch 'master' into vdom 2016-02-13 17:49:50 +11:00
Robin Ward
f9722f8598 Add custom post icons to PluginAPI 2016-02-12 16:57:24 -05:00
Robin Ward
9b8871d7dd PluginAPI for more stable backwards compatibility going forward 2016-02-12 15:46:36 -05:00
Robin Ward
81ee8f760a FIX: On mobile some elements were overlayed on each other 2016-02-12 15:12:01 -05:00
Neil Lalonde
06c9e79984 FIX: pending flags reminder email was ignoring the 'notify about flags after' site setting. 2016-02-12 14:33:23 -05:00
Robin Ward
3abf5ebb66 FIX: Queued posts were not being removed from the stream 2016-02-12 14:21:20 -05:00
Robin Ward
a3dcd06a93 FIX: Emoji in the post gutter weren't being rendered properly 2016-02-12 13:58:44 -05:00
Robin Ward
c8f7e4d878 FIX: Couldn't jump to small action posts 2016-02-12 13:49:31 -05:00
Robin Ward
776020cc8a FIX: Wasn't jumping to new topic 2016-02-12 13:19:00 -05:00
Robin Ward
d08007f505 FIX: Jumping to new posts was broken 2016-02-12 12:37:00 -05:00
Guo Xiang Tan
6fc2d9db3a UX: Fix a bunch of overflowing links on mobile nav. 2016-02-13 00:02:53 +08:00
Régis Hanol
c740b42328 FIX: whitelist post_types used in context in email notifications 2016-02-12 12:10:30 +01:00
Sam
560e910c6c Merge branch 'master' into vdom 2016-02-12 22:06:41 +11:00
Sam
f77dfda097 FIX: bind the suggested topic/messages text 2016-02-12 22:06:14 +11:00
Sam
f02e035f94 Merge branch 'master' into vdom 2016-02-12 18:21:03 +11:00
Sam
6478f5defa UX: envelope glyph for suggested PMs 2016-02-12 18:20:39 +11:00
Sam
06403df059 Merge branch 'master' into vdom 2016-02-12 17:51:44 +11:00
Sam
3e87250215 UX: initial take at collapsing mobile nav on user page 2016-02-12 17:51:26 +11:00
Robin Ward
aa31f3081a FIX: Placeholders should not show up to non-admins when deleting posts 2016-02-11 16:45:28 -05:00
Robin Ward
4e209846cb FIX: Not tracking posts that dynamically load 2016-02-11 16:23:41 -05:00
Robin Ward
a0d61ebf7f FIX: Clear bookmarks didn't update the UI properly 2016-02-11 15:44:04 -05:00
Robin Ward
5693795dbf FIX: Posts should have auto updating dates 2016-02-11 15:17:58 -05:00
Robin Ward
1d54ba260a FIX: Double hairline in time-gaps on mobile 2016-02-11 14:59:07 -05:00
Robin Ward
c364d08113 FIX: Improved like animation 2016-02-11 14:36:12 -05:00
Robin Ward
5af00da2d8 FIX: Small post actions weren't applying the deleted class 2016-02-11 14:21:22 -05:00
Robin Ward
786f6ff8b0 FIX: Use chrome's scrollRestoration to fix scrolling uses with history 2016-02-11 13:14:43 -05:00
Régis Hanol
86819f08c3 FIX: use RFC-compliant previous replies separator 2016-02-11 18:48:09 +01:00
Robin Ward
e3cc04f315 FIX: Odd scrolling 2016-02-11 11:00:42 -05:00
Robin Ward
867215a915 Oops, decorators are causing jumpiness 2016-02-11 11:00:42 -05:00
Robin Ward
5f65bf420c FIX: Support the plugin-api for decorators 2016-02-11 11:00:42 -05:00
Robin Ward
bc1927dc1e FIX: Tab was broken with keyboard shortcuts 2016-02-11 11:00:42 -05:00
Robin Ward
b5b1178f3a FIX: Suppression below was broken 2016-02-11 11:00:42 -05:00
Robin Ward
05377c62de FIX: The dom was slightly incorrect, messing up mobile rendering 2016-02-11 11:00:42 -05:00
Robin Ward
5af834b6d0 FIX: Avatars in small post actions weren't clickable 2016-02-11 11:00:42 -05:00
Robin Ward
88c104bb83 FIX: Upwards scrolling was broken in a topic 2016-02-11 11:00:41 -05:00
Robin Ward
ea98a4366e FIX: Badge page was using poster-name component 2016-02-11 11:00:41 -05:00
Robin Ward
9b60551d4e Upgrade jQuery 2016-02-11 11:00:41 -05:00
Robin Ward
65d0426ff1 FIX: Janky animations when liking or expanding the post menu 2016-02-11 11:00:41 -05:00
Robin Ward
9ec44f755c FIX: If last post was deleted the gap was not displayed 2016-02-11 11:00:41 -05:00
Robin Ward
2998fe1ee5 FIX: Quoted text wasn't inserted when replying as new topic 2016-02-11 11:00:41 -05:00
Robin Ward
eeafa67984 FIX: Reply as New Topic was not fading in properly 2016-02-11 11:00:41 -05:00
Robin Ward
0b84426a3a FIX: Could like your own posts if they already had likes 2016-02-11 11:00:41 -05:00
Robin Ward
68db4057dc FIX: Small actions weren't showing the avatar of who did it 2016-02-11 11:00:41 -05:00
Robin Ward
bd967ba38c FIX: Placeholders were missing when scrolling downwards 2016-02-11 11:00:41 -05:00
Robin Ward
cd412976d7 FIX: Bookmark by keyboard was broken 2016-02-11 11:00:40 -05:00
Robin Ward
363cf5c5da FIX: Couldn't like via keyboard 2016-02-11 11:00:40 -05:00
Robin Ward
befae52c09 FIX: Read post icon was not fading 2016-02-11 11:00:40 -05:00
Robin Ward
c76e6e173e FIX: Include small actions when determining what's on screen 2016-02-11 11:00:40 -05:00
Robin Ward
81a0b25324 FIX: postChangedRoute was firing after destruction sometimes 2016-02-11 11:00:40 -05:00
Robin Ward
bad9835120 FIX: Regression with quickly hitting back button in vdom branch 2016-02-11 11:00:40 -05:00
Robin Ward
2b1e7306e1 FIX: Regression with time-gap showing decimals and no clearfix 2016-02-11 11:00:40 -05:00
Robin Ward
d1e85bdd8b FEATURE: Use virtual dom framework for faster post rendering 2016-02-11 11:00:40 -05:00
Régis Hanol
cad7fc1062 FIX: don't allow blocked user to send emails in 2016-02-11 10:39:57 +01:00
Jeff Atwood
26763c141c rotated thumbtack glyph reverses left/right padding 2016-02-10 15:26:32 -08:00
Régis Hanol
cc695605b7 fix textarea styling in incoming email details modal 2016-02-10 22:43:00 +01:00
Régis Hanol
91bb38626c FEATURE: new incoming email details modal 2016-02-10 22:00:27 +01:00
Régis Hanol
510f9c5bed Merge pull request #4005 from tgxworld/close_autocomplete_if_term_is_blank 
FIX: Close autocomplete is term is blank.
 2016-02-10 12:57:50 +01:00
Guo Xiang Tan
c7186b1403 FIX: Close autocomplete is term is blank. 2016-02-10 19:50:58 +08:00
Régis Hanol
c2cc9da9a7 remove the wiki color 2016-02-10 11:18:37 +01:00
Jeff Atwood
32cc3a66c8 I can't deal with diagonal pushpins any more 2016-02-10 01:15:59 -08:00
Guo Xiang Tan
ee38572be3 UX: Set max-width on category column to trigger overflow. 2016-02-10 16:34:43 +08:00
Guo Xiang Tan
abc4454e89 UX: Set max-width in order to trigger overflow. 2016-02-10 16:27:03 +08:00
Guo Xiang Tan
d220eb34ff Remove unused mixin. 2016-02-10 16:17:41 +08:00
Régis Hanol
13983c2f80 rever wiki background color, just change the default color 2016-02-09 23:06:08 +01:00
Erick Guan
35142847ba FIX: Prepend the user id before username in admin user routes 2016-02-09 15:14:13 +01:00
Sam
3df2ee3431 UX: allow for an optional toolbar in composer in mobile 
Allows preview of text, emoji, quoting, whisper
 2016-02-09 17:10:41 +11:00
Régis Hanol
460665895c properly name purge emails/email logs site settings 2016-02-08 22:18:52 +01:00
Régis Hanol
ac863bab91 FEATURE: new 'suppress_email_logs_after_days' site setting 2016-02-08 18:47:35 +01:00
Jeff Atwood
2ca1449f17 Merge pull request #4001 from techAPJ/search-page 
FEATURE: add 'New Topic' button on full page search view
 2016-02-08 01:57:44 -08:00
Jeff Atwood
c47b4ceffd Merge pull request #3963 from scossar/post-avatar-table 
FIX: avatar and username should be side-by-side in post-notification email
 2016-02-08 01:57:20 -08:00
Arpit Jalan
796a0db98b FEATURE: add 'New Topic' button on full page search view 2016-02-08 09:09:14 +05:30
Sam Saffron
b9e8732018 UX: tweak autocomplete to limit hijacking 
- Stop eating up back arrow when you hit @
- Clicking anywhere closes autocomplete
- Forward arrow no longer issues autocompletion, instead functions as right arrow
 2016-02-08 10:51:59 +11:00
Sam Saffron
38983bc977 oops 2016-02-08 09:53:47 +11:00
Sam Saffron
b032c63773 FIX: properly defer authentication complete 2016-02-08 08:44:12 +11:00
Sam Saffron
b0567f9c62 FEATURE: automatically sync "move to inbox" / "archive" state on messages 2016-02-07 23:39:07 +11:00
Jeff Atwood
d81728f70d don't allow relative dates to wrap 2016-02-06 14:22:55 -08:00
cpradio
0270da5555 Enable block quotes to be readable on the Profile About Me section 2016-02-06 10:13:27 -05:00
Régis Hanol
54b0de8472 Merge pull request #3994 from tgxworld/fix_autocomplete 
FIX: Don't update autocomplete when removing the key.
 2016-02-06 11:10:54 +01:00
Régis Hanol
62cd6a4122 Merge pull request #3995 from devonestes/reducing-duplication-csv-export 
Reducing duplication and string allocation in Jobs::ExportCsvFile
 2016-02-06 11:10:21 +01:00
Régis Hanol
8db11aab62 Merge pull request #3996 from gschlager/i18n-datepicker 
UX: Use i18n for date picker
 2016-02-06 11:07:21 +01:00
Régis Hanol
edfe14b1f1 Merge pull request #3997 from gschlager/datepicker 
UX: Date Picker in user preferences was ugly
 2016-02-06 11:05:14 +01:00
Gerhard Schlager
8e135e460b UX: Date Picker in user preferences was ugly 2016-02-05 23:28:57 +01:00
Arpit Jalan
8a7868be07 FIX: validate user website 2016-02-06 02:19:48 +05:30
Gerhard Schlager
f7eb7f25bd UX: Use i18n for date picker 2016-02-05 21:49:21 +01:00
Régis Hanol
ea0e63b150 FIX: handle cases where we only pass the notification type rather than the notification id when sending user email 2016-02-05 20:07:30 +01:00
Devon Estes
0aa59956fa Extract method refactoring in Jobs::ExportCsvFile 
I was combing through some of the files with worse grades on Code Climate as a guide for places where I could jump in and help, and I saw this as one of the ones in need of some love. I reduced duplication in the #user_list_export method by extracting several methods that were common to both branches of the logic in that method.
 2016-02-05 16:47:15 +01:00
Régis Hanol
91ec2c5171 fix eslint 2016-02-05 16:08:31 +01:00
Régis Hanol
56a16a0e89 we still need md5 2016-02-05 15:27:24 +01:00
Sam Saffron
e3747f654b SECURITY: hoist blocks using guids, not md5 hashes 2016-02-06 01:02:48 +11:00