Commit Graph

3933 Commits

Author SHA1 Message Date
Régis Hanol bbde2aaa97 Merge pull request #1896 from nickborromeo/category-list
Refactor find_relevant_topics and find_categories
2014-03-12 09:44:41 +01:00
Nick Borromeo 5104c7365f Refactor find_relevant_topics and find_categories
This breaks down two private methods into smaller methods for
readability. This also moves logic into the Category model class.
2014-03-11 22:16:13 -07:00
Kris Aubuchon 441d01c5a6 going back to the white on blue new post notification badges 2014-03-11 17:26:25 -04:00
Régis Hanol 5ffcfb1a8c TRIVIAL: remove useless condition 2014-03-11 19:06:36 +01:00
Régis Hanol aece2b61a9 FIX: revision history UI 2014-03-11 18:51:26 +01:00
Vikhyat Korrapati 2e4a699b30 Set canvas height and width for Firefox image copy-paste. 2014-03-11 15:29:44 +05:30
Régis Hanol d25081ce07 Merge pull request #2104 from nschonni/additional-jshinting
Additional jshinting
2014-03-11 09:20:04 +01:00
Régis Hanol f71846f269 Merge pull request #2103 from awesomerobot/master
fixing the remnant borders left on the header buttons
2014-03-11 09:11:32 +01:00
Nick Schonning 635c0dbf7a JSHint i18n.js
- Mark the I18n object as an overridable global
- Normalize comma first style rather than turning on lax comma
- Add missing semicolons
- Remove unnecessary semicolons
- Fix options overloading in “lookup”
- Use strict comparison for typeof checks and remove unnecessary parens
2014-03-11 03:01:12 -04:00
Jeff Atwood 7482f07eaa reduce undocked header title font size slightly 2014-03-10 23:55:30 -07:00
Jeff Atwood 5cd672d396 reduce docked header title font size slightly 2014-03-10 23:24:01 -07:00
Kris Aubuchon 81b5b6de0e fixing the remnant borders left on the header buttons 2014-03-10 20:22:37 -04:00
Jeff Atwood 8cf29e1339 add envelope icon to invite friends default btn 2014-03-10 17:10:40 -07:00
Jeff Atwood 258ebaf1a8 add calendar icon to best of 2014-03-10 17:05:53 -07:00
Sam eb2f04d458 PERF: Don't blur all elements on a page 2014-03-11 09:03:24 +11:00
Jeff Atwood 4ce422dc26 Merge pull request #2101 from awesomerobot/master
fixing regression, adding max-height to #site-logo
2014-03-10 13:47:30 -07:00
Kris Aubuchon 15484fa394 fixing regression, adding max-height to #site-logo 2014-03-10 16:41:54 -04:00
Robin Ward 9929560c40 FIX: Suggested Topics had a hardcoded 5 and was ignoring the
SiteSetting
2014-03-10 15:36:45 -04:00
Robin Ward f5e6bcc585 Create a cold age helper, make sure the first age column is strictly
`created_at`, add cold to the second column.
2014-03-10 15:02:39 -04:00
Robin Ward c430c6dd30 FIX: Only add `home` class when there is no badge 2014-03-10 13:31:07 -04:00
Régis Hanol 455ff61626 Merge pull request #2071 from nschonni/autocomplete-js-cleaning
Autocomplete js cleaning
2014-03-10 17:06:51 +01:00
Robin Ward 9f67d476ef Add `bookmarked` class to bookmarks button. Also remove duplicated code,
use fewer observers.
2014-03-10 12:03:46 -04:00
Robin Ward 33f483a47e Add `home` class to dropdown for categories 2014-03-10 11:43:24 -04:00
Robin Ward 6626a6c3ea FIX: Don't increase link counts when they are in the thousands 2014-03-10 11:21:48 -04:00
Robin Ward d200e68bab FIX: Link counter was broken for some https links 2014-03-10 11:16:21 -04:00
Benjamin Kampmann 680197200e Add support for arrays to PluginStore 2014-03-10 14:59:59 +01:00
Régis Hanol c5beb3852f Merge pull request #2092 from nschonni/jshinting
Jshinting during CI build
2014-03-10 09:51:11 +01:00
Jeff Atwood 3186ca8c99 Merge pull request #2094 from vikhyat/firefox-paste-image
Fix Firefox image paste contenteditable hack
2014-03-09 22:48:56 -07:00
Vikhyat Korrapati 3b1ed996e7 Firefox: Reuse same contenteditable <div> instead of creating a new one on paste.
This fixes the issue where every alternate paste from a different source
would not work because the content wasn't getting pasted into the
contenteditable div randomly.
2014-03-10 10:50:52 +05:30
Kris Aubuchon ef0e636307 making the mobile composer opaque, may fix clicks from falling through 2014-03-10 00:55:12 -04:00
Sam e49ad34bfc Revert "Hack for supporting pasting images into the composer in Firefox."
Reverted cause it broke https://meta.discourse.org/t/when-creating-a-reply-pasting-only-works-once/13587

