Commit Graph

3830 Commits

Author SHA1 Message Date
Sam 5d0cae2dd1 BUGFIX: seen logic was incomplete, you can have user_data and still unseen topic 2014-02-10 15:27:46 +11:00
Nick Borromeo b51bebb200 Extract queries to keep logic in the Categories Model
This creates two methods in the Category model. This moves the model
logic to the model and just calls the Category class methods in
ListController.

This also adds tests for the two methods created in the Category
model. The motivation for this refactor is the code climate score of the
this class and readability of the code.

 Please enter the commit message for your changes. Lines starting
2014-02-08 14:10:48 -08:00
Sam 56e09802fe BUGFIX: Use email sender 2014-02-09 07:29:16 +11:00
Régis Hanol 0a7dc83681 BUFGIX: read more should take you to the first post 2014-02-07 15:07:13 -08:00
Robin Ward 350eb82223 Don't include category definitions on Categories page 2014-02-07 17:01:31 -05:00
Neil Lalonde e0df404d7e Add site setting tos_accept_required. If enabled, users must check a box saying that they've read and accept the terms of service. 2014-02-07 16:04:13 -05:00
Robin Ward d769938660 NEW: Don't show the filter on the homepage. Just show the Forum's name 2014-02-07 16:03:26 -05:00
Robin Ward 9db044d54b FIX: Component was not refreshing all the time 2014-02-07 14:16:34 -05:00
Robin Ward 58247a51e8 Small tweaks to Group page 2014-02-07 13:46:59 -05:00
Neil Lalonde 130f0e19ec FIX: more protection from nil in count_with_subcategories 2014-02-07 11:38:22 -05:00
Robin Ward 3b617b04b0 FEATURE: First stab at groups page with member list 2014-02-07 10:44:51 -05:00
Robin Ward e511e8a80b Link to groups from user profile 2014-02-07 10:44:51 -05:00
Robin Ward 2d47fe4473 Can list group members 2014-02-07 10:44:51 -05:00
Robin Ward 3b1ef6ebc9 Work in progress: Groups Page 2014-02-07 10:44:51 -05:00
Robin Ward 325c2dfaea Rename `load` to `loadUsers` which is what the method was actually
doing.
2014-02-07 10:44:51 -05:00
Robin Ward bd0c2a74fc Return a promise from `Discourse.Group.findAll()` 2014-02-07 10:44:51 -05:00
Robin Ward 003eb06807 Move `Discourse.Group` into public models 2014-02-07 10:44:51 -05:00
Robin Ward de57f29467 More templates for the group page 2014-02-07 10:44:50 -05:00
Robin Ward a873f7a95a Client and Server side routes for a Group 2014-02-07 10:44:50 -05:00
Régis Hanol e47f462f54 Merge pull request #1916 from vikhyat/pm-dominating
Don't notify about dominating private messages
2014-02-07 00:28:27 -08:00
Kris Aubuchon 02e194219f fixing watermark/gutter link interference, and also adding a transition to the topic-progress bar, so smooth! 2014-02-06 23:43:13 -05:00
Sam d9c05fcfc8 SECURITY: dissalow mods from seeing PMs 2014-02-07 14:24:19 +11:00
Sam 93434be16d SECURITY: reduce moderator rights
You can now hide particular categories from certain moderators
2014-02-07 14:11:52 +11:00
Sam e133c82d4b SECURITY: check permissions for mailing list
if you deployed this feature in the last 2 hours upgrade asap.
2014-02-07 14:10:45 +11:00
Vikhyat Korrapati 2f38316bfc Don't notify about dominating private messages. 2014-02-07 05:49:45 +05:30
Sam be560d4eb6 Update annotations 2014-02-07 11:07:52 +11:00
Sam 227873df78 FEATURE: proper mailing list mode
once enable_mailing_list_mode is enabled any user can elect
to get every post via email unless they opt out of category or topic
2014-02-07 11:07:52 +11:00
Neil Lalonde 5b559d9631 Pinned uncategorized topics span the title and category column in topic lists 2014-02-06 14:38:04 -05:00
Neil Lalonde 113057bfa9 Comma needs to die 2014-02-06 11:57:45 -05:00
Régis Hanol 9b3740a7c6 Merge pull request #1909 from codedinc/shortenUrl-fix
Fix shortenUrl helper to not crash when URL doesn't include any "/".
2014-02-06 16:35:11 +01:00
macournoyer 8bf872e92e Fix shortenUrl helper to not crash when URL doesn't include any "/". 2014-02-06 10:12:38 -05:00
Régis Hanol c4cfd5a7fe BUGFIX: unbind the file uploader when closing the composer 2014-02-06 12:54:06 +01:00
Régis Hanol 58202baa62 BUGFIX: show the draft on top page 2014-02-06 11:39:43 +01:00
Régis Hanol a710773bb4 BUGFIX: do not override default browser keyboard shortcuts behavior 2014-02-06 11:07:33 +01:00
Régis Hanol 6d3c3a02cb Merge pull request #1900 from ballistiq/allow_user_activation_on_create
Whitelist :active param so that we can automatically create users that a...
2014-02-06 09:56:00 +01:00
Régis Hanol f2a75aaf26 Merge pull request #1908 from riking/docker-link
Extract version check in dashboard to own template
2014-02-06 09:54:03 +01:00
Jeff Atwood f2c017ac1a Merge pull request #1910 from awesomerobot/master
previous restricted badge fix broke restricted badges in titles, this fixes it
2014-02-05 22:26:59 -08:00
Kris Aubuchon 00e941ff07 previous restricted badge fix broke restricted badges in titles, this fixes it 2014-02-06 00:30:44 -05:00
Sam d132fd0609 add full-name class for styling 2014-02-06 15:53:49 +11:00
riking 7c12aeb848 Extract version check in dashboard to own template 2014-02-05 17:22:10 -08:00
Neil Lalonde 14018ec07c FIX: topic and post counts on /categories page should include sub-categories 2014-02-05 18:39:49 -05:00
Sam e1f293ad66 FEATURE: new scheduler
Removed sidetiq, introduced new scheduler

