IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2026-08-26 13:17:20 -05:00
Code Issues Packages Projects Releases Wiki Activity
6,438 Commits 1,012 Branches 579 Tags
a929eda8baa393dcd5df220d39fb14042841a319
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robin Ward a929eda8ba NEW: Add user name and title to group posts. 2014-02-12 14:23:10 -05:00
Robin Ward 669247977b FEATURE: Show the posts count on the groups page. It seems a bit odd 
that it uses a new AJAX call, but I wanted to keep the count separate
from the group object itself.
 2014-02-12 14:01:36 -05:00
Robin Ward 11ee4e7328 FIX: Incorrect doc change. Thanks @riking 2014-02-12 12:29:09 -05:00
Robin Ward 318e692290 FIX: If there is an exception when parsing one email, don't stop all 
work, return an error code and continue.
 2014-02-12 12:08:34 -05:00
Robin Ward 62592215f4 FIX: Testing environment did NOT like Discourse.URL 2014-02-12 11:31:11 -05:00
Robin Ward 721472dab4 FIX: Clicking the logo was not scrolling to the top 2014-02-12 11:03:04 -05:00
Robin Ward 2e5413437d Fix the build 2014-02-11 18:01:06 -05:00
Robin Ward ef16c08688 Don't show group title under poster, only show actual title, but link it 
to the group.
 2014-02-11 17:34:44 -05:00
Robin Ward 3d62df51a6 FIX: Broken MDTest + Fix for removing leading spaces in a code block 2014-02-11 17:27:24 -05:00
Robin Ward d98fee5fd4 Merge pull request #1918 from fabricioflores/master 
added translations to spanish
 2014-02-11 15:50:46 -05:00
Robin Ward b035c050d2 Merge pull request #1920 from nickborromeo/list-controller 
Extract queries to keep logic in the Categories Model
 2014-02-11 15:48:20 -05:00
Robin Ward 4dc24c6a77 Merge pull request #1925 from slainer68/cors_config 
Use GlobalSetting to enable CORS at application level
 2014-02-11 15:46:48 -05:00
Robin Ward 1e374e1958 Merge pull request #1926 from awesomerobot/master 
now that wbr tags are inputted, breaking usernames a bit more natually
 2014-02-11 15:43:41 -05:00
Robin Ward 80bdc6e430 Merge pull request #1929 from verg/fix_category_in_drafts 
FIX: restore category when opening draft
 2014-02-11 15:42:48 -05:00
Robin Ward d44d2b3f10 FIX: Was not resuming scroll position on back button 2014-02-11 15:17:36 -05:00
Robin Ward 14f075e812 Missing semicolon; 2014-02-11 14:57:14 -05:00
Robin Ward ca17f8a437 FIX: Wrong text. Thanks @riking 2014-02-10 17:36:13 -05:00
Robin Ward 14449f236a FIX: Back button in chrome on static pages 2014-02-10 17:07:39 -05:00
Robin Ward b61df08d1b FEATURE: Admin selector to choose a primary group for a user, display it 
and apply a CSS class to their posts.
 2014-02-10 17:00:15 -05:00
Robin Ward f1a9e52d7e When creating/editing a category the parent shoudl be none. 2014-02-10 14:08:16 -05:00
Robin Ward 45afed8720 FIX: Chrome has a bug where if you request the same URL with a different 
MIME type, then leave and hit the back button, you'll get the last MIME
type requested instead of HTML. This fixes it.
 2014-02-10 12:43:17 -05:00
Robin Ward b61b33c0fa Add groups list to the poster expansion when you click an avatar while 
in a topic.
 2014-02-10 12:30:36 -05:00
Robin Ward 25070dcde7 FIX: Show the renamed uncategorized name instead of "(no category)" 2014-02-10 11:15:42 -05:00
Robin Ward f4e3ec905c Merge pull request #1923 from rjackson/security-update-for-ember 
Update Ember for CVE-2014-0046.
 2014-02-09 11:25:07 -05:00