This reverts commit c8c150dfbe.
2014-03-10 13:43:28 +11:00
Sam e68e106be7 UI: we only intended to add the word "new" for new topics 2014-03-10 13:40:49 +11:00
Sam bf23c7a0c4 Merge pull request #2066 from riking/red-popup
Style 'urgent' composer popups differently
2014-03-10 10:46:15 +11:00
Sam 0de759e734 UI: remove usercard hacks, specify width explictly 2014-03-10 10:27:58 +11:00
Sam 68630af718 Merge pull request #2083 from vikhyat/firefox-paste-image
Hack for supporting pasting images into the composer in Firefox
2014-03-10 10:06:31 +11:00
Sam 5e83778fc1 PERF: remove ember renderspeed until we make it optional (disabled by default in prd) 2014-03-10 09:50:23 +11:00
Sam c1d998cd4b Merge pull request #2086 from vikhyat/new-unread-i18n
i18n of new/unread text next to topics
2014-03-10 09:27:04 +11:00
Vikhyat Korrapati b0d1d7a3e8 i18n of new/unread text next to topics. 2014-03-09 16:31:44 +05:30
Kris Aubuchon c751567c04 fixing mobile notificaiton badge 2014-03-08 23:08:32 -05:00
Vikhyat Korrapati c8c150dfbe Hack for supporting pasting images into the composer in Firefox. 2014-03-09 04:24:05 +05:30
Kris Aubuchon 10858d3c87 some incremental style enhancements, as discussed here https://meta.discourse.org/t/discourse-design-experiments/13479 2014-03-08 00:55:02 -05:00
Nick Schonning 96bf38757d Update indexOf polyfill
Updated from the same source as the original comment. If IE8 isn’t
supported then this can be removed.
2014-03-08 00:37:28 -05:00
Jeff Atwood 4efabef8f2 add btn-primary class to PM in usercard 2014-03-07 14:27:13 -08:00
Robin Ward 145b2931c6 FIX: Forward button would break on some topics 2014-03-07 16:28:53 -05:00
Jeff Atwood 1403d303b6 Merge pull request #2074 from awesomerobot/master
fixing close topic/footer button/suggested topics alignment
2014-03-07 12:13:30 -08:00
Kris Aubuchon 3be1b0decf fixing close topic/footer button/suggested topics alignment 2014-03-07 15:04:18 -05:00
Robin Ward 055b367e2b Add link counts to `alt` tags of their badges. 2014-03-07 14:43:29 -05:00
Robin Ward f5c3199b38 FIX: Do not consider hidden elements when wanting to load more 2014-03-07 14:23:13 -05:00
Régis Hanol 8214536614 BUGFIX: don't show redirect reason if you aren't redirected
Move the redirect to top page logic server-side and make sure the reason
is not shown when top is not in the navigation menu (top_menu).
2014-03-07 18:58:53 +01:00
Nick Schonning 8b3f2a8685 Remove unused variable
It is only set to empty then passed
2014-03-07 12:23:23 -05:00
Nick Schonning db5ff5f311 Combine single path conditional 2014-03-07 12:23:22 -05:00
Nick Schonning 8961a2ee28 Simplify characterCode lookup
Reduce String.fromCharCode that can’t be optimized by the minifier.
2014-03-07 12:23:16 -05:00
Robin Ward 78889163bf BUGFIX: We were tring to delete the mail string, not the mail itself. 2014-03-07 11:28:55 -05:00
Kris Aubuchon ba52091330 fixing the profile page that I broke 2014-03-07 09:36:28 -05:00
Régis Hanol 87c5c59257 Revert "Fix unmatched braces of "nav.post-controls button""
This reverts commit c43e86d7c6.
2014-03-07 12:43:50 +01:00
Régis Hanol 084f51b013 FEATURE: do not show category definition topic on top pages 2014-03-07 12:02:52 +01:00
Régis Hanol dbb383497c Merge pull request #2072 from ligthyear/fix-edit-body-too-similar-issue
Be more liberal when users wants to change their own body to a previous version
2014-03-07 11:38:59 +01:00
Régis Hanol f25bcc5067 couple of bugfixes identified while importing from VB 2014-03-07 10:44:04 +01:00
Régis Hanol 7670598658 Merge pull request #2070 from nschonni/fix-mailformed-rule
Fix unmatched braces of "nav.post-controls button"
2014-03-07 10:37:25 +01:00
Sam e9fe8f6063 Revert "BUGFIX: if uploads is in a symlinked directory stuff breaks"
This reverts commit 894bb0716c.