- add basic UI
- add schedule discover
- add scheduling in initializer
2014-02-06 10:26:16 +11:00
Sam 447816fe39 Merge pull request #1824 from riking/patch-2
Fix group matching SQL query
2014-02-06 08:07:13 +11:00
Sam 7ea2cee3aa Merge pull request #1898 from awesomerobot/master
removing :focus style until I figure out a better fix; also fixing restricted badge alignment
2014-02-06 08:03:34 +11:00
Robin Ward aff16f372b FIX: Show a nicer error when a user tries to access a category they
can't see.
2014-02-05 15:33:52 -05:00
Robin Ward 1dac3cfd64 API endpoint for retrieving the current user 2014-02-05 13:46:24 -05:00
Robin Ward af5254d3b4 FIX: Remove `canvas` tag. 2014-02-05 12:22:36 -05:00
Kris Aubuchon e42374d6f6 aligning content within restricted-badges 2014-02-04 21:52:48 -05:00
Kris Aubuchon 3ae7c14b85 Merge remote-tracking branch 'upstream/master' 2014-02-04 21:49:34 -05:00
Régis Hanol 759c18d9f5 FEATURE: HOME/END should always take you to the correct spot 2014-02-04 23:25:27 +01:00
Robin Ward 8adb08a9ca FIX: Don't allow `<button>` in posts either. 2014-02-04 16:29:00 -05:00
Leonard Teo c13aa8852b Whitelist :active param so that we can automatically create users that are active via API 2014-02-04 15:40:30 -05:00
Régis Hanol 4fb274fb9d BUGFIX: history link doesn't work on deleted posts 2014-02-04 20:05:50 +01:00
Robin Ward 36683ff1e3 FIX: Searching for spaces wouldn't stop spinning 2014-02-04 13:19:36 -05:00
Robin Ward abffcd9f94 FIX: Blacklist `<textarea>` 2014-02-04 12:48:33 -05:00
Robin Ward 359f03ca73 FIX: Topic drafts weren't showing up properly. 2014-02-04 12:11:19 -05:00
Kris Aubuchon 706ed270f6 removing :focus style until I figure out a better fix 2014-02-04 11:50:14 -05:00
Kris Aubuchon 2486050792 fixing :focus style 2014-02-04 11:49:22 -05:00
Neil Lalonde dc77e7e27c You must give a reason for suspending a user 2014-02-04 11:03:35 -05:00
Sam 612001aa74 BUGFIX: deleted categories would mess up watching/tracking prefs 2014-02-04 15:14:31 +11:00
Jeff Atwood 43c698282c Merge pull request #1895 from awesomerobot/master
adding basic :focus style back in
2014-02-03 19:37:14 -08:00
Sam 9bfe0e5a0e BUGFIX: anon had skewed column titles 2014-02-04 13:29:16 +11:00
Kris Aubuchon 3212af4746 adding basic :focus style back in - some tweaks still needed, but this makes tabbing through content functional 2014-02-03 20:58:23 -05:00
Sam 5267e5bea6 BUGFIX: emails sent from "2 replies" as opposed to correct user 2014-02-04 12:56:28 +11:00
Neil Lalonde 06cdb1f070 Remove keyboard shortcuts link from site map menu 2014-02-03 18:08:42 -05:00
Neil Lalonde fa3927d0f6 Add group icon to category badges in composer and edit topic title 2014-02-03 17:57:14 -05:00
Robin Ward 3bc821aff5 Don't list subcategories when creating a new category. 2014-02-03 16:26:51 -05:00
Neil Lalonde 1b66876c08 Show group icon in category badges if the category has restricted access 2014-02-03 15:28:41 -05:00
Robin Ward bf951689e8 FIX: Don't allow moving a category with children underneath another
category (creating grandchildren)
2014-02-03 15:09:35 -05:00
Robin Ward 9606ae5dcb FIX: search context was missing when searching inside a category 2014-02-03 11:38:11 -05:00
Robin Ward ea9ff108c5 Move updating title count to the view, to ensure the topic list is
visible when it happens.
2014-02-03 10:46:19 -05:00
Régis Hanol d2974c2a15 BUGFIX: proper handling of top_menu_items 2014-02-03 16:08:00 +01:00
Sam 458f6424ff Revert "BUGFIX: notifying on new topics when topic list is not visible"
Was causing load more topics not to show up

