Commit Graph

3830 Commits

Author SHA1 Message Date
Kris Aubuchon 10e493aa0c fixing ol and ul preview/post incongruency 2014-01-13 11:41:58 -05:00
Robin Ward 55918e6835 Adjustments to embedded content 2014-01-13 10:59:46 -05:00
Claus Strasburger a9d34c3589 Fix Post-rendering bug
Ember.Handlebars.normalizePath was being called with an object as
argument which caused it to error out.
also wrapped the return in a SafeString, so the html will not get
escaped again.
2014-01-13 13:29:19 +01:00
Sam 23a17bd76d Merge pull request #1801 from nickborromeo/issue-1794
Fixing padding for misaligned small logo URL
2014-01-13 01:39:05 -08:00
Sam 2c75e15049 FEATURE: query param for closed / archived / open
?status=closed for closed topics
?status=open for open topics
?status=archived for archived topics
2014-01-13 14:40:21 +11:00
Sam e076682bc6 BUGFIX: Improve copy and correct instruction alignment 2014-01-13 10:11:40 +11:00
Sam 2b64118df1 Merge pull request #1782 from ligthyear/group-mention
Allow groups to be used as aliases for user mentions
2014-01-12 14:36:45 -08:00
Sam e20f5f89e6 Merge pull request #1795 from ok-harry/master
internationalize Discourse.Formatter.tinyDateYear
2014-01-12 14:34:10 -08:00
Sam 6e3a94ea1b Merge pull request #1807 from balinterdi/patch-1
Fix method name in code documentation for prependMore
2014-01-12 14:24:29 -08:00
Régis Hanol 70161498b6 BUGFIX: spoiler tag on lightboxed images wasn't working 2014-01-12 19:38:46 +01:00
Neil Lalonde 52580f09af Rename favorite to starred everywhere 2014-01-10 14:54:19 -05:00
Neil Lalonde 845c2b62cc Show full dates with smaller font in topic lists 2014-01-10 13:56:36 -05:00
Robin Ward 1aee217a61 FIX: sidekiq 100% CPU usage due to `ice_cube` 2014-01-10 11:43:51 -05:00
Robin Ward a37acd39a0 FIX: Scroll issue on Firefox when approaching the top post 2014-01-10 11:03:48 -05:00
Balint Erdi 516ead703a Fix method name in code documentation for prependMore 2014-01-10 15:47:05 +01:00
Neil Lalonde 7cbcd72ea4 Add site_description to meta description tag for real 2014-01-09 16:42:22 -05:00
Robin Ward ca26d6d0d6 FIX: Uncaught promise on link click; fixes broken build 2014-01-09 16:31:26 -05:00
Robin Ward af9b7bfee2 Add support for lists to readability topic importing. 2014-01-09 15:49:38 -05:00
Robin Ward 852d110f35 Test email is now synchronous and ignores sidekiq queue. 2014-01-09 15:25:25 -05:00
Robin Ward 2ee3859c08 New hook for after the application route has activated 2014-01-09 14:28:42 -05:00
Neil Lalonde f773388105 Oops remove console.log 2014-01-09 13:09:11 -05:00
Robin Ward b28a8e262f FIX: Categories are ordered by `topic_count`. 2014-01-09 13:05:32 -05:00
Régis Hanol eba54653c3 BUGFIX: bouncing images everywhere!
NOTE: inline attribute and style do not have precedence over CSS styling...
2014-01-09 18:43:23 +01:00
Neil Lalonde 259295d865 Add post_edit_time_limit site setting to limit the how long a post can be edited and deleted by the author. Default is 1 year. 2014-01-09 11:55:04 -05:00
Shiv Kumar 77dd47472c Update header.js.handlebars 2014-01-08 22:17:52 -08:00
Shiv Kumar 1f9d2e1dea add tooltip for user icon when not logged in 2014-01-08 22:13:44 -08:00
Sam 177983afe6 BUGFIX: mobile ui was being cached for anon views 2014-01-09 14:08:42 +11:00
Sam 1533a1163c use_ssl is just confusing, it means use_https , fix name of setting 2014-01-09 10:51:38 +11:00
Sam 4b54e10d27 only update title if it changes 2014-01-09 10:27:14 +11:00
Robin Ward 339b5942bb Default should be to poll every 5 mins 2014-01-08 15:05:18 -05:00
Nick Borromeo 0331b1720a Fixing padding for misaligned small logo URL 2014-01-08 09:43:37 -08:00
Sam 60a3641cc5 BUGFIX: rss feed link for topics has been broken ever since we upgraded rails 2014-01-08 17:20:46 +11:00
Sam e8dcd8ab71 BUGFIX: show uncategorized in tracking etc
BUGFIX: allow emptying of lists of watched / tracked
BUGFIX: page scrolls when clicking on [x]
2014-01-08 17:10:16 +11:00
Neil Lalonde e7975f25b8 Remove remaining code for two-column categories page 2014-01-07 18:13:49 -05:00
Robin Ward b268ea8363 Improved Embedded templates slightly. 2014-01-07 15:48:39 -05:00
Neil Lalonde bcfaf522fd Add spinner when authenticating with 3rd party. Also handle when popup window is closed without making a callback. 2014-01-07 12:41:34 -05:00
Benjamin Kampmann 7cbe92d5b6 move alias levels into enums 2014-01-08 03:47:01 +11:00
Régis Hanol e732aa8a86 BUGFIX: we should not store absolute urls for locally uploaded avatar templates
Highly recommended to run: `RAILS_ENV=production bundle exec rake avatars:regenerate` to fix the avatar templates stored in the database.
2014-01-07 17:45:06 +01:00
Benjamin Kampmann c743a985a4 Allow groups to be used as aliases for user mention
when configured by the admin a group can be found through the @mentions
feature in both the compose/reply and the private message user-selectors
and once selected the mention will be replaced by the list of users in
the group
2014-01-08 02:36:24 +11:00
Harry Seo 7713dfb8b0 internationalize Discourse.Formatter.tinyDateYear 2014-01-07 21:32:33 +09:00
Régis Hanol 53006d7778 Ember wants a ListTopController, not a TopController 2014-01-07 01:36:30 +01:00
Sam 164418b3f6 FEATURE: added suppress_uncategorized_badge
site setting to remove the suppression of the uncategorized badge from topic lists
2014-01-07 11:00:01 +11:00
Régis Hanol 871adc0b0f BUGFIX: Top page wasn't display any topics 2014-01-07 00:37:14 +01:00
Régis Hanol ff68666dab remove debugger 2014-01-06 17:13:42 +01:00
Régis Hanol ec10575a9e BUGFIX: pressing '?' will now always open the keyboard shortcut modal 2014-01-06 16:46:32 +01:00
Régis Hanol da6af9024d FEATURE: add go to /top page keyboard shortcut 2014-01-06 16:46:24 +01:00
Neil Lalonde 769fb6a9d3 When signing up with 3rd party verified email, don't allow changing email in the signup form. Add ability to cancel signup form, which clears its state. 2014-01-06 10:33:06 -05:00
Robin Ward 3bba75b052 FIX: Email preview with no date caused a server error 2014-01-06 10:18:37 -05:00
Régis Hanol c18a6827df fix jshint 2014-01-06 15:45:30 +01:00
Régis Hanol 87217d940e Merge pull request #1457 from skisulli/keyboard-shortcuts
Global Gmail style keyboard shortcuts
2014-01-06 06:40:55 -08:00
Régis Hanol 8d73b7f94d BUGFIX: hide sensitive site settings 2014-01-06 13:03:53 +01:00
Régis Hanol 0dc0740408 BUGFIX: clicking on the Logo generates a javascript error 2014-01-06 11:46:19 +01:00
Sam eeb83adf71 BUGFIX: staff can now edit delted posts
fixes #1343

This was way easier than mucking with the UI
2014-01-06 18:12:51 +11:00
Sam 6befdceabf BUGFIX: UserStat spec was over ambitious with its mocking 2014-01-06 16:50:55 +11:00
Sam f91163e146 FEATURE: added UI for tracking categories 2014-01-06 11:57:27 +11:00
christophe dfb9b8fa58 Fix unused parameter 2014-01-04 08:53:27 +01:00
Neil Lalonde 17f23adb78 Add spinners to login and signup forms 2014-01-03 15:20:13 -05:00
Robin Ward 25caec0e62 Change text at the bottom of embedded comments to be (x more replies) 2014-01-03 14:55:37 -05:00
Robin Ward c762e3c4b1 Support for scrolling to another post in the iframe; more complicated than you'd think! 2014-01-03 14:45:59 -05:00
Régis Hanol 35634fcbc5 remove comment glyph in mobile view to keep it consistent with other lists 2014-01-03 19:23:11 +01:00
Régis Hanol 584a9f310b FEATURE: add a message explaining the user why they're being redirected to the top page 2014-01-03 19:20:40 +01:00
Robin Ward 59ea1c3c2c Embedded: Change bottom link to last post, show deleted posts correctly. 2014-01-03 13:08:52 -05:00
Robin Ward 1ffcf39448 Make embedded comments look nicer 2014-01-03 12:52:42 -05:00
Régis Hanol fd36fa1c2f make sure we do not count system user's posts 2014-01-03 17:27:55 +01:00
Régis Hanol 2cecc0b21f make sure we only count regular posts when calculating Top score 2014-01-03 16:56:03 +01:00
Régis Hanol 0b5265de17 BUGFIX: consistent archived style in the Top page mobile template 2014-01-03 16:05:06 +01:00
Régis Hanol c6ed4b2095 FEATURE: mobile template for the Top page 2014-01-03 16:00:29 +01:00
Régis Hanol 28bf78d801 BUGFIX: make sure we only show topics that have a useful score in the Top page 2014-01-03 09:15:10 +01:00
Robin Ward 9f2150faea FIX: Logo needs target=_blank 2014-01-02 16:41:08 -05:00
Régis Hanol edc154251d FEATURE: improve the TOP page scoring formula a bit 2014-01-02 22:38:35 +01:00
Neil Lalonde a897c2b091 Add default_external_links_in_new_tab site setting 2014-01-02 15:27:37 -05:00
Robin Ward ed2e53bb06 FIX: Support feeds with `description` as well as `content` 2014-01-02 14:29:27 -05:00
Robin Ward f145060315 Don't employ the "too many replies" if the user is staff, or if they created the topic.
See: http://meta.discourse.org/t/what-is-the-point-of-limiting-new-users-to-three-replies-per-topic/11696
2014-01-02 12:57:40 -05:00
Robin Ward aefad6ae85 FIX: Broken test 2014-01-02 12:15:48 -05:00
Robin Ward 01be681a95 Link embeded topic to second post. They've already read the first. 2014-01-02 11:59:20 -05:00
Robin Ward 15faa01178 FIX: Missing variable 2014-01-02 11:55:58 -05:00
Régis Hanol 46fe78cf8f BUGFIX: export rake task should include locally stored avatars 2014-01-02 17:47:19 +01:00
Robin Ward 1478f08e4f In development mode, relax restrictions on embedding. 2014-01-02 11:32:50 -05:00
Régis Hanol abf910d210 FEATURE: allow for custom HTML inside the <head> tags 2014-01-02 16:22:04 +01:00
Régis Hanol 02ea23a4ad clean up images max-width mess in the CSS 2014-01-02 12:15:47 +01:00
Jeff Atwood 86b14da69f remove !important override from img here 2014-01-01 23:19:12 -08:00
Sam 2da5d2311b FEATURE: Added UI for adding and removing watched and muted categories 2014-01-02 17:59:08 +11:00
Sam b482b280d6 FEATURE: Basic backend support for muted and watched categories 2014-01-02 12:00:29 +11:00
Sam 126433cf65 Merge pull request #1744 from verg/prevent_delete_uncategorized
Prevent deleting 'uncategorized' category
2014-01-01 16:09:49 -08:00
Sam 2ad190b9f6 FEATURE: allow for additional plugin defined global settings 2014-01-02 10:46:09 +11:00
Robin Ward 5621a64579 Move embed.js to public 2013-12-31 18:01:09 -05:00
Neil Lalonde df220ae973 Get detailed info about new versions from the Discourse Hub. Include version notes from the latest version in notification email. 2013-12-31 15:52:35 -05:00
Robin Ward 4f8aed295a FEATURE: Embeddable Discourse comments, now with simple-rss instead of feedzirra 2013-12-31 15:01:22 -05:00
Robin Ward 62db063e1e Revert "Support for Embeddable Comments via IFRAME" - it depends on Curl
which not every server has. Have to rethink this.

