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

3623 commits

Author SHA1 Message Date
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