This reverts commit f7bf4b2dc3.
2014-02-03 19:23:07 +11:00
Sam d0a6dd88df FEATURE: exclude muted categories from the latest and new tabs 2014-02-03 16:05:49 +11:00
Sam f7bf4b2dc3 BUGFIX: notifying on new topics when topic list is not visible 2014-02-03 14:50:51 +11:00
Sam 60c5eb63ce FEATURE: collapse replies to topics
when you get two replies to a topic they are now collapsed as opposed to getting two notificatons.
2014-02-03 13:59:14 +11:00
Régis Hanol 5958e710c0 Merge pull request #1890 from vikhyat/hidden-category-fix
ignore exclude_category from the menu if we are trying to view the category
2014-01-31 20:54:16 -08:00
Robin Ward 0fca760126 FIX: Jump to bottom was broken by the `/last` path. 2014-01-31 17:55:40 -05:00
Vikhyat Korrapati daa14cda40 ignore exclude_category from the menu if we are trying to view the category. 2014-01-31 22:35:19 +05:30
Régis Hanol ae401f0dc7 BUGFIX: JSON requests don't exclude categories from filters 2014-01-31 14:36:00 +01:00
Wojciech Zawistowski 73253ce32e Adds JS integration tests for search 2014-01-31 01:53:08 -05:00
Sam 51c06dea03 BUGFIX: hidden posts not absent from context 2014-01-31 16:37:40 +11:00
Sam b33faa85c0 BUGFIX: raise on fail 2014-01-31 12:23:37 +11:00
Sam 4825bf7e02 REFACTOR: clean up mechanism 2014-01-31 11:40:25 +11:00
Sam 9fc3a335cc BUGFIX: don't leak out a transaction if fails 2014-01-31 11:38:33 +11:00
Robin Ward fc36a87e72 FIX: Invalid ruby code for universal google analytics 2014-01-30 15:45:24 -05:00
Robin Ward f5019be477 Support for a `/last` route to go to the last post in a topic. 2014-01-30 15:24:04 -05:00
Robin Ward 2acb517f44 Revert "Merge pull request #1878 from balinterdi/patch-2"
This reverts commit bfddc5a191, reversing
changes made to 8f1e754bf2.
2014-01-30 14:32:41 -05:00
Robin Ward bfddc5a191 Merge pull request #1878 from balinterdi/patch-2
Simplify usage of unbound i18n helper
2014-01-30 10:46:21 -08:00
Robin Ward b4fef88412 Merge pull request #1884 from velesin/search_controller_refactoring
refactors Discourse.SearchController
2014-01-30 10:44:53 -08:00
Robin Ward 6f23870327 Bulk close operation 2014-01-30 12:44:40 -05:00
Robin Ward 7564d9a20c Server side implementation for bulk editing categories 2014-01-30 11:44:29 -05:00
Robin Ward b315a5c28f Delegate bulk operations to a `TopicsBulkAction` object. 2014-01-30 11:44:29 -05:00
Robin Ward 0c73eb8ce1 Front end code is complete for changing categories of topics in bulk 2014-01-30 11:44:29 -05:00
Robin Ward 6ee266c7ee Modal for performing a bulk operation 2014-01-30 11:44:29 -05:00
Robin Ward 1696cde2ff Toggle button for bulk selection of topics 2014-01-30 11:44:29 -05:00
Sam 43ceaae7ba PERF: optimise featuring of topics and users
Previously this would delete all features and recreate, causing
uneeded network traffic and db pain
2014-01-30 10:32:20 +11:00
Neil Lalonde 29c3767b7f Don't need to show date in smaller font when MMM Y format 2014-01-29 17:10:39 -05:00
Neil Lalonde b5d0031105 Topic list dates formatting changes: use Dec '12 and Jan 21 2014-01-29 15:45:06 -05:00
Wojciech Zawistowski 5b897bc6a4 refactors Discourse.SearchController 2014-01-29 20:53:08 +01:00
Robin Ward 30abc6b291 Appropriate Onebox style 2014-01-29 14:14:07 -05:00
Robin Ward e453bfa073 Work in progress: Swap out onebox code for onebox gem 2014-01-29 14:14:07 -05:00
Jeff Atwood a4e28eadd0 Merge pull request #1882 from awesomerobot/master
making @mention background darker in blockquotes
2014-01-29 10:17:48 -08:00
Neil Lalonde 6ea257d0b1 FIX: use actions in user_stream_view.js 2014-01-29 12:29:05 -05:00
Neil Lalonde c8bc9bd5db Show discourse logo as system user avatar 2014-01-29 12:29:05 -05:00
Robin Ward 2892153712 REMOVE: Get rid of the `hotness` control for good. 2014-01-29 11:54:34 -05:00
Kris Aubuchon a09dc916ee making @mention background darker in blockquotes 2014-01-29 09:43:24 -05:00
Régis Hanol e6b4ba8ad6 BUGFIX: link to attachments when using S3 2014-01-29 12:31:44 +01:00
Régis Hanol d0c55010aa BUGFIX: clicking on links to the same domain was broken 2014-01-29 11:31:36 +01:00
Jeff Atwood ecbcbf0a44 Merge pull request #1880 from awesomerobot/master
fixing some gutter link spacing that was bothering me
2014-01-28 22:23:24 -08:00
Sam 0a0ed44248 BUGFIX: avoid trasactions in test 2014-01-29 17:08:42 +11:00
Sam cce5fb3303 BUGFIXES: improved performance of import an export
we no longer generate the entire dump in memory, instead we generate one table at a time
added some basic progress
2014-01-29 16:49:01 +11:00
Kris Aubuchon 8cc2167b9b fixing some gutter link spacing that was bothering me 2014-01-28 21:39:09 -05:00
Robin Ward 42117c684f Remove `console` from .jshintrc. If we need our app to log, use
`Ember.Logger` instead.
2014-01-28 17:13:34 -05:00
Robin Ward 4626519cdc Use an `itemController` for topic lists. This will make bulk operations
easier.
2014-01-28 15:12:26 -05:00
Robin Ward 52ff68f74f REFACTOR: Change `didInsertElement` to `on('didInsertElement')` 2014-01-28 14:49:08 -05:00
Balint Erdi 8fb5fe75c8 Simplify usage of unbound i18n helper 2014-01-28 19:06:11 +01:00
Neil Lalonde e0188d60c6 Show tooltip on avatar on deleted post 2014-01-27 16:52:22 -05:00
Robin Ward 359a866458 Merge pull request #1865 from vikhyat/less-than-sanitization
Fix sanitization of smileys like <_< and <3.
2014-01-27 12:34:44 -08:00
Robin Ward 88e1fadd0f Merge pull request #1863 from ecuk/analytics
Google Universal Analytics
2014-01-27 12:33:17 -08:00
Robin Ward 701cf4a9b8 FIX: Scroll to top on categories view, too. 2014-01-27 15:20:08 -05:00
Neil Lalonde 578430fc1d Add parent category link to title of topics in a subcategory 2014-01-27 15:12:23 -05:00
Robin Ward 1609950781 FIX: Missing module name 2014-01-27 15:11:51 -05:00
Neil Lalonde 78c7c03d26 Show unread and new counts on sub-categories on /categories page 2014-01-27 14:42:02 -05:00
Régis Hanol 0420df14f3 Merge pull request #1875 from velesin/search_controller_context_binding_fix
Refactors Discourse.SearchController to use var self = this; convention
2014-01-27 11:07:29 -08:00
Neil Lalonde 74f1c553e3 FIX: 1868 Security: Dangerous Send 2014-01-27 13:05:51 -05:00
Régis Hanol 32d79494ad BUGFIX: limit the height of code blocks to 500px 2014-01-27 18:05:33 +01:00
Régis Hanol a83c1a19f1 BUGFIX: make sure author's avatar is 45x45 2014-01-27 17:59:17 +01:00
Wojciech Zawistowski 150dd0d712 Refactors Discourse.SearchController to use var self = this; convention 2014-01-27 17:45:30 +01:00
Neil Lalonde 7cc5da08fe Track how many posts a user reads each day in user_visits 2014-01-27 11:20:19 -05:00
Shiv Kumar 8cf467042e make google search url protocol independent 2014-01-26 15:24:38 -08:00
Shiv Kumar 2b837827ae make search on 404 page secure 2014-01-26 14:48:12 -08:00
Vikhyat Korrapati fad88c6cf3 Fix sanitization of smileys like <_< and <3. 2014-01-26 18:38:47 +05:30
Eric Carlson bc033283c6 Google Universal Analytics 2014-01-25 17:42:25 -07:00
Kris Aubuchon 905a5ab1c4 preventing admin highlight from overlapping when on multiple lines 2014-01-25 14:07:26 -05:00
Neil Lalonde 379db72c90 Don't show category badges on /category/:slug on mobile, unless there are sub-categories 2014-01-24 14:31:30 -05:00
Robin Ward 964dddf92d FIX: Hidden icon was missing 2014-01-24 14:29:41 -05:00
Régis Hanol 618960b43a BUGFIX: category dropdown was off by 1 pixel 2014-01-24 18:30:42 +01:00
Neil Lalonde 90e195b2e7 More work on trust level 3 requirements page 2014-01-24 11:56:46 -05:00
Robin Ward 8493f4ad27 Merge pull request #1860 from ecuk/embed-category
Add site setting for category of topics created by embedding
2014-01-24 07:40:10 -08:00
Régis Hanol 6bf558c297 BUGFIX: taller keyboard shortcuts modal to prevent then scrollbar 2014-01-24 15:17:31 +01:00
Régis Hanol 165541844c BUGFIX: view latest topics should point to /latest and not / 2014-01-24 14:45:51 +01:00
slainer68 748e1e0748 Allow using the API when Login required site setting is on. 2014-01-24 14:02:49 +01:00
Régis Hanol e393e9765f Merge pull request #1856 from velesin/search_controller_tests
Adds unit tests for SearchController
2014-01-24 04:11:10 -08:00
Régis Hanol 245bc19379 BUGFIX: PMs could be created with a category
BUGFIX: hide category column when displaying the list of private messages
2014-01-24 12:57:48 +01:00
Eric Carlson 6766451ab4 Add site setting for category of topics created by embedding 2014-01-23 22:25:48 -07:00
Régis Hanol 01cd63fff7 FEATURE: add a 14 days window to consider topics new 2014-01-24 00:22:04 +01:00
Wojciech Zawistowski e27c007653 Adds unit tests for SearchController 2014-01-23 20:25:37 +01:00
Robin Ward c9cca78ab2 FIX: Show "Begin Discussion" button when there are 0 replies 2014-01-23 12:59:10 -05:00
Robin Ward 03779697e7 FIX: Could navigate back to "Preferences" from "Change Email" 2014-01-23 11:39:02 -05:00
Régis Hanol ae06ea6323 BUGFIX: clicking the logo when the homepage was /categories or /top would fail 2014-01-23 17:08:52 +01:00
Régis Hanol 202d1064ea BUGFIX: do not allow loop over topics list using keyboard shortcuts 2014-01-23 00:39:46 +01:00
Neil Lalonde ae3b53bb76 Add a page in admin to view trust level 3 requirements for a user. Only shows for users who are currently at trust level 2. 2014-01-22 18:17:45 -05:00
Robin Ward 659b95178a FIX: Removed `Rails.logger`. Sigh. 2014-01-22 17:09:57 -05:00
Robin Ward 2d15c82b26 FIX: Digest styling for oneboxes 2014-01-22 15:30:44 -05:00
Robin Ward 39c6e48aa5 FEATURE: Return only the first paragraph of text in HTML digests, unless
there is only one post. In that case return everything. Remove
dependency on 'html_truncator'
2014-01-22 12:37:37 -05:00
Robin Ward 502b4730c8 FIX: Don't show uncategorized badges in digest emails 2014-01-22 11:27:57 -05:00
Robin Ward 745cd0f4e9 FIX: Removes `console.log` 2014-01-22 11:07:19 -05:00
Régis Hanol 7a82b65386 BUGFIX: restore Mousetrap's bindGlobal plugin
cleared deprecated warnings in admin_customize_view
2014-01-22 16:52:09 +01:00
Régis Hanol 9a3c64535b BUGFIX: regular track option was unavailable (props to @riking) 2014-01-22 10:40:45 +01:00
Sam d3723b5ceb BUGFIX: addressees of a pm was in a tiny box 2014-01-22 18:24:29 +11:00
Sam 7e5a17f277 FEATURE: mute/watch/track buttons for private conversations 2014-01-22 17:46:52 +11:00
Robin Ward 194081ca47 FIX: Hidden posts were not being displayed with the correct messaging. 2014-01-21 17:23:03 -05:00
Neil Lalonde da825451d0 Invite link can't be used to log in after you set a password or sign in with 3rd party 2014-01-21 16:56:41 -05:00
Neil Lalonde 1dbc1c56b4 FIX: inviting a user again after the first invite expires will create a new invite 2014-01-21 16:56:40 -05:00
Robin Ward e2c361f353 FIX: Indented code blocks followed by `<blockquote>` weren't working. 2014-01-21 16:18:20 -05:00
Régis Hanol 3618e8b527 FEATURE: CTRL+ENTER and CMD+ENTER shortcut to submit the current message 2014-01-21 19:47:57 +01:00
Régis Hanol 0bb02505b0 BUGFIX: error when find_similar_to has no response 2014-01-21 19:32:37 +01:00
Robin Ward a524194a46 FIX: Bugged up Components vs. Views. My original error was using
`templateName` instead of `layoutName` in an `Em.Component`. This fixes
that and backs out other "fixes"
2014-01-21 13:08:47 -05:00
Neil Lalonde ba74226346 FIX: invited users get clearer messaging when setting a password for the first time 2014-01-21 12:42:26 -05:00
Robin Ward 3c3449aa1b Revert "New API for replacing elements in the final JsonML. Also changes spoiler"
This reverts commit 6b9b2d3d6a.