This reverts commit e3e4c62887.
2013-12-31 12:52:31 -05:00
Robin Ward 6c4417e0f0 Use the standard .jshintrc file for JSHint options. 2013-12-31 12:41:40 -05:00
Robin Ward e3e4c62887 Support for Embeddable Comments via IFRAME 2013-12-31 12:26:24 -05:00
verg 8a830fb8e3 Prevent deleting 'uncategorized' category 2013-12-31 11:22:44 -06:00
Régis Hanol 7fd88a52c9 FEATURE: allow plugins to overwrite handlebars templates 2013-12-31 16:43:29 +01:00
Régis Hanol 54686388fb FEATURE: display the Top tab by default for long-time-no-see users 2013-12-30 19:42:45 +01:00
Robin Ward a502266c42 Enable JSHINT's `unused` option. It caught a bunch of suspicious stuff which is fixed in this commit. 2013-12-30 13:30:22 -05:00
Régis Hanol 8685e4079f FEATURE: the top tab is the default for new users 2013-12-30 18:49:16 +01:00
Robin Ward 7e984e369a Upgrade JSHint. Fixes linting issues. 2013-12-30 12:42:05 -05:00
Sam 65014a03ca appease jshint 2013-12-30 19:50:52 +11:00
Sam 8ec887e9cf PERF: speed up breakUp
breakUp function is complicated now, add a capped memoizer to ensure it runs a lot less.
2013-12-30 16:47:25 +11:00
Sam d8c43f7b58 BUGFIX: fix username breakup so it works with IE
FEATURE: breakup username based on name as well
2013-12-30 16:07:35 +11:00
Sam 1915f292ad BUGFIX: invalid referer would cause 500 errors 2013-12-30 14:05:44 +11:00
Sam 9738c4ff48 FEATURE: backport a minimal String#scrub
BUGFIX: invalid byte sequence in email would explode all processing
2013-12-30 14:05:25 +11:00
Sam db1d01d1a2 Discourse as a Mailing List improvements
FEATURE: context is not emailed if we previously emailed you the post
FEATURE: site setting to enable_watch_new_topics , false by default.
  When enables users can elect to watch everything by default
FIX: Custom email subjects (x quoted you in [title], x replied to [title])
  was removed, this broke email grouping. TBD, include info in footer somehow
FIX: topic user specs were messy, reduce side effects
2013-12-30 13:02:12 +11:00
Neil Lalonde 1781b290cb Fix top_topic.rb to be compatible with ruby 1.9 2013-12-27 16:16:25 -05:00
Neil Lalonde eca291c9fc FIX: After closing a topic that's set to auto-close, remove the message that it will auto-close. Server was already doing the right thing. 2013-12-27 15:38:57 -05:00
Neil Lalonde ad375e231a Fix wrapping of validation messages on signup form 2013-12-27 14:36:36 -05:00
Neil Lalonde 90bf3cc3d4 Merge pull request #1760 from dv2/fix_spelling
Correct few spelling in the comments
2013-12-27 11:00:02 -08:00
Régis Hanol b5a59c10d5 let's try another formula for the top tab 2013-12-27 19:12:53 +01:00
Régis Hanol 9c8e50351d first stab at calculating the score of a topic for the top tab 2013-12-27 18:10:35 +01:00
Régis Hanol 90eb6e6b8f FIX: only show edit reason when the user action is an EDIT 2013-12-27 17:17:32 +01:00
Neil Lalonde ab12695d63 Block passwords that are in the top 5000 most common passwords. Site setting block_common_passwords can disable this feature. 2013-12-27 11:00:21 -05:00
Sam cbaa0a3a49 BUG: drafts broken for new topics 2013-12-27 10:35:53 +11:00
Vikhyat Korrapati 511e2373d5 Fix missing pin icon.
pushpin was renamed to thumb-tack in Font Awesome 4.0.
2013-12-27 03:00:11 +05:30
Régis Hanol 91db466196 add footer on Top page 2013-12-24 14:53:20 +01:00
Régis Hanol 567d2bd23c add top page 2013-12-24 00:50:36 +01:00
Robin Ward b90e811825 FIX: We don't need support for `rows` or `cols` in `textarea`. 2013-12-23 18:11:35 -05:00
Robin Ward 4000bcbfea FIX: Only consider image sizes from valid src values. 2013-12-23 18:03:37 -05:00
Régis Hanol 0b13b8d7ea Merge pull request #1737 from chancancode/add_missing_references
Added some missing references
2013-12-23 05:51:04 -08:00
Régis Hanol 30565dcd8f Merge pull request #1745 from ok-harry/master
FIX: Title text should be correctly escaped since we are generating a raw html
2013-12-23 05:48:42 -08:00
Sam efd219f67f fix build? 2013-12-23 17:53:33 +11:00
Sam d4819c3a65 Got rid of crazy user name split
instead decorate with <wbr> to hint on best
spot to split
2013-12-23 11:11:41 +11:00
Sam b67a3a85dd split js with vendor/application
avoid one huge js bundle and instead break it down
to application and vendor (3rd party) our app changes
a lot, vendor changes a lot less
2013-12-23 10:32:07 +11:00
Sam f7827456af move unhashed images into public images directory. asset precompile does not keep around unhashed urls in prd 2013-12-23 10:06:33 +11:00
Ryan Sullivan 5100c2bbd2 Add Global Keyboard Shortcuts
Not all of these have been fully implemented yet.

**Jump To**
* `g` then `h` - Home (Latest)
* `g` then `l` - Latest
* `g` then `n` - New
* `g` then `u` - Unread
* `g` then `f` - Favorited
* `g` then `c` - Categories List