Robin Ward 350eb82223 Don't include category definitions on Categories page 2014-02-07 17:01:31 -05:00
Robin Ward 33661b2d56 Update onebox to fix a couple of bugs 2014-02-07 16:32:32 -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
Robin Ward 2490837929 Added some specs for the group controller methods 2014-02-07 11:07:23 -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
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 95585503ac Updated onebox (again) to fix Github link 2014-02-05 14:41:25 -05:00
Robin Ward 1990f7b704 Update Onebox gem 2014-02-05 14:37:03 -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
Robin Ward 8adb08a9ca FIX: Don't allow <button> in posts either. 2014-02-04 16:29:00 -05:00
Robin Ward 659546c4e4 CHANGE: Hide category definition topics unless you are viewing that 
category.
 2014-02-04 15:55:30 -05:00
Robin Ward 13157b9b2e Don't use crappy onebox failback to title 2014-02-04 14:38:11 -05: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
Robin Ward 3bc821aff5 Don't list subcategories when creating a new category. 2014-02-03 16:26:51 -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 b9989dd24b Updates onebox 2014-02-03 12:16:42 -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
Robin Ward 0fca760126 FIX: Jump to bottom was broken by the /last path. 2014-01-31 17:55:40 -05:00
Robin Ward 3deb055110 Update onebox gem 2014-01-31 17:34:15 -05:00
Robin Ward 704f1bf80b Merge pull request #1889 from et/remove-invalid-comment 
Remove invalid comment.
 2014-01-31 14:26:37 -08:00
Robin Ward 45f19dbbf6 Merge pull request #1891 from codedinc/better-pill 
Improve bluepill sample config
 2014-01-31 14:25:57 -08: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 8f1e754bf2 Merge pull request #1883 from velesin/ember_integration_tests_jshint_fix 
Modifies JSHint config to enable new Ember e2e tests syntax
 2014-01-30 10:45:17 -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 e9664d5cfa Merge pull request #1885 from schmatz/master 
Fixed 'devloper' typo in quickstart config file
 2014-01-30 09:27:19 -08: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
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
Robin Ward 9117470f27 REMOVE: discourse_poll has not worked for over a year now. Let's 
remove it.
 2014-01-29 12:00:21 -05:00
Robin Ward 2892153712 REMOVE: Get rid of the hotness control for good. 2014-01-29 11:54:34 -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
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 e4c0fd7636 Merge pull request #1858 from shicholas/patch-1 
Updated with tips for Postgres93.app
 2014-01-27 12:26:41 -08:00
Robin Ward 701cf4a9b8 FIX: Scroll to top on categories view, too. 2014-01-27 15:20:08 -05:00
Robin Ward 1609950781 FIX: Missing module name 2014-01-27 15:11:51 -05:00
Robin Ward 964dddf92d FIX: Hidden icon was missing 2014-01-24 14:29:41 -05:00
Robin Ward 938361322b Merge pull request #1859 from nragaz/mac-os-x-setup 
Update the OS X development documentation
 2014-01-24 07:45:04 -08: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
Robin Ward e3a151d66a FIX: Show category text color in oneboxes 2014-01-23 13:35:29 -05:00
Robin Ward c9cca78ab2 FIX: Show "Begin Discussion" button when there are 0 replies 2014-01-23 12:59:10 -05:00
Robin Ward 6ec1f93c05 Merge pull request #1855 from chrishunt/update-favcount 
Bump favcount.js to v1.5.0
 2014-01-23 09:46:14 -08:00
Robin Ward 03779697e7 FIX: Could navigate back to "Preferences" from "Change Email" 2014-01-23 11:39:02 -05:00
Robin Ward 7b20079d85 FIX: Allow Favcount to be used with CORS. I've submitted this upstream 
too:

https://github.com/chrishunt/favcount/pull/8
 2014-01-23 11:07:10 -05:00
Robin Ward 97dd560d84 Allow CORS on .ico files. Should help with Favcount.js 2014-01-23 10:41:22 -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
Robin Ward 194081ca47 FIX: Hidden posts were not being displayed with the correct messaging. 2014-01-21 17:23:03 -05:00
Robin Ward e2c361f353 FIX: Indented code blocks followed by <blockquote> weren't working. 2014-01-21 16:18:20 -05:00