We have come up with a better solution that does not involve HTML
parsing.
2014-01-21 12:04:58 -05:00
Wojciech Zawistowski e9c0445769 FIX: keyboard navigation in the search box results dropdown 2014-01-21 17:17:40 +01:00
Neil Lalonde 5f46ce7329 Fix cold colours in activity column of topic lists 2014-01-21 11:11:30 -05:00
Robin Ward 564a7e505e FIX: Deprecation warning on bindAttr 2014-01-21 11:06:18 -05:00
Robin Ward 1fe95f044a Merge pull request #1849 from vikhyat/fix-pm-invite
Fix inviting others to private messages.
2014-01-21 07:05:15 -08:00
Régis Hanol 5a3c77abd9 Merge pull request #1847 from nickborromeo/refactor-user-updater
Change user update to use #fetch for defaults
2014-01-21 00:57:46 -08:00
Vikhyat Korrapati 7a45d261a7 Fix inviting others to private messages. 2014-01-21 11:57:05 +05:30
Sam 4bea4cbcaa BUGFIX: add [PM] string to private message emails 2014-01-21 17:24:05 +11:00
Nick Borromeo e8474bd725 Change user update to use #fetch for defaults
This changes the use of the || operator when setting the default of the
user attribute if the key does not exist to #fetch. This will make sure
that if false is passed in as the value it will still fail and use the
default setting.