**Navigation**
* `u` - Back to topic list
* `k` / `j` - Newer/Older conversation or post
* `o` or `Enter` - Open selected conversation
* <code>`</code> - Go to next section
* `~` - Go to previous section

**Application**
* `c` - Create a new topic
* `n` - Open notifications menu
* `/` - Search
* `?` - Open keyboard shortcut help

**Actions**
* `f` - Favorite topic
* `s` - Share topic
* `<Shift>` + `s` - Share selected post
* `r` - Reply to topic
* `<Shift>` + `r` - Reply to selected post
* `l` - Like selected post
* `!` - Flag selected post
* `b` - Bookmark selected post
* `e` - Edit selected post
* `d` - Delete selected post
* `m` then `m` - Mark topic as muted
* `m` then `r` - Mark topic as regular
* `m` then `t` - Mark topic as tracking
* `m` then `w` - Mark topic as watching
2013-12-22 12:16:42 -07:00
DV Suresh 24886c300b Correct few spelling in the comments 2013-12-21 01:19:22 -06:00
Neil Lalonde c42e9ea178 Categories page tweaks. Vertical align top the first two columns, padding fixes. 2013-12-20 16:51:39 -05:00
Neil Lalonde f91cb11666 Show why a user can't be deleted on the page instead of as a tooltip 2013-12-20 11:37:01 -05:00
Neil Lalonde 6135d1d214 Add a button to clear filters on site settings page 2013-12-20 11:37:01 -05:00
Sam 2cf2ee9d2d I need to add better testing here 2013-12-20 17:41:12 +11:00
Sam cc9326c29d existence in file always overrides 2013-12-20 17:09:51 +11:00
Sam 61a50f1cf6 allow nuking of vars via env 2013-12-20 17:07:08 +11:00
Sam 13e1016d73 oops forgot to commit this 2013-12-20 16:38:51 +11:00
Sam f5f09933df Merge branch 'master' of github.com:discourse/discourse 2013-12-20 16:17:52 +11:00
Sam 7b8d2547d0 globals now implemented and documented 2013-12-20 16:17:21 +11:00
Sam b312b4d563 clean up config to use global settings 2013-12-20 15:12:23 +11:00
Régis Hanol e6e04ca0e9 FIX: new user username color 2013-12-20 00:58:48 +01:00
Régis Hanol 452232096f smaller images in oneboxes 2013-12-20 00:32:39 +01:00
Neil Lalonde 66616c9574 Categories page is even better on Nexus 7 (and probably iPad mini) 2013-12-19 16:51:18 -05:00
Neil Lalonde 854d9c8fc6 Minimum password length is configurable with the min_password_length site setting. FIX: reset password needs to validate password length. 2013-12-19 16:15:47 -05:00
Neil Lalonde 33c6997ded Move password validation into PasswordValidator 2013-12-19 16:15:47 -05:00
Robin Ward 4f7d440fa4 Remove unused hook. 2013-12-19 14:43:36 -05:00
Robin Ward 1cac9fa257 New users can only post `newuser_max_replies_per_topic` times per topic. 2013-12-19 13:45:55 -05:00
Neil Lalonde 39e711783d FIX: alignment of avatars and category badge on mobile 2013-12-19 11:55:54 -05:00
Robin Ward 40327c25e8 Merge pull request #1747 from alxndr/rss-tweak
tweak RSS elements for W3C compatibility
2013-12-19 08:26:04 -08:00
Neil Lalonde c35af5d755 FIX: When re-opening a topic that auto-closed, make sure it won't auto-close again 2013-12-19 11:25:05 -05:00
Robin Ward 3be026b1da Merge pull request #1748 from alxndr/profile-bio-newlines
respect newlines in About Me on profile page
2013-12-19 08:24:18 -08:00
Régis Hanol 8dad928557 Add setupTopicController event 2013-12-19 17:01:22 +01:00
Alexander 7b2835b73f respect newlines in About Me on profile page 2013-12-19 10:54:37 -05:00
Godfrey Chan e41eecb91b Added some missing references, see https://github.com/rails/rails/issues/12982 2013-12-18 15:06:19 -08:00
Neil Lalonde 1f0a59584b Revert "Re-apply with fixes: Stop using user agent to detect mobile devices. Use a media query and yepnope to load the appropriate css and customizations." 2013-12-18 14:47:22 -05:00
Neil Lalonde 58e5d532c5 Revert "Got rid of buggy yepnope spaghetti, however mobile detection really should be driven from the server." 2013-12-18 14:47:12 -05:00
Neil Lalonde c0e1ef75f6 Don't auto-close a topic too soon in PeriodicalUpdates 2013-12-18 14:09:49 -05:00
Neil Lalonde eeed9abcf0 Style categories page for mobile 2013-12-18 11:50:51 -05:00
Neil Lalonde 8057373584 Category featured users: show most recent posters instead of most frequent posters 2013-12-18 11:10:03 -05:00
Alexander 8294dced6c tweak RSS elements for W3C compatibility
installation needs to have contact_email set in the admin settings in
order for that installation to have truly valid feeds
2013-12-18 11:06:36 -05:00
Harry Seo dfc95d0f6f FIX: Title text should be correctly escaped since we are generating a raw html. 2013-12-18 12:18:59 +09:00
Neil Lalonde 39a360f6e3 Improve tooltip on categories stats. 2013-12-17 17:43:04 -05:00
Neil Lalonde 47c6bb4cf2 Improve how category stats are rendered 2013-12-17 17:43:04 -05:00
Régis Hanol 94fda12795 use a helper instead of a view for custom HTML content 2013-12-17 18:56:59 +01:00
Neil Lalonde 24d81e2364 FIX: deprecation warning in create_account_controller.js. Need to move createAccount into actions. 2013-12-17 12:39:29 -05:00
Neil Lalonde 7fa07f3401 create_account_controller.js passwordRequired needs the same logic as user_authenticator. Make twitter and facebook signup work again. 2013-12-17 12:39:29 -05:00
Régis Hanol 4c6b535cc0 move arbitrary html content out of noscript and into the preloadstore 2013-12-17 18:25:27 +01:00
Régis Hanol 1b6050bdb0 only display inline HTML revision history on mobile 2013-12-17 17:45:04 +01:00
Régis Hanol 76c246664d FIX: ensureMaximumDimensionForImagesInPreview wasn't always working 2013-12-17 17:20:06 +01:00
Régis Hanol 2ef53f89f4 [0] is shorter than [0,1] :) 2013-12-17 16:30:25 +01:00
Sam ea307931a7 fix spec, categories without position are now always at the end of the list 2013-12-17 14:36:07 +11:00
Sam 5bd595c9a6 FEATURE: default_code_lang for syntax highlighting is configurable 2013-12-17 12:08:29 +11:00
Régis Hanol 2ce75a8523 FIX: canonical url should not use the CDN 2013-12-17 00:35:34 +01:00
Neil Lalonde 7fb985a02e Improve spacing of registration form, and add instructions to the password field. 2013-12-16 17:31:21 -05:00
Robin Ward 2326d4ceb7 FIX: text node emitters should always take strings as parameters even if they
return JsonML.
2013-12-16 15:41:46 -05:00
Neil Lalonde 341adc93a4 Allow categories with null position, which means sort them based on activity. Mix absolutely positioned (position is not null) categories with null position categories. 2013-12-16 15:13:57 -05:00
Robin Ward 30d1801703 Merge pull request #1739 from vikhyat/uncategorized-topics
Don't show "uncategorized" in the category dropdown if allow_uncategorized_topics is false.
2013-12-16 10:57:45 -08:00
Robin Ward acf262b631 Support for "no subcategories" 2013-12-16 13:06:35 -05:00
Régis Hanol 206ef3dc08 add discourse_diff tests 2013-12-16 18:11:46 +01:00
Régis Hanol 8fff53775a revision history: no hover state on buttons when disabled 2013-12-16 16:02:25 +01:00
Régis Hanol fd749a9c6e revision history: proper word-wrap in markdown view 2013-12-16 15:57:13 +01:00
Régis Hanol c6fb60e0a0 FIX: S3 upload when using dots in bucket name 2013-12-16 11:44:59 +01:00
Vikhyat Korrapati 03e152ee21 Don't show "uncategorized" if allow_uncategorized_topics is false. 2013-12-15 15:56:06 +05:30
Alexander d93e4fc65d add more info to rss feeds 2013-12-15 01:17:39 -08:00
Neil Lalonde 1145e4bfd9 Fix topics_year, topics_month, topics_week for uncategorized category 2013-12-13 16:17:06 -05:00
Neil Lalonde 49c3482464 Show topic and post counts by day/week/month/year on categories page 2013-12-13 15:37:45 -05:00
Robin Ward a7a7387da1 Automatically convert some quotes to blockquotes 2013-12-13 15:31:25 -05:00
Robin Ward 1bbd1a94bb Cold/Hot classes in Topic Map 2013-12-13 13:43:20 -05:00
Robin Ward 06e9cbc6cb FIX: Look up a url without the query string if it couldn't be found with it. 2013-12-13 12:56:20 -05:00
Robin Ward 26e75c5ceb Double reading speed estimate. People skim. 2013-12-13 12:23:20 -05:00
Sam 05a3c8090f Merge pull request #1658 from salbertson/sa-refactor-users-controller-create
Refactor UsersController#create
2013-12-12 22:16:50 -08:00
Sam 96fdf72d5e rails master compatability 2013-12-13 17:04:45 +11:00
Sam 8ccab6d140 Got rid of buggy yepnope spaghetti, however mobile detection really should be driven from the server. 2013-12-13 15:17:05 +11:00
Régis Hanol 6641230b7f Merge pull request #1733 from voisintotoro/newmaster2
Updated French translation and fixed the fr_FR: to fr:
2013-12-12 15:02:05 -08:00
Neil Lalonde eadf5e9b02 Move columns around on wide categories page 2013-12-12 17:27:25 -05:00
voisintotoro cb7de5d2de Updated French translation and fixed the fr_FR: to fr: 2013-12-12 23:17:43 +01:00
Neil Lalonde 50bd05663c Fix category ordering on categories page. I broke it. 2013-12-12 17:13:35 -05:00
Neil Lalonde ee5637d4ff FIX: font-awesome issue on site settings buttons 2013-12-12 16:09:44 -05:00
Neil Lalonde 9f9852a8dd FIX: broken font-awesome icons on user activity pages 2013-12-12 16:07:34 -05:00
Neil Lalonde 52cf27b0a6 FIX: layout problems on categories page 2013-12-12 15:52:36 -05:00
Neil Lalonde 6fa2e68742 Show more than one topic per category on the wide categories page. Disable support for the 2-column categories page. The category_featured_topics site setting controls how many topics to show. 2013-12-12 15:52:30 -05:00
Sam 50c4e3707b Merge pull request #1731 from chancancode/no_more_scoped_in_rails_4_1
✂️ scoped for Rails 4 compat
2013-12-12 12:38:57 -08:00
Régis Hanol cf44b9e9d9 add image dimensions & size in lightbox 2013-12-12 17:39:20 +01:00
Régis Hanol c7741c9622 FIX: absolute canonical link on topic pages 2013-12-12 17:24:00 +01:00
Régis Hanol dd93407789 FIX: images should also be inlined in the cooked view 2013-12-12 16:57:56 +01:00
Régis Hanol 1457a3792d that fix should have been in the emoji plugin 2013-12-12 16:42:27 +01:00
Régis Hanol be835785f8 FIX: allow new user to post emojis 2013-12-12 15:05:18 +01:00
Godfrey Chan 3c80ee0b8a ✂️ scoped for Rails 4 compat 2013-12-12 00:37:04 -08:00
Régis Hanol 06dd7ffe3c better revision history 2013-12-12 03:41:34 +01:00
Neil Lalonde 5171a23a9c Re-apply with fixes: Stop using user agent to detect mobile devices. Use a media query and yepnope to load the appropriate css and customizations. 2013-12-11 11:19:22 -05:00
Neil Lalonde ed3d3ae1e1 Upgrade font-awesome to version 4 2013-12-11 10:31:09 -05:00
Robin Ward 6853f37bee Show estimated reading time near summarize button. 2013-12-10 13:47:36 -05:00
Neil Lalonde 561961eff6 FIX: can grant titles to regular users. Guardian initializer needs current_user, not the target user. 2013-12-10 12:46:35 -05:00
Robin Ward b0e6475b07 FIX: Staff should be able to see PMs 2013-12-10 11:30:45 -05:00
Neil Lalonde 2596f7dec2 Revert "Stop using user agent to detect mobile devices. Use a media query and yepnope to load the appropriate css and customizations." 2013-12-09 16:28:11 -05:00
Robin Ward ef432902ce Missing percentage. CANADIAN SORRY! 2013-12-09 14:48:32 -05:00
Robin Ward 744add9ece FIX: Post count progress was a little off. Minor fix to hidden posts 2013-12-09 14:28:32 -05:00
Robin Ward 5280e279f7 FIX: Merge conflict; "of" number in progress bar was incorrect. 2013-12-09 13:44:37 -05:00
Neil Lalonde ca5d4d5e54 Stop using user agent to detect mobile devices. Use a media query and yepnope to load the appropriate css and customizations. 2013-12-09 13:28:42 -05:00
Vikhyat Korrapati 621b2b5972 enable_names site setting implementation. 2013-12-08 19:31:25 +05:30
Robin Ward f9243a10cc Don't debouce `afterRender`, debounce the preview refreshing mechanism. 2013-12-06 17:14:18 -05:00
Neil Lalonde 9a24d2651d Allow category to auto-close topics in X hours instead of days. FIX: the system message that says a topic was automatically closed was only counting in days. 2013-12-06 16:39:35 -05:00
Robin Ward 8cc6cd933a Don't allow filtering by user in summary mode and vice versa. It's just confusing. 2013-12-06 13:53:19 -05:00
Robin Ward b646495798 Remove unused translations 2013-12-06 13:16:04 -05:00
Robin Ward 314a0e3fad Some style changes for omitted posts, also mobile style. 2013-12-06 12:51:00 -05:00
Neil Lalonde e3660e59b4 Strip http(s) from SiteSetting.ga_domain_name 2013-12-06 11:46:52 -05:00
Régis Hanol e103176400 FIX: actually show the upload avatar modal when allow_uploaded_avatars is true 2013-12-06 12:13:24 +01:00
Régis Hanol 418856a789 make sure assets always use schemaless absolute uris 2013-12-06 11:16:13 +01:00
Régis Hanol a7eced3a06 Merge pull request #1723 from vikhyat/disable-uploads
Don't show uploading forms if the relevant site settings are disabled
2013-12-06 00:26:50 -08:00
Vikhyat Korrapati 483c9f9826 Don't show the upload avatar modal is allow_uploaded_avatars is false. 2013-12-06 11:31:11 +05:30
Vikhyat Korrapati 2850279c45 Don't show the upload option if max_attachment_size_kb is 0. 2013-12-06 10:29:15 +05:30
Neil Lalonde 082f131b27 Add a site setting for when progress bar should only show post number. Default is 1000. 2013-12-05 17:17:44 -05:00
Robin Ward 79427732b2 Show Gaps in the post stream when filters are active
Conflicts:
	app/assets/javascripts/discourse/templates/topic.js.handlebars
2013-12-05 16:46:59 -05:00
Neil Lalonde 0fe5ecbb24 When there are 2000 or more posts, only show the post number on the progress bar 2013-12-05 15:50:15 -05:00
Scott Albertson 51eff92170 Refactor UsersController#create
* Simplify controller action
* Extract service classes
2013-12-05 10:11:16 -08:00
Régis Hanol 6b618a805a FIX: do not destroy current draft when *NOT* abandoning the current reply 2013-12-05 18:08:33 +01:00
Sam 2db3cfb16b annotate models 2013-12-05 17:40:35 +11:00
Régis Hanol 50bc23c2be Merge pull request #1718 from awesomerobot/master
fixing the user column on the topic-list page
2013-12-04 12:52:05 -08:00
Robin Ward 2a809d7855 Migrate over slackRatio to vendored helper 2013-12-04 13:26:00 -05:00
Robin Ward 3a2ae97668 Vendor the CloakedView stuff 2013-12-04 13:23:20 -05:00
Neil Lalonde 3a6ba907d9 FIX: enter key in login form works again 2013-12-04 11:45:07 -05:00
Robin Ward 0ece195723 Blacklist <center> 2013-12-04 11:43:20 -05:00
Kris Aubuchon 2d928a0537 local merge
Merge remote-tracking branch 'upstream/master'
2013-12-04 10:39:39 -05:00
Kris Aubuchon 15516f34c7 fixing the user column on the topic-list page 2013-12-04 10:38:01 -05:00
Neil Lalonde abed146cc7 FIX: Category description topics shouldn't auto-close 2013-12-04 10:31:25 -05:00
Robin Ward df7b24b14a Merge pull request #1716 from ok-harry/master
set_locale of application_controller.rb must be called earlier
2013-12-04 07:09:14 -08:00
Vikhyat Korrapati 243acb4f05 Auto close topic on form submit rather than button click. 2013-12-04 18:17:28 +05:30
Harry Seo 2d9876a6ac FIX: set_locale filter must be executed before check_xhr filter because check_xhr filter renders html in some cases 2013-12-04 20:49:54 +09:00
Neil Lalonde b622edad7d FIX: edit category modal is too short 2013-12-03 17:24:25 -05:00
Neil Lalonde 3cfd2dd667 FIX: quote text twice overwrites the first quote 2013-12-03 16:39:35 -05:00
Robin Ward cb9fb2acfa FIX: A post via the message bus wasn't updating `highest_post_number` properly. 2013-12-03 16:25:51 -05:00
Neil Lalonde 915861a646 FIX: suspended users still appear suspended after their suspension expires 2013-12-03 15:53:30 -05:00
Robin Ward c4394688de FIX: CSRF token retrieval bug 2013-12-03 15:30:33 -05:00
Robin Ward 50fe117d7c FIX: Load order bug 2013-12-03 15:11:33 -05:00
Robin Ward 274743b877 Refactor: Move initialization code into separate initializers that use the API we
developed for plugins.
2013-12-03 14:22:32 -05:00
Robin Ward de78ee302a - Extract Browser capabilities from Discourse namespace into a Singleton.
- Change Scrolling slack based on Android / Touch / Desktop
2013-12-03 13:03:19 -05:00
Robin Ward 8b4c030c16 Small email fixes 2013-12-03 10:11:04 -05:00
Sam bf2663346a Merge pull request #1712 from awesomerobot/master
making the category dropdown taller
2013-12-02 21:34:54 -08:00
Sam e16621077a semicolon for the greater good 2013-12-03 16:09:57 +11:00
Kris Aubuchon d6ddc70fea making the category dropdown taller 2013-12-02 21:09:16 -05:00
Robin Ward bdac13b636 FIX: If there are no featured topics in a category, don't fail. 2013-12-02 17:44:57 -05:00
Neil Lalonde 7bbb32bac2 Fix javascript_include_tag for browser-update so it includes MD5. Needed to add .js extension for some reason. 2013-12-02 15:57:23 -05:00
Robin Ward 0c259af374 FIX: Don't give weird progress numbers when there are deleted posts. 2013-12-02 15:09:25 -05:00
Robin Ward b37fae50e3 OOPS: Commented out the wrong line 2013-12-02 14:28:01 -05:00
Robin Ward 48bfcfadd9 Upgrade Ember.js, fix swallowing of template errors, report unresolved promises in development mode. 2013-12-02 13:15:58 -05:00
Neil Lalonde 79f1055164 Fix autoclose form in category modal 2013-12-02 11:03:35 -05:00
Régis Hanol 3842097698 add lightbox extra-zoom on click 2013-12-02 11:03:47 +01:00
Régis Hanol bfd2fd8607 update magnific popup to latest (v. 0.9.9) 2013-12-02 10:38:15 +01:00
Sam ea835b78dc Merge pull request #1710 from benjaminbrent/master
Fix email_preview AJAX call to use Discourse.ajax
2013-12-01 23:51:09 -08:00
MK 2d4e62dd64 Fixed broken links in Digest email
Based on @eviltrout's fix from 7a60eacca9.
2013-12-02 01:11:55 -05:00
Sam 7f4697a200 bug: if status changes always attempt to update the feature topics for the category right away 2013-12-02 16:32:24 +11:00
Sam a2d5a7dbd8 auto close is messed up in category edit, remove for now 2013-12-02 16:13:32 +11:00
Sam 8d859a9f68 break cache of fonts 2013-12-02 08:19:34 +11:00
Benjamin Brent 761da7d380 Fix email_preview AJAX call to use Discourse.ajax 2013-12-01 13:30:41 +11:00
Sam f5d905c215 Merge pull request #1707 from chancancode/as_json_fix
The Rails JSON encoder API requires `as_json` to take an optional arg
2013-11-30 03:40:21 -08:00
Godfrey Chan 6bbea9de0b The Rails JSON encoder API requires `as_json` to take an optional arg 2013-11-29 21:43:44 -08:00
Kris Aubuchon a9060fac70 added KBD style back 2013-11-29 22:44:00 -05:00
Robin Ward 7a60eacca9 FIX: Broken unsubscribe link in HTML email 2013-11-29 17:13:16 -05:00
Robin Ward 769223014c FIX: Allow link redirects inside oneboxed posts 2013-11-29 14:29:49 -05:00
Régis Hanol 298b54c0e7 add download link in lightbox 2013-11-29 20:03:39 +01:00
Robin Ward 008151e90d FIX: Too much white space between posts on mobile 2013-11-29 13:06:52 -05:00
Robin Ward 781a8876d3 Show post count in digest emails. Sort by score 2013-11-29 13:00:25 -05:00
Robin Ward 3da2285ef1 FIX: Missing styles in HTML digest emails 2013-11-29 12:21:36 -05:00
Régis Hanol 9b6538832d whitelist google.com/maps iframes 2013-11-29 18:08:53 +01:00
Robin Ward 8c8645f158 FIX: Code and Emoticon formatting in HTML emails. 2013-11-28 17:21:14 -05:00
Neil Lalonde 4ec0543362 FIX: emails with embedded posts should always use absolute URLs 2013-11-28 15:57:21 -05:00
Neil Lalonde a13c7c26f9 Put that autoclose regexp back. Firefox, take it easy. 2013-11-28 14:49:11 -05:00
Robin Ward 5fd87ae45f Merge pull request #1701 from velesin/sitemap_refactoring
refactors site map
2013-11-28 11:21:36 -08:00
Robin Ward f1bce7cc42 Uncomment the loading logic :) 2013-11-28 14:18:32 -05:00
Robin Ward 924a88b5c0 Different Slack ratio on Touch devices, show loading indicator 2013-11-28 14:18:13 -05:00
Robin Ward 488e9ca9dd On mobile, keep topic map collapsed by default. Also, when collapsed don't show as many
data turds.
2013-11-28 11:45:16 -05:00
Neil Lalonde 1cc72d564f Add specs for topic create with auto_close_time. Just ignore auto_close_time from users who are not authorized to use it instead of raising an error. 2013-11-28 11:06:04 -05:00
Sam 79087f4e6f fix exception in logs 2013-11-28 12:39:59 +11:00
Régis Hanol 52160179f8 add a tombstone for extra safety 2013-11-27 22:05:11 +01:00
Wojciech Zawistowski 8eef779d38 refactors site map 2013-11-27 21:58:36 +01:00
Robin Ward 09155a9969 FIX: Upward scrolling jumps 2013-11-27 15:58:13 -05:00
Neil Lalonde 13b31e9833 FIX: broke all the things on Firefox 2013-11-27 14:52:29 -05:00
Neil Lalonde 746e115f99 Fix path of browser-update 2013-11-27 13:56:22 -05:00
Robin Ward 40f86829f7 Post Cloaking:
* We now use a new custom view, {{cloaked-collection}} to display posts in a topic.

* Posts are removed and inserted (cloaked/uncloaked) into the DOM dynamically based on whether they
  are visible in the current browser viewport.

* There's been a lot of refactoring to ensure the relationship between the post views and the topic
  controller is sane.

* Lots of fixes involving jumping to a post, including a new LockOn component to that tries to stay
  focused on an element even if stuff is loading before it in the DOM that would normally push it
  down.
2013-11-27 12:53:32 -05:00
Neil Lalonde 8a9bef944f Fix browser-update.js so it doesn't depend on jQuery 2013-11-27 12:26:27 -05:00
Neil Lalonde 3442d3adb2 Add left margin to ol and ul 2013-11-27 10:55:54 -05:00
Neil Lalonde a9ab98ef9e Auto-close time can be entered in 3 ways, so a topic can close at any time 2013-11-27 09:52:35 -05:00
jjangg96 c2e7e72b74 faq.ko.html.erb Added
Korean translate updated.
2013-11-27 12:21:59 +09:00
Sam d6a14889ac Merge branch 'master' of github.com:discourse/discourse 2013-11-26 10:21:57 +11:00
Sam 3fa48f8d76 Style fix: https://twitter.com/andrzejkrzywda/status/404943844896423937 2013-11-26 10:21:41 +11:00
Régis Hanol b0d132ee2e make sure image urls have a scheme before pulling them in 2013-11-25 19:47:53 +01:00
Robin Ward 549060867d Updated documentation for `inlineRegexp` 2013-11-25 11:35:28 -05:00
Sam 6544f39bcc fix topic counts not updating automatically in various spots (top menu / categories page / drop down) 2013-11-25 17:37:51 +11:00
Sam 92528d7207 message bus update, extract message bus js out into gem 2013-11-25 17:37:01 +11:00
Robin Ward f1a681aa46 Fix: Participant filter was broken. 2013-11-22 17:02:12 -05:00
Wojciech Zawistowski afd198a387 removes unused property from HeaderController 2013-11-22 21:07:03 +01:00
Régis Hanol 82b78ec6ba schemaless avatar urls 2013-11-22 19:18:45 +01:00
Régis Hanol 3cf5a363f7 do not destroy uploads when destroying a user 2013-11-22 18:29:07 +01:00
Neil Lalonde 4e45c5ff3d Fix js for handling click of header buttons. They were adding /# to the url, which broke routing. 2013-11-22 11:50:57 -05:00
Neil Lalonde 35bb4fc17f When flag is from system, don't show a user avatar. Say System: instead 2013-11-22 11:14:09 -05:00
Robin Ward ec5788f80b Merge pull request #1688 from velesin/sitemap_integration_tests
header sitemap integration tests
2013-11-22 08:06:49 -08:00
Régis Hanol f65cde3cda do not bump posts when rebaking 2013-11-22 01:52:26 +01:00
Wojciech Zawistowski 1d3097245c header sitemap integration tests 2013-11-21 20:38:56 +01:00
Wojciech Zawistowski b6de8324be FIX: removes invalid, unpaired closing tag 2013-11-21 17:33:03 +01:00
Robin Ward 50005e2ef9 FIX: Back button wasn't reusing scroll position on category filter 2013-11-21 11:31:10 -05:00
Neil Lalonde 69cc1dd689 FIX: don't suggest a username that's already taken, even if hub finds a match 2013-11-20 14:56:21 -05:00
Neil Lalonde 97cb9e1545 Signup with 3rd party auth can find the matching username from the Discourse Hub 2013-11-20 14:56:21 -05:00
Robin Ward ea8e4bfbcf FIX: Double footer navigation 2013-11-20 14:16:33 -05:00
Robin Ward d09735ff46 Merge pull request #1680 from velesin/user_activity_link_title_fix
FIX: repairs title attr in the link
2013-11-20 09:04:43 -08:00
Neil Lalonde 9de07fd83f Merge pull request #1678 from eriko/patch-3
Load plugin settings.
2013-11-20 07:54:20 -08:00
Régis Hanol 31fd5b85bc FIX markdown hotlinked images were not properly pulled 2013-11-20 13:10:08 +01:00
Robin Ward fa0b5d3b0e FIX: Missing Private message topic map 2013-11-19 18:59:29 -05:00
Sam d16298b1d7 Merge pull request #1679 from velesin/logo_improvement
removes redundant enclosing tag
2013-11-19 14:59:45 -08:00
Sam 325ad46c20 Merge pull request #1681 from germanviscuso/japanese_locales
Provides Japanese locales
2013-11-19 14:58:06 -08:00
Neil Lalonde 1616741836 Say something when no site settings match the filter 2013-11-19 16:46:20 -05:00
German Viscuso 3f049f4853 Provides Japanese locales 2013-11-19 22:20:19 +01:00
Wojciech Zawistowski 3a470939f0 FIX: repairs title attr in the link 2013-11-19 21:32:02 +01:00
Wojciech Zawistowski e7c6abde3e removes redundant enclosing tag 2013-11-19 21:28:05 +01:00
Erik Ordway bf390163aa Load plugin settings.
Along the lines for loading the locale files for a plugin we should also load the settings.yml for a plugin.  Updated version 04f3e09 that moves the loading to a function. I do not understand why it was necessary to define the function physically earlier in the file as I thought ruby did two pass but that may only apply to functions and not stray code in the class.
2013-11-19 11:43:01 -08:00
Neil Lalonde 981d8f6aea Signup form: prefill username if Discourse Hub has a match for the email address. Also, fix some bad specs in username_checker_service_spec that were passing... 2013-11-19 14:15:28 -05:00
Robin Ward 309904ef8f Revert "Merge pull request #1673 from aperrault/patch-04"
This reverts commit c9ea89bdd3, reversing
changes made to 9ed49888fc.
2013-11-19 14:08:45 -05:00
Robin Ward c9ea89bdd3 Merge pull request #1673 from aperrault/patch-04
Fixing neglect to determine whether a user has the permission to create ...
2013-11-19 10:50:38 -08:00
Robin Ward 9ed49888fc FIX: Invalid sub category links in suggested topics 2013-11-19 13:36:11 -05:00
Régis Hanol a7bbc93b9a Merge pull request #1672 from shivpkumar/shiv/add-session-to-after-create-account
Add 'session' to auth hash in OAuth complete method
2013-11-19 10:16:31 -08:00
Shiv Kumar 2f0e20bc11 add session to auth hash in oauth complete method 2013-11-19 09:58:12 -08:00
Robin Ward 58b275665b Oops, missing translation 2013-11-19 12:57:54 -05:00
Robin Ward f5fc0b6b55 Only show external link icons, use the wikipedia-style icon. 2013-11-19 12:42:19 -05:00
Robin Ward b98456a65f Hide some values from the topic map if they're 0 2013-11-19 12:24:41 -05:00
Robin Ward 20e4a2ef80 Renamed components so they don't all have the annoying discourse- prefix 2013-11-19 11:59:50 -05:00
Autumn Perrault d9c026bec5 Fixing neglect to determine whether a user has the permission to create a topic on a category (besides being able to create a post) in ListController, TopicList, and TopicListSerializer causing the "Create Topic" button to appear even if a user cannot actually create a topic in that category but can reply to a topic therein. 2013-11-19 05:09:58 -07:00
Régis Hanol c22f602235 Merge pull request #1669 from GManzato/fix_fr_translation
Update french translation
2013-11-19 00:53:41 -08:00
Gilles Manzato 231fa9c2c0 Update french translation 2013-11-19 01:00:05 +01:00
Sam 3ce6a7be4a defer rendering of the site map
add new and unread links in the site map categories section
2013-11-19 10:41:57 +11:00
Robin Ward 89a96b9e94 FIX: Topic map expansion broken without links. 2013-11-18 17:06:52 -05:00
Robin Ward 9aa2bd068a FIX: Broken links on categories page 2013-11-18 16:59:19 -05:00
Régis Hanol 6e3de67977 fix edit reason when editing a reply 2013-11-18 19:51:30 +01:00
Robin Ward a2466d182f Added Participants, Likes to Topic Map 2013-11-18 13:49:53 -05:00
Robin Ward 2f39a4ac6d Don't shorten links in Topic Map 2013-11-18 13:49:53 -05:00
Neil Lalonde ae58a7db95 Add a warning on dashboard if enforce_global_nicknames is checked, but access key is blank. 2013-11-18 13:45:10 -05:00
Neil Lalonde 281f839e54 Site settings page tweak 2013-11-18 13:45:10 -05:00
Robin Ward 629fe8b426 If the topic can be summarized, expand the topic map by default 2013-11-18 13:43:35 -05:00
Robin Ward 4ce81e1b01 Rename "Best Of" to "Summary" 2013-11-18 12:48:26 -05:00
Robin Ward 34e451ef25 Removed extra comma 2013-11-18 12:16:14 -05:00
Robin Ward f2659a5916 Moved more into components, including summary stuff. 2013-11-18 12:08:21 -05:00
Robin Ward 52048d2d2b Converted Private Message map to a component 2013-11-18 12:08:21 -05:00
Robin Ward 039acd6ead Convert some TopicMap stuff to Ember components 2013-11-18 12:08:21 -05:00
Robin Ward ad3e276b4b Rename TopicSummary -> TopicMap 2013-11-18 12:08:21 -05:00
Régis Hanol dabdcf59c4 allow for arbitrary HTML at the top/bottom of every pages 2013-11-18 17:13:24 +01:00
Robin Ward 639394e38a FIX: Pinned topics within a category weren't working without a refresh 2013-11-18 10:52:01 -05:00
Kris Aubuchon 2e9d0ecac4 adjusting badges a bit 2013-11-17 22:32:58 -05:00
Sam 6e1198334c automatic groups should be bootstrapped 2013-11-18 12:53:14 +11:00
Sam 805feca5f2 message at the bottom for uncategorized was all mangled, fallback to the old way it used to behave 2013-11-18 11:42:40 +11:00
Sam 1b19444b44 URGENT FIX: code would fail in Ruby 1.9.3 exception does not exist 2013-11-18 09:32:02 +11:00
Neil Lalonde 6eb5f1aec2 FIX: site settings page layout at smaller widths 2013-11-16 14:14:49 -05:00
Régis Hanol 482b752046 add edit reason when editing a post 2013-11-15 23:28:49 +01:00
Neil Lalonde b921478cbb Use debounce to make filtering on the All Results tab faster 2013-11-15 16:46:19 -05:00
Neil Lalonde d3c84b60c8 Add an All Results tab when filtering the site settings 2013-11-15 16:43:56 -05:00
Neil Lalonde 97bc187735 Use stacked nav on left to navigate site settings categories 2013-11-15 15:22:42 -05:00
Neil Lalonde dfdc618e9a Use File.join instead of hard-coding slashes 2013-11-15 14:34:03 -05:00
Neil Lalonde fc180ccd71 Site settings: move category into the opts hash so that it's compatibale with existing plugins 2013-11-15 14:32:33 -05:00
Neil Lalonde e01ce546e8 When you click Quote Reply, and then cancel the reply, don't ask if you're sure. 2013-11-15 13:13:58 -05:00
railsaholic 34bba737ff Refactor SessionController#create, reduce complexity.
Don't compromise readablity
2013-11-15 22:09:03 +05:30
Régis Hanol 8a83f1a88f add disk space usage failsafe 2013-11-15 16:48:38 +01:00
Robin Ward e03ae73c5d Merge pull request #1653 from ScotterC/uri-addressable
URI adapter should use Addressable
2013-11-15 07:24:57 -08:00
Régis Hanol 16267e4887 add download_remote_images_to_local site setting 2013-11-15 15:22:18 +01:00
Régis Hanol 6a3000ffef Merge pull request #1655 from awesomerobot/master
embedded response width fix
2013-11-15 00:52:51 -08:00
Kris Aubuchon ad9cb01263 embedded response width fix 2013-11-14 21:44:45 -05:00
Neil Lalonde 726b985ece FIX: a js error when reloading /admin/site_settings/category/:id 2013-11-14 16:50:34 -05:00
Neil Lalonde d9e4eec49f Style the site setting category links. Required and Basic Setup are bigger and all other links are to the right of them. 2013-11-14 16:02:14 -05:00
Neil Lalonde ca0a8a5970 Move save and resetDefault actions to the adminSiteSettingsCategory controller 2013-11-14 16:02:14 -05:00
Neil Lalonde df213d7b23 Filter on site settings across all categories 2013-11-14 16:02:14 -05:00
Neil Lalonde 1e37abc310 Add site setting category support 2013-11-14 16:02:13 -05:00
Neil Lalonde 791f5ac94e Load site settings from config/site_settings.yml 2013-11-14 16:02:13 -05:00
Robin Ward 968c0672ef Enable column sorting main topic list 2013-11-14 15:50:36 -05:00
Robin Ward 67041d1c6d Support for tracking the count of unique participants in a topic 2013-11-14 14:32:41 -05:00
Scott Carleton 32e414690a Handle ugly url targets 2013-11-14 13:14:02 -05:00
Robin Ward 41dfcd2774 FIX: Pagination while sorting on column headers 2013-11-14 12:35:18 -05:00
Régis Hanol 07cbf8f4e3 do not customize the admin section 2013-11-14 16:41:16 +01:00
Sam 23deecfe44 Merge pull request #1651 from awesomerobot/master
New onebox styles, and a few small fixes
2013-11-13 22:49:54 -08:00
Sam e57ddcf276 remove discourse dependency from message bus 2013-11-14 16:37:50 +11:00
Kris Aubuchon 5bf2b40dbc quick fix 2013-11-13 23:19:37 -05:00
Kris Aubuchon 829346468c new onebox style (similar to blockquotes), spacing for auto-close message, making link badge easier to read 2013-11-13 23:10:47 -05:00
Robin Ward d30721f06b Remove "sorting" color 2013-11-13 16:39:49 -05:00
Robin Ward 9cbfd8362d FIX: Warnings in Qunit suite 2013-11-13 14:26:29 -05:00
Robin Ward bda5a72c6a Server side support for custom ordering of topics 2013-11-13 14:17:06 -05:00
Robin Ward 7207cef7aa TopicQuery cleanup in advance of custom sorting:
- Move SQL method constants into a module
- Removed unused count methods
- Moved methods that don't return a TopicList into Topic
- Replaced some confusing method signatures
2013-11-13 12:26:32 -05:00
Robin Ward df568df9dc Controls for sorting topic columns 2013-11-13 11:48:38 -05:00
Régis Hanol 7e7d951152 do not pull hotlinked images when max_image_size_kb == 0 2013-11-13 17:30:48 +01:00
Jeff Atwood c23c8a7e3a we forgot word-wrap: break word on post body 2013-11-13 01:28:36 -08:00
Sam 8339337cd1 strip out docker stuff, put into a plugin 2013-11-13 17:42:31 +11:00
Régis Hanol e9f9d22482 add query parameter to temporarily disable customization 2013-11-12 18:14:22 +01:00
Robin Ward a1a89d01c4 JSHint 2013-11-12 11:25:27 -05:00
Robin Ward 32a3da86da Merge pull request #1640 from salbertson/sa-refactor-users-controller-invites
Refactor UsersController#invited
2013-11-12 08:18:52 -08:00
Robin Ward d9008374aa Merge pull request #1643 from zachwlewis/fix-admin-customize-header
Updated styles on admin customize page.
2013-11-12 08:17:10 -08:00
Robin Ward 2711a9eef0 Merge pull request #1644 from demil/patch-1
Update discourse.js
2013-11-12 08:16:42 -08:00
Régis Hanol aeacfb2acc widened the edit title/category 2013-11-12 14:36:00 +01:00
Sam 932c2675a7 work in progress, admin page for upgrades (provides source lives in git) 2013-11-12 16:42:35 +11:00
demil adcfa4cf9f Update discourse.js
Inserted  if (url.indexOf(u) != -1) return url; in getURL function because of bug in subdirectory install on some urls doubles relative url prefix, for example /forum/forum/latest.json. With this fix it works fine.
2013-11-12 02:36:03 +01:00
Scott Albertson 77b59b54ce Refactor UsersController#invited
* Add test coverage
* Simplify controller action
* Move finder code to Invite class
2013-11-11 13:23:49 -08:00
Zachary Lewis 53f2d4b66c Updated styles on admin customize page. 2013-11-11 15:20:58 -06:00
Robin Ward e5fd2946e0 Some topic list re-organization. 2013-11-11 15:07:08 -05:00
Neil Lalonde 2f8866add5 Change admin display-row css so that multiple lines can fit in the control column. Don't hard-code a height on the rows. 2013-11-11 15:03:17 -05:00
Régis Hanol d65cd0f97e Merge pull request #1637 from railsaholic/refactor_users_upload_avatar_action
Refactor Users#upload_avatar method
2013-11-11 09:59:30 -08:00
railsaholic 58f78e9001 Refactor Users#upload_avatar method
Moved avatar file upload to ```AvatarUploadService``` class and
```AvatarUploadPolicy```

Address review comments + require missing file in spec
2013-11-11 23:21:14 +05:30
Neil Lalonde 1d8a3e6fc8 Add an order for user_stats table in exporter 2013-11-11 10:49:27 -05:00
Robin Ward 428fcb9841 Merge pull request #1638 from velesin/i18n_helper_self_refactoring
refactors context binding from _this to self
2013-11-11 07:36:27 -08:00
Sam 3473734af0 FIX: bust broken password 2013-11-11 22:28:26 +11:00
Sam 817423db84 very bad idea to remove glyphs from privat / deleted and read restricted topics 2013-11-11 17:11:16 +11:00
Sam 0ceeeedf80 correct logic for tracking incoming links 2013-11-11 10:53:01 +11:00
Sam d1d661f6e1 add logic that auto closes any topics that missed the queued job (due to redis flush or whatever) 2013-11-11 10:52:44 +11:00
Wojciech Zawistowski e27f944ed1 refactors context binding from _this to self 2013-11-10 21:33:16 +01:00
sirMackk af67284995 User ctrl refactor - breaks up large methods, moves some logic into model
Includes missing methods from backup for travis to pass

fix missing code, failing specs

keep params handling in the controller.
2013-11-09 18:44:13 +05:30
Wojciech Zawistowski 67a1da7af4 refactors header notifications (renders them via separate controller / template) 2013-11-08 21:06:27 +01:00
Robin Ward 965a0a91a2 FIX: Unloading categories page failed in some circumstances; update to latest Ember. 2013-11-08 14:09:27 -05:00
Régis Hanol be589da5dc Merge pull request #1630 from awesomerobot/master
using max-width on the #main-logo versus setting a static width
2013-11-08 09:44:06 -08:00
Robin Ward 127c3d0e21 FIX: Performance regression on Markdown renderer. 2013-11-08 11:42:26 -05:00
Kris Aubuchon 78f9c83604 using max-width on the #main-logo versus setting a static width 2013-11-08 11:29:39 -05:00
Neil Lalonde 630ef0f322 Should be able to see edits to your own posts 2013-11-08 10:18:41 -05:00
Kris Aubuchon 40aa62f613 adding highlight & fade to linked topic 2013-11-07 23:12:18 -05:00
Robin Ward c753a3c784 We shouldn't be matching on the `created_at` field. Causes tests to randomly fail. 2013-11-07 16:35:40 -05:00
Neil Lalonde dbd2332b74 Public user profile page shows if the user is suspended and why. 2013-11-07 16:34:31 -05:00
Robin Ward ac9a763ab3 FIX: Extra space before tags in blockquotes 2013-11-07 16:06:50 -05:00
Robin Ward 6e43372e7c Merge pull request #1610 from salbertson/sa-refactor-users-update
Move logic for updating a user to a service class
2013-11-07 12:29:19 -08:00
Neil Lalonde 0c6f794eb0 Used the term suspended instead of banned. 2013-11-07 13:53:49 -05:00
Scott Albertson 72bfa4471f Move logic for updating a user into a service class 2013-11-07 08:39:39 -08:00
Robin Ward 01b768392a Remove `default_scope` 2013-11-06 16:56:49 -05:00
Robin Ward 902b6bc79f FIX: Oneboxes were losing formatting in preview after being cached. 2013-11-06 15:58:41 -05:00
Robin Ward 914b723b97 Category dropdown should be in the `position` order 2013-11-06 15:50:47 -05:00
Robin Ward 3dd4741ce4 FIX: Larger click target for topic progress bar 2013-11-06 15:33:17 -05:00
Robin Ward 948a545cb1 Category descriptions should not appear in digests 2013-11-06 15:05:06 -05:00
Robin Ward de30af9302 Support for inviting to a forum from a user's invite page. 2013-11-06 12:56:50 -05:00
Robin Ward 4a7ef8b460 Adjust margins of ul, ol: they were slightly to the left 2013-11-05 17:57:05 -05:00
Robin Ward 25ef66c60b User invites page now has search, displays first `invites_shown` records 2013-11-05 17:53:26 -05:00
Neil Lalonde 8838b555cd The entire notification when there are new topics is clickable 2013-11-05 16:56:32 -05:00
Neil Lalonde 2342da893d Fix [object object] being rendered where it should be an ip address 2013-11-05 15:00:54 -05:00
Neil Lalonde 6597738322 Improve how banned fields are rendered on admin user page 2013-11-05 15:00:54 -05:00
Robin Ward 84b0792db8 Merge pull request #1616 from velesin/remove_notifications_view
removes unused view
2013-11-05 10:38:51 -08:00
Régis Hanol 37fd7ab574 pull hotlinked images 2013-11-05 19:07:29 +01:00
Wojciech Zawistowski 2f2b99f766 removes unused view 2013-11-05 18:10:04 +01:00
Neil Lalonde 8724b2e2b6 Add comments about the IPAddr hack 2013-11-05 11:24:13 -05:00
Sam 15996bc52f even on mobile it can be important 2013-11-05 13:44:18 +11:00
Sam 2c1b58c8cc mini profiler is there for a reason :) 2013-11-05 13:43:50 +11:00
Sam 415d4df648 work around bust encodings passed in to method 2013-11-05 13:40:39 +11:00
Sam 1e21fc8c9a fix regression in Rails 4 2013-11-05 10:32:35 +11:00
Neil Lalonde 9c91ddd854 Should have put order on the screened urls results 2013-11-04 16:31:31 -05:00
Neil Lalonde bd9b85f076 Screened Urls page shows results for each domain instead of each url 2013-11-04 16:24:48 -05:00
Robin Ward 0b79636b99 Typo! 2013-11-04 15:56:03 -05:00
Robin Ward ec7298d548 FIX: Regression on topic list for best of links. 2013-11-04 15:48:51 -05:00
Robin Ward b8e63719f8 FIX: Don't autolink within a markdown link. 2013-11-04 14:24:40 -05:00
Robin Ward cc47ade2ed missing semi colon 2013-11-04 13:59:31 -05:00
Robin Ward 69503345c4 FIX: Some more non-english category errors 2013-11-04 13:43:33 -05:00
Robin Ward ee6b97754a Merge pull request #1611 from awesomerobot/master
Category-dropdown items have consistent widths... other fixes
2013-11-04 10:17:21 -08:00
Robin Ward a13d05660f FIX: Show status icons on user topic pages 2013-11-04 13:13:22 -05:00
Kris Aubuchon 5c3f12f369 merging
Merge remote-tracking branch 'upstream/master'
2013-11-04 12:59:17 -05:00
Neil Lalonde ede59a4386 FIX: issue 1538. After upgrading and before a new version check request has been made, dashboard might still say that an update is available. 2013-11-04 12:51:09 -05:00
Kris Aubuchon 1c2b5015a3 fixing user title line-height, adding @mention style back in, consistent category width/alignment 2013-11-04 12:45:18 -05:00
Robin Ward 7360112759 Merge pull request #1600 from GManzato/user_page_flat
Flatter design on User Page
2013-11-04 07:25:57 -08:00
Robin Ward ae81d78ab9 Merge pull request #1605 from vikhyat/fix-activerecord-associations-collectionproxy-serialization
Fix serialization of ActiveRecord::Associations::CollectionProxy in Rails 4
2013-11-04 07:16:52 -08:00
Régis Hanol b063c4326f Merge pull request #1609 from awesomerobot/master
some general simplification to modal, menus, etc
2013-11-04 06:52:25 -08:00
Kris Aubuchon 70fd4f7f6b merging local with master
Merge remote-tracking branch 'upstream/master'
2013-11-04 09:17:12 -05:00
Kris Aubuchon 4ce711a3b7 some general simplification to modal, menus, etc 2013-11-04 09:16:47 -05:00
Régis Hanol 4f8d0a1a96 revert changes to magnific-popup.scss 2013-11-04 14:44:52 +01:00
Régis Hanol 12ac2f2e99 FIX issues with quote button
Fix the following issues
- Quote button quotes only one word on iOS
- Quote reply popup should not come up when selecting the text in the ‘reply’ button
2013-11-04 12:51:39 +01:00
Régis Hanol 934ede7d91 shorter message for untranslated strings 2013-11-04 11:52:12 +01:00
Vikhyat Korrapati 855ee3b43d Fix ActiveRecord::Associations::CollectionProxy serialization in Rails 4. 2013-11-03 10:41:38 +05:30
Régis Hanol b56b11d96a add qunit to autospec 2013-11-01 23:57:50 +01:00
Robin Ward 7a567d730d Merge pull request #1601 from awesomerobot/master
main logo size consistency fix
2013-11-01 13:32:37 -07:00
Robin Ward 52c3457133 Site setting to support showing real names in posts. Also put back in type to search on site settings 2013-11-01 16:32:12 -04:00
Robin Ward 04aa1690e2 Adjust ul,ol margins 2013-11-01 15:48:28 -04:00
Kris Aubuchon 1f283b5ca9 main logo size consistency fix 2013-11-01 15:45:56 -04:00
Robin Ward bbf0312e72 FIX: Non-Admins couldn't send private messages through the new user expansion 2013-11-01 15:18:26 -04:00
Neil Lalonde 0060050c08 Replace data-dismiss=modal with action close. It's better to use our own ember code instead of relying on bootbox magic. 2013-11-01 12:14:08 -04:00
Neil Lalonde 92a0729937 When banning a user, a reason can be provided. The user will see this reason when trying to log in. Also log bans and unbans in the staff action logs. 2013-11-01 10:47:26 -04:00
Neil Lalonde 52b0c1c45f When logging the deletion of a user, don't store its id in the target_user_id column. It will never match a user record. 2013-11-01 10:47:26 -04:00
Gilles Manzato 3826e67007 Flatter design on User Page
- Cleanup of the design ( remove border-radius ... )
- Fixed some alignment and width in mobile and lower screen size
2013-11-01 15:38:07 +01:00
Robin Ward b93ca1089e List subcategories on categories page 2013-10-31 18:02:24 -04:00
Robin Ward 5a78c1cb34 Changed confusing 'all categories' text 2013-10-31 16:41:13 -04:00
Robin Ward 6ff2abd6aa Move category badge to left of topic name in non-fixed header 2013-10-31 16:31:01 -04:00
Robin Ward 7ef76fd4c3 Change "Create XXX Topic" to "Create Topic" 2013-10-31 16:29:41 -04:00
Robin Ward 744cd93f28 FIX: Non-English category name regression 2013-10-31 16:25:26 -04:00
Neil Lalonde e1d956f5ee Improve styling of staff action logs UI 2013-10-31 12:17:06 -04:00
Neil Lalonde d3c7bbe268 Merge pull request #1597 from awesomerobot/master
topic vertical alignment fixes, admin logs table width fix
2013-10-31 06:58:10 -07:00
Kris Aubuchon 396b626bdc topic vertical alignment fixes, admin logs table width fix 2013-10-31 09:35:49 -04:00
Régis Hanol 727d628a0e Merge pull request #1595 from velesin/logo_component
extracts logo component from header
2013-10-30 14:52:04 -07:00
Sam c97ab672c7 Merge pull request #1593 from awesomerobot/master
Some code cleanup, touch/non-touch gutter, little design/alignment tweaks
2013-10-30 14:45:29 -07:00
Wojciech Zawistowski 489dab333a extracts logo component from header 2013-10-30 21:56:48 +01:00
Neil Lalonde ce5ebc3eb5 On sites with login_required enabled, after signup, don't show the /login page again 2013-10-30 16:37:36 -04:00
Robin Ward 3d6d7c8abe SiteSetting to hide regular names from users 2013-10-30 15:45:34 -04:00
Neil Lalonde c8d5db38d6 Emails to banned users will be sent for notifications of PMs from staff users 2013-10-30 15:31:16 -04:00
Kris Aubuchon d01185215d some reorganization, touch optimization, poster expansion design 2013-10-30 12:40:16 -04:00
Robin Ward 2305cf94ea Don't wait for loading to finish before resetting category 2013-10-30 11:28:51 -04:00
Kris Aubuchon 9f42bde110 fixing topic title line height to accomodate overflow 2013-10-30 09:57:56 -04:00
Régis Hanol 689c4cd947 Merge pull request #1592 from awesomerobot/master
fixing errors in formatting from last commit
2013-10-30 06:33:23 -07:00
Kris Aubuchon 032997ccff fixing errors in formatting from last commit 2013-10-30 09:31:26 -04:00
Régis Hanol 9a2e3245b8 Merge pull request #1591 from awesomerobot/master
fixing pre/sub/sup/code/kbd formatting, post selection buttons
2013-10-30 06:20:59 -07:00
Kris Aubuchon 7900fa0184 fixing pre/sub/sup/code/kbd formatting 2013-10-30 09:11:05 -04:00
Kris Aubuchon ef954f46ba fixing blockquote that I just broke 2013-10-29 22:33:09 -04:00
Kris Aubuchon be27e1dfee fixed compose preview spacing issue on blockquotes/paragraphs - made post selection buttons more prominent 2013-10-29 22:00:18 -04:00
Sam 4fa32c4dc0 Merge pull request #1590 from awesomerobot/master
fixing the category creation/edit modal alignment
2013-10-29 18:40:35 -07:00
Kris Aubuchon 0337c293c1 fixing the category creation/edit modal alignment 2013-10-29 21:01:41 -04:00
Sam 36352e437f Merge pull request #1589 from awesomerobot/master
Some underlying topic title clean-up, fixed private message user list alignment
2013-10-29 17:49:28 -07:00
Kris Aubuchon 60d9b4d808 fixing private message users, post title alignment 2013-10-29 20:47:37 -04:00
Kris Aubuchon 3043efcb0a cleaning up the topic-title alignment a bit 2013-10-29 17:15:56 -04:00
Robin Ward bb135fafb4 Replace slow auto-filter in site settings with a filter button 2013-10-29 17:03:50 -04:00
Robin Ward 6063b52d6a Support for choosing a destination category when splitting topics. 2013-10-29 15:30:06 -04:00
Robin Ward be0d5bd1f0 Let's try the category on the left side of the title 2013-10-29 13:12:12 -04:00
Robin Ward 5689e314c5 Upgrade Ember to 1.1.2 2013-10-29 13:01:57 -04:00
Robin Ward f7d6ab579c Merge pull request #1571 from novemberkilo/master
Refactor User#update_last_seen! and User#update_tracked_topics
2013-10-29 08:28:08 -07:00
Kris Aubuchon 4c8944626a making post-info text brighter, making category nav dropdown text smaller and bold 2013-10-29 00:37:18 -04:00
Kris Aubuchon 0d0a2cb947 category nav style 2013-10-28 17:37:31 -04:00
Kris Aubuchon 5d19e66470 merging with the new category nav feature
Merge remote-tracking branch 'upstream/master'
2013-10-28 17:08:00 -04:00
Neil Lalonde e52f6e0f6d FIX: weird scroll position on visiting a topic page for the first time (chrome OS X, maybe mobile safari too) 2013-10-28 16:17:06 -04:00
Neil Lalonde 8ea1a1069e Use the debounce parameter instead of hard-coding 100 2013-10-28 16:17:06 -04:00
Robin Ward 8c882fd392 Changed breadcrumb dropdowns 2013-10-28 15:34:38 -04:00
Kris Aubuchon c016a081f1 further simplification over all, changes include: flatter button style, styling admin table, topic-list style 2013-10-28 13:46:59 -04:00
Robin Ward 70ce07ae49 Oops JSHint again :(
)
2013-10-28 13:00:34 -04:00
Robin Ward 26a8156f08 Better blockquote button in Markdown editor when non-traditional markdown linebreaks
are enabled.
2013-10-28 12:44:10 -04:00
Kris Aubuchon cafc1a088d catching up with the master
Merge remote-tracking branch 'upstream/master'
2013-10-28 12:26:12 -04:00
Kris Aubuchon 1cb7b29b62 some topic-list simplification 2013-10-28 12:25:52 -04:00
Robin Ward 098673ecc0 Put back the user collapsing 2013-10-28 11:29:23 -04:00
Robin Ward 1775271d46 Reverse positions of buttons on user profile 2013-10-28 11:19:18 -04:00
Manoj 9650dbb97c Refactor topics controller
Refactor: 1) TopicsController to reduce code climate complexity.
2) Topic model, addressed comments

fix typo
2013-10-28 11:42:07 +05:30
Sam 95e936c299 cleanup API for looking up a user by email or username, add specs, fix invalid auto association in open id provider 2013-10-28 16:29:07 +11:00
Sam 88ccd287b4 allow uncategorized category in 2 more spots (hamburger and drop down) 2013-10-28 08:39:55 +11:00
Régis Hanol c77a20eea5 do not deselect text when clicking on the reply button below the post 2013-10-27 19:44:46 +01:00
Neil Lalonde ce2af5c6d1 Show Log In button at the bottom of the page body when login_required and not logged in 2013-10-25 16:08:59 -04:00
Robin Ward f4d9bf9181 Merge pull request #1573 from railsaholic/use_existing_find_by_username_or_email
Utilize already existing method 'find_by_username_or_email'
2013-10-25 12:57:18 -07:00
Robin Ward a3a2c5fa24 FIX: Mobile breadcrumb formatting 2013-10-25 15:44:28 -04:00
Robin Ward e9c4465ec7 FIX: Various bugs with Category breadcrumbs 2013-10-25 15:24:03 -04:00
Neil Lalonde 4e46d91b8d Refactor SpamRulesEnforcer so that each spam rule is in its own class 2013-10-25 13:25:02 -04:00
Neil Lalonde 90938df967 FIX: make it possible to close popup-input-tips on touch devices, and position them a bit better 2013-10-25 11:17:11 -04:00
Sam a65407b2cb implemented UI for filtered down by category view 2013-10-25 14:18:34 +11:00
Sam 572f036e74 filter down the top level navs 2013-10-25 11:15:20 +11:00
Sam 4929c5db71 FIX: when allow_uncategorized_topics was false, PMs can not be created 2013-10-25 09:33:39 +11:00
Neil Lalonde d149066ac6 Show a warning on admin dashboard if running on an older patch level of ruby 2.0 2013-10-24 18:22:47 -04:00
Neil Lalonde 017efdece5 A form to add ip addresses to be blocked or whitelisted 2013-10-24 17:19:10 -04:00
Robin Ward 61468f6f27 Can assign a parent category to a category. 2013-10-24 17:03:28 -04:00
Robin Ward ee2dd9d24c Working drop downs for category changing 2013-10-24 15:19:15 -04:00
Robin Ward 9adcd1579d Renamed `components` to `lib` in the JS project, as Ember has components and they mean something different. 2013-10-24 12:36:46 -04:00
Manoj 96ae3cdacc Utilize already existing method 'find_by_username_or_email'
check presence of email using include, dont use =~
2013-10-24 19:26:06 +05:30
Sam b7d3b52e4f basic implementation of per-category new/latest etc filters 2013-10-24 21:05:06 +11:00
Sam 636976e5d4 fix alignment of n person liked this. 2013-10-24 15:30:41 +11:00
Sam 738a25b732 fix failure in rails 4 mode 2013-10-24 13:40:18 +11:00
Sam 24d732b12a regressions post merge 2013-10-24 12:25:20 +11:00
Sam adeb987c70 oops messed up merge 2013-10-24 12:09:49 +11:00
Sam 666264879c change it so all topics MUST include a category, we store a special uncategorized category to compensate
this cleans up a bunch of internals and removes some settings
2013-10-24 12:08:02 +11:00
Navin Keswani 6ce80fd148 Refactor User#update_last_seen! and User#update_tracked_topics 2013-10-23 23:27:30 +02:00
Neil Lalonde 8aab2253d0 Whitelisted ip addresses will not be flagged as spam by flag_sockpuppets 2013-10-23 17:11:35 -04:00
Robin Ward cc9b11ecc5 Simple category breadcrumb component 2013-10-23 17:00:02 -04:00
Robin Ward 541620c115 Routes and support for sub-categories 2013-10-23 15:22:49 -04:00
Robin Ward 49a11e51df Ember support for parent categories 2013-10-23 15:22:49 -04:00
Robin Ward c814fc16a3 Database structure to support sub categories 2013-10-23 15:22:49 -04:00
Neil Lalonde bf06014a16 Order by creation time by default in screened ip addresses table 2013-10-23 13:01:50 -04:00
Neil Lalonde 237312dbde Styling on screened ip addresses page 2013-10-23 13:01:50 -04:00
Neil Lalonde 3db7529ad4 More icons on screened ip addresses page 2013-10-23 13:01:50 -04:00
Régis Hanol a98d4d9b35 régis' git-fu at his best... 2013-10-23 11:35:27 +02:00
Régis Hanol 3cc08c3b27 fixed JSHINT 2013-10-23 11:27:50 +02:00
Régis Hanol e39242b6ff missed a single quote 2013-10-23 11:25:16 +02:00
Régis Hanol d05547e7f3 fix arrow direction in post incoming links 2013-10-23 11:16:03 +02:00
Régis Hanol a12a1bcc66 bring back attachment icons 2013-10-23 09:52:15 +02:00
Sam 9ae4245955 Merge pull request #1565 from awesomerobot/master
topic page: alignment fixes for replies, minor alignment changes
2013-10-22 23:09:44 -07:00
Kris Aubuchon ca82d07f6d simplfying the header, some more alignment adjustments on the topic page 2013-10-23 00:22:24 -04:00
Neil Lalonde c1008f4359 Fixes for postgresql inet columns in Rails 4. They're backed by an IPAddr class now, which breaks sql parameter marker support, and automatically sets the attribute to nil when trying to assign an invalid ip address. 2013-10-22 19:19:32 -04:00
Kris Aubuchon 0ef064fd93 removed white line in quotes, cleaned up some markup 2013-10-22 18:31:40 -04:00
Robin Ward 6394d924c8 Change migration to prevent down 2013-10-22 17:51:04 -04:00
Robin Ward 348e2e3ef2 Support for per-user API keys 2013-10-22 17:34:39 -04:00
Jeff Atwood 5e2d8dcf37 even out blockquote top/bottom padding 2013-10-22 14:18:41 -07:00
Jeff Atwood d90001e857 even out blockquote paras w/top & bottom margin 2013-10-22 14:17:19 -07:00
Kris Aubuchon 649b3d44a6 topic page: alignment fixes for replies, minor alignment changes 2013-10-22 16:36:32 -04:00
Neil Lalonde 7d582fbee3 Screened ip address can be edited, deleted, and changed to allow or block. 2013-10-22 16:30:46 -04:00
Neil Lalonde b8d586251c Use i18n for the word Cancel in admin/.../user.js.handlebars 2013-10-22 16:30:46 -04:00
Kris Aubuchon c2865e3e2c fixing alignment on replies, buttons - also making topic new gutter link visible on touch 2013-10-22 15:37:44 -04:00
Robin Ward 13fa473c6d Fix JSHINT 2013-10-22 11:33:45 -04:00
Robin Ward e2845f7f16 Restrict SIZE= to numbers 2013-10-22 11:08:13 -04:00
Robin Ward 97ca7a0052 FIX: topic filter menu dissapeared 2013-10-22 10:41:41 -04:00
Régis Hanol 26218ce11f RSS feeds should contain only publicly-available posts 2013-10-22 16:30:25 +02:00
Régis Hanol f96ea42974 fix last activity column in suggested topics 2013-10-22 10:43:00 +02:00
Jeff Atwood d2cc9c39ac don't define bgcolor on in-reply-to 2013-10-22 01:33:51 -07:00
Jeff Atwood 5203ba41eb tighten up spacing on notification control 2013-10-21 23:56:46 -07:00
Jeff Atwood 4693019e90 remove bottom border on posts-wrapper 2013-10-21 23:39:17 -07:00
Jeff Atwood e994ac451b fix quote reply z-order 2013-10-21 23:31:54 -07:00
Régis Hanol 9aca8e14ba fix code highlithing in list 2013-10-21 22:57:06 +02:00
Régis Hanol 6adba747b9 fix images height on IE 2013-10-21 22:56:59 +02:00
Robin Ward 0f5bd08aee Merge pull request #1558 from awesomerobot/master
differentiating visited topics better, fixing extra white space & alignment in header
2013-10-21 13:45:51 -07:00
Kris Aubuchon 2feb82b4b7 differentiating visited topics better, fixing extra white space in the title header (also realigning title header) 2013-10-21 16:23:55 -04:00
Régis Hanol 9b2f821012 Merge pull request #1512 from ScotterC/avatar-from-url
Build out a URI Adapter to allow uploading an avatar via a url
2013-10-21 13:17:37 -07:00
Robin Ward 2308784713 Merge pull request #1543 from railsaholic/small_users_controller_refactoring
refactor UsersController to reduce complexity
2013-10-21 12:21:03 -07:00
Robin Ward 51b2f512a3 Merge pull request #1557 from awesomerobot/master
fixed deleted/mod post highlight, reduced some gutter padding, re-aligne...
2013-10-21 12:19:11 -07:00
Kris Aubuchon ecb6ec0b6d fixed deleted/mod post highlight, reduced some gutter padding, re-aligned some title elements, better spacing around .logo-small 2013-10-21 15:15:32 -04:00
Robin Ward b51fb4d3fb Sync up with markdown-js + our changes 2013-10-21 15:06:58 -04:00