The issue here was that docker was not mounting stuff properly post
reboot, then we had a broken symlink that "exists"
2014-03-07 19:22:40 +11:00
Sam 894bb0716c BUGFIX: if uploads is in a symlinked directory stuff breaks 2014-03-07 19:17:11 +11:00
Jeff Atwood b91eb8ed38 fix user page primary width 2014-03-07 00:01:42 -08:00
Sam 73ef91cf27 junk code removed 2014-03-07 19:00:36 +11:00
Sam b19400726f BUGFIX/FEATURE: store topic changes in post revisions
History + edit notifications for title and category changes
2014-03-07 19:00:36 +11:00
Benjamin Kampmann d956ca9cf7 Be more liberal when the similar content of the post to be saved turns out to be the same post
- instead of setting a random number, we actually store the post id in redis now
 - and when checking for matching recent post and it is the same, we allow it still

Fixes the issue that we prevent a user from reverting to a previous state within the unique_posts_min time window.
2014-03-07 08:23:15 +01:00
Nick Schonning c43e86d7c6 Fix unmatched braces of "nav.post-controls button"
Spacing changes made so that the other braces could be compared
2014-03-07 00:29:58 -05:00
Jeff Atwood 0d84ec4d58 Merge pull request #2069 from nschonni/remove-tabs
Remove IE7< star hacks
2014-03-06 21:04:32 -08:00
Nick Schonning 3b881f3215 Remove IE7< star hacks 2014-03-06 23:55:57 -05:00
riking e0063920b7 Style 'urgent' composer popups differently
The two "bad behavior" composer popups get the 'urgent' class, which colors them red.
2014-03-06 15:35:47 -08:00
Robin Ward 49a1733d97 FIX: We should use partials when rendering but keeping the same context. 2014-03-06 15:56:33 -05:00
Robin Ward 102242c9d5 Add Dismiss Read to mobile view 2014-03-06 15:32:49 -05:00
Robin Ward e2ea148e38 FEATURE: Allow `customHTML` helper to resolve to a template if it
exists.
2014-03-06 13:32:32 -05:00
Régis Hanol 11d91328ab Merge pull request #2056 from vikhyat/pm-likes
Don't suppress like notifications in private messages
2014-03-06 14:53:27 +01:00
Vikhyat Korrapati 944246f4af Add test to ensure creation of like notification in a PM. 2014-03-06 19:07:26 +05:30
Régis Hanol ac99947979 BUGFIX: topic specs were dependent on Time.now
which would fail when DST was around
2014-03-06 12:44:52 +01:00
Nick Schonning bbe2d3cfe9 Strip tabs from sheets 2014-03-06 01:51:39 -05:00
Nick Schonning 978c120279 Use for loop to shrink bbcode
Dry out the long set of similar selectors
2014-03-06 01:45:31 -05:00
Nick Schonning 4f1a517490 Remove units for zero values
Units are ignored for zero values in CSS except for a few edge cases.
2014-03-06 01:14:51 -05:00
Nick Schonning f43072135d Remove empty SCSS rules 2014-03-06 01:02:00 -05:00
Kris Aubuchon 699692168d modifying user profile to better support image backgrounds 2014-03-05 23:22:24 -05:00
Kris Aubuchon 899a5a87cd adding basic :focus style in for buttons in Firefox 2014-03-05 22:18:42 -05:00
Robin Ward 2b0151afe9 BUGFIX: Editing a category would break categories for the current user
session.
2014-03-05 17:33:14 -05:00
Régis Hanol ca12ea42a7 FEATURE: only redirect new users to top page for a limited period
That period is defined by the `redirect_new_users_to_top_page_duration`
site setting and defaults to 7 days.
2014-03-05 22:11:01 +01:00
Robin Ward b0f3061113 It doesn't make sense to redirect when not logged in on a non-GET
request. We should report a failure then. They likely logged out or
in another tab or timed out.
2014-03-05 12:12:53 -05:00
Régis Hanol 2a99f1b15e BUGFIX: HOME/END keyboard shortcuts on non-topic pages
This make sure both HOME/END keyboard shortcuts are only applied when viewing a topic
2014-03-05 16:08:45 +01:00
Régis Hanol bce4130d39 Merge pull request #2036 from ArmedGuy/profile-backgrounds
FEATURE: Profile Backgrounds
2014-03-05 16:00:49 +01:00
Johan Jatko 98c479c3c4 FEATURE: Profile Backgrounds
Shares a modified codebase with avatars called "user_image"
2014-03-05 15:10:44 +01:00
Sam adb6541635 FEATURE: mailing list mode always available 2014-03-05 14:21:53 +11:00
Sam 69b498da24 Merge pull request #2034 from birarda/custom_username_length
allow for custom username length via site setting
2014-03-05 12:06:23 +11:00
Stephen Birarda 4a2dab9c5e allow for custom min_username_length
change constant in user to be global range and not default
2014-03-04 16:37:05 -08:00
Sam ea553202f0 Merge pull request #2033 from birarda/master
add option to override user attributes from SSO payload
2014-03-05 11:33:32 +11:00
Sam eb3a535c38 Merge pull request #2038 from fantasticfears/poster_expansion
poster_expansion will only slide down now.
2014-03-05 11:27:03 +11:00
Sam 24356cd807 Merge pull request #2050 from verg/unify_scroll_to_first_post
Scroll to Top of Topic instead of Reloading
2014-03-05 11:22:54 +11:00
Sam b0fc834e09 Merge pull request #2054 from ligthyear/fix-broken-cats
BugFix: email-in on categories wasn't null-ed properly
2014-03-05 11:16:20 +11:00
Benjamin Kampmann bf77c84095 BugFix: email-in on categories wasn't null-ed properly
Causing a problem if two categories got saved with an empty string because the corresponding Database constraint on the index would complain about dublicate values
2014-03-05 00:42:05 +01:00
Robin Ward aa3f7f764d You can only reuse email tokens within 24 hours. 2014-03-04 14:03:04 -05:00
Robin Ward 15c9c90533 When links have thousands of clicks, display them like 3.3K 2014-03-04 13:44:53 -05:00
Robin Ward e276045112 TRIVIAL: Change some variables to `self` 2014-03-04 13:09:11 -05:00
Robin Ward 90a1cb5bec Change email token expiry to 24 hours instead of 1 week 2014-03-04 13:02:48 -05:00
Stephen Birarda c3eb2025d8 add option to override user attributes from SSO payload
add an external_username attribute for username from SSO payload

repair the field name in SingleSignOnRecord migration

move setting of external_username for sso to controller

add settings toggle to override username/email from SSO payload

fix changing of external username after override toggle

complete tests and logic for sso override

add some extra context to username override option

add external_email and external_name to single sign on record

add setting for name override from SSO payload

complete override with stored external_email and external_name

add missing checks to tests

remove an unneeded describe block

break up a monster method for single sign on

fixes for sso attribute override after failed tests
2014-03-04 09:52:21 -08:00