This also adds constants to define and array and a hash of symbols which
is iterated over to set the users attributes.
2014-01-20 18:07:47 -08:00
Robin Ward 8c32f22ae0 FIX: Adding components to a ContainerView doesn't set the context
properly.
2014-01-20 17:13:36 -05:00
Robin Ward 6b9b2d3d6a New API for replacing elements in the final JsonML. Also changes spoiler
tag handling to be more robust with repsect to HTML content.
2014-01-20 15:15:50 -05:00
Neil Lalonde daa5d023d6 FIX: topics with no replies should show coldness in activity column 2014-01-20 15:06:20 -05:00
Régis Hanol 26b7bf388e BUGFIX: JS error when login_required is enabled 2014-01-20 14:41:11 +01:00
Sam 76a250300a BUGFIX: filter by topic 2014-01-20 17:53:30 +11:00
Sam c7c1c937af STYLE: cleaner targetting in components 2014-01-20 17:25:54 +11:00
Sam 12b72762da BUGFIX: computed.alias (and even property) seems bust in components 2014-01-20 17:22:53 +11:00
Sam b85e5dc191 FEATURE: collapse PM notifications 2014-01-20 16:18:43 +11:00
Sam a7730f4b52 BUGFIX: missing styling 2014-01-20 10:44:13 +11:00
Sam 84ff5b7a81 UI: missing space 2014-01-20 10:32:03 +11:00
Régis Hanol 57eacdaeed BUGFIX: properly escape HTML entities in excerpt (props to @ecuk) 2014-01-19 23:54:52 +01:00
Régis Hanol a24e1f152d BUGFIX: clicking cancel should not reload the page
when assets have changed.
2014-01-19 20:55:46 +01:00
Régis Hanol 5ec22cdd23 BUGFIX: edit category button should only be shown to staff members 2014-01-19 13:55:32 +01:00
Régis Hanol c4cbf934d0 BUGFIX: move mobile templates to discovery 2014-01-19 00:49:45 +01:00
Régis Hanol b49e448556 FEATURE: show pinned topics for TL0 on top/year page
BUGFIX: word-wrap on topic-excerpt
2014-01-18 19:27:26 +01:00
Régis Hanol aca53aa722 BUGFIX: display links to other periods at the bottom of the top/:period page 2014-01-18 19:27:26 +01:00
Régis Hanol 8d2e5041bc BUGFIX: proper handling of /none subcategory 2014-01-18 19:27:25 +01:00
Régis Hanol 7f5ef60d5f BUGFIX: url was overriden when using the back button after visiting a topic 2014-01-18 19:27:25 +01:00
Régis Hanol e31789327e fix the specs 2014-01-18 19:27:25 +01:00
Régis Hanol 129617b415 Lots of bugfixes
BUGFIX: navigation bar should always activate the right tab (even when diging into a top period)
BUGFIX: /top pages titles
BUGFIX: no "edit category" button on /top page after visiting a category
BUGFIX: properly hide category columns when there is no children category (on both filter + top pages)
BUGFIX: promises not caught when scrolling down a topic list to load more of them
BUGFIX: CSS on category dropdowns
Updated `top_menu` i18n with available filters
2014-01-18 19:27:25 +01:00
Robin Ward 4981525047 REFACTOR: Fixes poor class hierarchy for listing topics
- Upgrades Ember to latest
- Fixes a bunch of bugs with page titles and missing "active" states
2014-01-18 19:26:24 +01:00
Régis Hanol 86214989f5 BUGFIX: remote upload dialog was broken 2014-01-18 19:26:24 +01:00
Robin Ward 55397361be Update ember-cloaking to remove dependency on I18n 2014-01-17 16:56:24 -05:00
Robin Ward 3bbe595d10 Merge pull request #1826 from nporteschaikin/patch-1
Delegate :username rather than using a class method.
2014-01-17 13:54:11 -08:00
Robin Ward f47e8e12dd FIX #1831: Dates were unbound on the profile page. 2014-01-17 16:24:45 -05:00
Robin Ward 6131829df0 rename `date` to `unboundDate` because it is unbound. 2014-01-17 15:23:51 -05:00
Robin Ward bc2993b458 FIX: Incorrect comment, thanks @ZogStrIP 2014-01-17 14:05:31 -05:00
Robin Ward f4c57130dc Renames `unboundDate` to `rawDate` because `date` is current unbound. 2014-01-17 13:56:26 -05:00
Neil Lalonde 1806a7d4b3 Trust Level 3: invited users start at default_invitee_trust_level + 1, unless default_invitee_trust_level is 2 or higher 2014-01-17 11:12:00 -05:00
Robin Ward 0c0833d6b9 FIXES #1833, thanks @stefanpenner 2014-01-17 10:44:42 -05:00
Sam a30aaa90d5 BUGFIX: export was broken, not exporting any tables 2014-01-17 12:33:42 +11:00
Neil Lalonde 09ed7fe283 Sanitize your bio after you save it and render it to yourself. 2014-01-16 16:12:34 -05:00
Régis Hanol c1a66b70bb BUGFIX: use previous_visit_at instead of last_seen_at to determine the best period to display in the top summary 2014-01-16 01:36:32 +01:00
Régis Hanol 462c6d81f5 BUGFIX: exclude categories from the top view 2014-01-16 00:49:58 +01:00
Régis Hanol a177732d28 FEATURE: top page should not be infinite. Limite them to 200 topics by default 2014-01-15 22:12:53 +01:00
Régis Hanol 0b2ead2248 rename topics_per_period_in_summary settings to topics_per_period_in_top_summary 2014-01-15 22:12:47 +01:00
Neil Lalonde 2a33a35566 Staff can create uncategorized topics even if allow_uncategorized_topics is false 2014-01-15 15:58:29 -05:00
Régis Hanol ed87a589ca BUGFIX: only show the best period for logged-in users 2014-01-15 21:45:28 +01:00
Neil Lalonde 158306f2f4 Don't show uncategorized in hamburger menu if it's empty, unless you're staff 2014-01-15 15:20:07 -05:00
Neil Lalonde 89908cdb47 Admins don't see uncategorized on /categories if it has no topics and allow_uncategorized_topics is false 2014-01-15 14:11:36 -05:00
Régis Hanol 41a53c3203 FEATURE: overridable template for adding custom buttons on the composer 2014-01-15 17:52:38 +01:00
Neil Lalonde 4f6b208e8d Posts by trust level 3 users do not have nofollow on their external links. 2014-01-15 11:40:51 -05:00
Sam 5a238c62eb BUGFIX: more robust breakUp helper 2014-01-15 17:08:00 +11:00
Sam e5b4f0f51e Merge pull request #1822 from cfstras/breakUp_username_fix
Fix Post-rendering bug
2014-01-14 22:01:09 -08:00
Sam a247389d4e FEATURE: automatically update site to latest version of assets
if a user neglects to move around the site it will prompt to do so 2 hours in
2014-01-15 12:08:35 +11:00
Sam abe814412e Source DB config more cleanly, fixes issues with socket in prd 2014-01-15 12:08:35 +11:00
Sam fd95dbe75a FEATURE: Automatically force a full refresh between pages if assets change 2014-01-15 12:08:35 +11:00
Régis Hanol 9da773af7a BUGFIX: do not pull images we already host locally 2014-01-15 01:14:41 +01:00
Régis Hanol ad8755aa70 BUGFIX: inline spoiler for text, block spoiler for images 2014-01-15 00:53:06 +01:00
Robin Ward c82279b9bd FIX: When embedded, don't show button at the top unless there are more than 10 posts. 2014-01-14 16:06:04 -05:00
Robin Ward 9097368038 FIX: Incorrect string match 2014-01-14 15:38:12 -05:00
Robin Ward 71aed34e64 FIX: Allow click tracking to work with different origins 2014-01-14 15:20:46 -05:00
Robin Ward 4f6283ba56 FIX: Accept HTTPS or HTTP urls on redirect 2014-01-14 15:02:05 -05:00
Régis Hanol 8e5b736caa BUGFIX: could not save user's preferences when categories where watched/tracked/muted 2014-01-14 20:30:35 +01:00
riking 0dd317dd74 Change to case-insensitive matching in group @name matching 2014-01-14 10:32:19 -08:00
Kane York 24e30aff87 Fix group matching SQL query
The check there is intended for the :members_mods_and_admins level, which is not automatically checked for normal users. Instead, the :everyone level is the one used, which would always fulfill the "alias_level in :levels" check.

This changes the :everyone level to :members_mods_and_admins, which was originally intended.
2014-01-14 10:31:36 -08:00
Régis Hanol 92cb52e76e BUGFIX: groups page wasn't working 2014-01-14 19:18:04 +01:00
Neil Lalonde b9bda77abd Page title includes page number for web crawlers 2014-01-14 11:16:10 -05:00
Noah Portes Chaikin 108e7aec9f Delegate :username rather than using a class method.
This is just a little cleaner?
2014-01-14 11:15:35 -05:00
Neil Lalonde 88d9f3a786 Disallow auth callbacks in robots.txt 2014-01-14 10:42:22 -05:00
Régis Hanol 2a89f51d19 BUGFIX: cannot sort topic 2014-01-14 10:30:05 +01:00
Régis Hanol 9ab5b3a123 BUGFIX: properly hide categories/top lists view when loading another tab 2014-01-14 01:47:36 +01:00
Régis Hanol 3a6bffa05d FEATURE: better top pages 2014-01-14 01:09:12 +01:00
Jeff Atwood 069a42cde1 Merge pull request #1825 from awesomerobot/master
fixing the admin icon in the compose window
2014-01-13 16:04:06 -08:00
Kris Aubuchon a31cd4e4c5 fixing the admin icon in the compose window 2014-01-13 19:00:23 -05:00
Robin Ward b617468098 FIX: `currentPath` was not changing when transitioning to the same path.
Added a new hook to allow other kinds of analytics.
2014-01-13 15:30:56 -05:00
Robin Ward 819ac61eb9 Let's put the "5 replies" back at the top of a comments section 2014-01-13 14:15:48 -05:00
Robin Ward bcc7f3aba4 Support embedded link counts via `data-*` attribute 2014-01-13 13:37:55 -05:00
Robin Ward 488319a5d1 FIX: Don't store incoming links on embed 2014-01-13 12:58:53 -05:00
Robin Ward af3edfd5eb FEATURE: Show Reply count on blog index page when embedding 2014-01-13 12:47:41 -05:00
Régis Hanol 0b58266934 Merge pull request #1823 from awesomerobot/master
fixing ol and ul preview/post incongruency
2014-01-13 08:46:42 -08:00
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