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
2651 commits 7 branches 179 tags 87 MiB
Commit graph

1411 commits

Author SHA1 Message Date
Neil Lalonde
b82a5dfd56 Move logic to reject slugs that are just numbers into the slug module 2013-05-30 11:54:02 -04:00
Brian Plexico
0591d5be11 Extract InviteRedeemer from Invite 2013-05-30 11:49:11 -04:00
Neil Lalonde
7d5c313456 Don't allow category slugs that are numbers 2013-05-30 11:09:09 -04:00
Neil Lalonde
5d444be72b Support incomplete topic urls like /t/just-a-slug; fix error when using route /t/:topic_id/:post_number 2013-05-30 10:39:15 -04:00
Sam
3898d90142 fix bugs with sync being wonky 2013-05-30 20:44:53 +10:00
Sam
d20056ad0e correct watcher, live updates for unread 2013-05-30 16:49:58 +10:00
Sam
6ad86aa305 read state is now published 2013-05-30 16:49:58 +10:00
Sam
8874c9ea75 Add message format support that can be used on complex localization strings 
Add message about new and unread topics at the bottom of topics
move localization helper into lib
 2013-05-30 16:49:57 +10:00
Sam
e93b7a3b20 more progress towards live unread and new counts, unread message implemented, still to implement delete messages 2013-05-30 16:49:57 +10:00
Sam
f2da06a78f gmefile lock 2013-05-30 16:49:57 +10:00
Sam
90167e427b highlight logic changed 2013-05-30 16:49:57 +10:00
Sam
73834370a5 work in progress, live unread and new counts 2013-05-30 16:49:57 +10:00
Sam
33683715a9 work in progress live unread / new counts 2013-05-30 16:49:57 +10:00
Sam
33ff87bf44 work in progress, live unread / new counters 2013-05-30 16:49:57 +10:00
Sam
4e2c6f43d1 correct broken pm draft 2013-05-30 08:55:23 +10:00
Erik Ordway
364a59d344 remove hardcoded value and replace with SiteSetting.cas_domainname 2013-05-29 15:47:49 -07:00
Robin Ward
830b93a16b Reduced complexity of admin flags controller, split up into methods, moved reports into model. 2013-05-29 16:49:34 -04:00
nirnanaaa
364113a4d5 removed t and f 's from group model 
removed t and f 's from user model as mentioned in #919

removed t's and f's from category model
 2013-05-29 22:10:43 +02:00
Robin Ward
5ae7707000 Refactor: Convert repeated {{view Discourse.xyz}} to registered view helpers 2013-05-29 15:14:31 -04:00
Robin Ward
57d5355ce8 wat 2013-05-29 15:00:35 -04:00
Robin Ward
4d5c145198 Refactor: Adds Discourse.Utilities.registerViewHelper to register view helpers 2013-05-29 14:32:39 -04:00
Robin Ward
3d0587d8ce Refactor: move category slug helper to Category model 2013-05-29 14:18:02 -04:00
Robin Ward
fe3ac50aae Use {{aceEditor}} helper to display the ace editor 2013-05-29 14:09:21 -04:00
Robin Ward
0601bb6d74 Trivial JS clean up 2013-05-29 14:09:17 -04:00
Neil Lalonde
6abd9ddd2d Add warning on admin dashboard if production env is configured to send email through gmail 2013-05-29 14:00:35 -04:00
Robin Ward
acb2623b4b JSHINT: extra comma 2013-05-29 13:30:03 -04:00
Robin Ward
9717a344c3 Refactor: Less reliance on views for logic for topic list 2013-05-29 13:28:07 -04:00
Robin Ward
4cf1d9c266 Display details about the search context in the placeholder 2013-05-29 12:19:31 -04:00
Neil Lalonde
b1bdebd611 url for uncategorized category topic list is always /category/uncategorized 2013-05-29 12:06:33 -04:00
Robin Ward
f151b30044 Show excerpts on Categories page 2013-05-29 11:46:01 -04:00
Robin Ward
2e26fca36b FIX: Hitting ESC while autocomplete is open shouldn't close the composer. 2013-05-29 11:28:41 -04:00
Robin Ward
5cb1cc6fcb FIX: Categories pill wasn't always being highlighted properly. 2013-05-29 11:02:37 -04:00
Robin Ward
27c1f1044c FIX: Regression, messages were hidden 2013-05-28 21:24:45 -04:00
Robin Ward
92dc59fba9 Properly assign draft keys to Categories List view. 2013-05-28 21:16:24 -04:00
Sam
46389754d6 Merge pull request #892 from eriko/cas_support 
Cas support
 2013-05-28 16:13:29 -07:00
Robin Ward
d75b160385 Enable subscribing to notifications on start, instead of currentUser 
change which was hokey.
 2013-05-28 17:12:37 -04:00
Robin Ward
fc7fefb581 Merge pull request #913 from chrishunt/chrishunt/style-api-button 
Add styling to 'Generate API Key' button
 2013-05-28 13:26:30 -07:00
Robin Ward
c73455bfa2 FIX: Missing () made notifications invisible 2013-05-28 16:17:32 -04:00
Robin Ward
ee319ea7f7 FIX: Issues that didn't show up originally 2013-05-28 15:57:11 -04:00
Neil Lalonde
264dd65410 Fix replying in a topic that is uncategorized after allow_uncategorized_topics is set to false 2013-05-28 15:53:01 -04:00
Robin Ward
560fb15d8a Include pinned topics in category list. 
- removes an (n+1) query for user data
- supports the preload store for the data to avoid a second request
- fix a bug where uncategorizes was reporting (0, 0, 0) for topics by week, month, year
 2013-05-28 15:36:16 -04:00
Chris Hunt
e75f881d58 Add styling to 'Generate API Key' button 2013-05-28 12:10:18 -07:00
Neil Lalonde
dda831fd41 Fix a regression that broke pre-fill of username when sending private message 2013-05-28 14:17:35 -04:00
Robin Ward
320b35bf90 Merge pull request #910 from novemberkilo/master 
WIP - Reduce complexity of Post#raw_links
 2013-05-28 10:07:41 -07:00
Robin Ward
8d47f92c27 Merge pull request #908 from chrishunt/chrishunt/extract-topic-status-update 
Extract topic status update
 2013-05-28 10:00:49 -07:00
Neil Lalonde
f190a96b30 Allow stuff in gutter to be selected 2013-05-28 12:57:33 -04:00
Neil Lalonde
a4b90ac54f Prevent avatars from wrapping on topic list 2013-05-28 12:57:32 -04:00
Chris Hunt
21a54567ff Extract TopicStatusUpdate from Topic 2013-05-28 09:01:04 -07:00
Robin Ward
dd54736d06 Refactor: Removed the last of the references to Discourse.currentUser. 2013-05-28 11:52:31 -04:00
Robin Ward
57f97880e6 Refactor: Instead of getting currentUser from the Discourse namespace, use 
`Discourse.User.current()`
 2013-05-28 11:25:56 -04:00
Erik Ordway
9a409d9440 fix comment and remove url setting as it is not used. 2013-05-28 08:06:18 -07:00
Navin
1d5952a92f Extract analysis type methods to a module and refactor Post#raw_links 2013-05-28 16:41:18 +02:00
Robin Ward
55526e24d6 FIX: The title attribute was missed when refactoring UserAction streams 2013-05-28 10:20:56 -04:00
Chris Hunt
54a798eb12 Add Topic#age_in_days for determining age of topic 2013-05-27 18:02:15 -07:00
Sam
d2f2a8e218 refactoring 2013-05-28 09:13:53 +10:00
Robin Ward
b73bb49076 FIX: More search results was broken. 2013-05-27 17:49:49 -04:00
Régis Hanol
f184090444 FIX: You can't change a subject whilst Flagging 
Meta: [You can't change a subject whilst Flagging](http://meta.discourse.org/t/you-can-t-change-a-subject-whilst-flagging/6887)

This revert a change made by @eviltrout in b794830a25 in the `flag_view.js`.
The `Em.run.schedule('afterRender', function() {...})` is apparently not enough. Had to schedule the event on the next run loop.

Hopefully, the PR emberjs/ember.js#1235 will soon be merged in and we'll have a proper radio button control in Ember.js.
 2013-05-27 22:29:24 +02:00
Robin Ward
62a20f5655 FIX: Couldn't access "Uncategorized" category from category list. 2013-05-27 14:15:52 -04:00
Neil Lalonde
b1ef2ea1e1 Fix TopicPostersSummary when a suggested topic includes a user who has been deleted 2013-05-27 14:12:15 -04:00
Robin Ward
197909246c Weigh staff likes higher when calculating scores. New site setting: staff_like_weight 
can set the factor (default is 3)
 2013-05-27 12:46:08 -04:00
Neil Lalonde
8b0b77c161 Bounce the popup tips again when you click submit button again 2013-05-27 11:51:27 -04:00
Robin Ward
1879176e80 FIX: Invited by link was broken on user activity. 2013-05-27 11:05:41 -04:00
Robin Ward
e1781240a6 Merge branch 'refactoring' of git://github.com/mattvanhorn/discourse 
Conflicts:
	lib/text_sentinel.rb
 2013-05-27 10:42:20 -04:00
Robin Ward
a15910ad1e Merge pull request #899 from chrishunt/chrishunt/extract-topic-posters-summary 
Extract topic posters summary
 2013-05-27 06:30:58 -07:00
Sam
bf16b4f381 Merge pull request #903 from chrishunt/chrishunt/extract-post-move 
Extract post move
 2013-05-26 19:10:50 -07:00
Chris Hunt
6024529f81 Extract PostMover from Topic into its own class 2013-05-26 18:42:04 -07:00
Sam
661ddbb158 introduce strong_parameters 2013-05-27 11:06:09 +10:00
Sam
d84ae80074 Simplify user action make it more idiomatic 2013-05-27 10:22:37 +10:00
Janis Miezitis
f58bcf7fe3 Refactored duplication in user action 2013-05-26 16:07:20 +03:00
Chris Hunt
b8fbac582e Add Topic#url for determining url for a Topic 2013-05-25 17:44:32 -07:00
Chris Hunt
f2b5e20840 Add Topic#max_post_number to find max post number 2013-05-25 17:44:32 -07:00
Chris Hunt
c4cce68613 Add Post#is_first_post? 
We should be able to ask a post if it's the first in a topic
 2013-05-25 17:44:32 -07:00
Robin Ward
74b661317c FIX: User stream was loading the same page over and over once you scrolled past 60 
items.
 2013-05-25 14:08:09 -04:00
Chris Hunt
63c63c2939 Remove unused parameters from posters_summary 2013-05-24 15:33:50 -07:00
Chris Hunt
c1841a6c89 Extract Topic#posters_summary 2013-05-24 15:33:45 -07:00
Neil Lalonde
ada79260b3 Change composer error message when title is too long or too short, and make sure the submit button is 'disabled' when title is too long 2013-05-24 17:10:07 -04:00
Robin Ward
e2774cc2df Merge pull request #896 from xtream/master 
Removed unnecesary method
 2013-05-24 14:09:44 -07:00
Neil Lalonde
d26b87bd3c Add Site Setting allow_uncategorized_topics. Uncheck it to force people to choose a category for all new topics. 2013-05-24 16:56:43 -04:00
Matt Van Horn
e5e904aa4e minor refactorings 2013-05-24 13:36:33 -07:00
Matt Van Horn
d7817cf314 extract TopicNotifier class from topic 2013-05-24 13:36:33 -07:00
Robin Ward
3037e9adf6 FIX: Clearing flags wasn't making topics visible again. 2013-05-24 16:03:20 -04:00
Robin Ward
d1fdc66ca4 FIX: For spam detection, don't count total occurances of links of the same host, but 
post count including that host.
 2013-05-24 15:20:58 -04:00
Robin Ward
bd779834e5 Use search context for filtering search results by current category or user 2013-05-24 14:04:26 -04:00
Neil Lalonde
48d39d2f8c Oops jshint fail again 2013-05-24 12:45:58 -04:00
Neil Lalonde
e600b45155 Composer uses bouncing popup messages beside fields with invalid values when you click the submit button 2013-05-24 12:26:17 -04:00
Robin Ward
962f0dd5f9 Search correctly passes context data to server 2013-05-24 12:21:53 -04:00
Victor Cruz Dueñas
bca006feca removed unnecesary method 2013-05-24 18:03:02 +02:00
Robin Ward
69bb70fbd3 Removed bindings to Discourse.site 2013-05-24 11:56:40 -04:00
Robin Ward
56764f817b Fix JsHint 2013-05-24 11:02:17 -04:00
Robin Ward
1dae46021e Category controller should use the correct category object 2013-05-24 10:57:26 -04:00
Robin Ward
c0c97487d8 Merge pull request #888 from novemberkilo/master 
Refactor to reduce complexity of Post#save_reply_relationships
 2013-05-24 07:04:28 -07:00
Sam
a1520f0dee implement save :) 2013-05-24 21:04:26 +10:00
Sam
a8ae81df4b sorry this is meant to be staff styling :) 2013-05-24 13:32:57 +10:00
Sam
ca2dee52db moved comments to the bottom, they are way less intrusive there 2013-05-24 12:48:32 +10:00
Sam
2cd95bc649 lets try out annotations 2013-05-24 12:35:14 +10:00
Sam
fc3c93d237 almost fixed the regression of not allowing top level filters 2013-05-24 09:54:39 +10:00
Robin Ward
84fd366322 Navigating should set a searchContext (unused right now). 2013-05-23 18:51:40 -04:00
Robin Ward
eb0c102931 Migration logic from SearchView to a controller, where it should be. 2013-05-23 17:42:57 -04:00
Erik Ordway
0bdee973a0 allow disabling of local logins. In the instance where an .edu is using cas they may not want a user to be able to log in once the users credentials have been revoked in the system that feeds the CAS authentication server. This is very optional 2013-05-23 13:44:14 -07:00
Erik Ordway
1575ce7b10 add cas support with a few tests 2013-05-23 13:40:50 -07:00
Navin
9aacde2f2d Refactor Post#save_reply_relationships 2013-05-23 18:09:06 +02:00
Navin
ba4eaa0297 Helper to create reply relationship with post 2013-05-23 18:08:24 +02:00
Navin
d7219a6fbc Helper to add a number to quoted_post_numbers 2013-05-23 18:07:45 +02:00
Neil Lalonde
4492d06a9f Don't send notifications for moderator action posts 2013-05-23 11:42:52 -04:00
Robin Ward
0bd61df34c Merge pull request #884 from mattvanhorn/refactor_topic 
Refactor topic
 2013-05-23 07:26:22 -07:00
Matt Van Horn
c4b5821ef8 Revert annotation and non-English I18n changes 2013-05-23 06:44:47 -07:00
Sam
3dfc034e8d Merge pull request #881 from novemberkilo/master 
Improve flog metric for Post#extract_quoted_post_numbers
 2013-05-23 00:21:27 -07:00
Matt Van Horn
7271b90655 annotate topic model 2013-05-22 22:36:01 -07:00
Matt Van Horn
806255b3c4 refactor Topic validation 
introduce a couple of custom validators
fix minor discrepancies in tests
copy I18n error message keys to default location
clean up validation invocation
move some responsibilities out of validator into class
 2013-05-22 22:31:52 -07:00
Sam
fcc7192fd2 User tracking state implementation progress for live unread / new counts 2013-05-23 15:22:06 +10:00
Robin Ward
7a31630837 Search Refactor: Remove some manual SQL, make search data tables more idomatic Rails/AR 2013-05-22 16:31:13 -04:00
Navin
4754216369 Simplify branching 2013-05-22 21:45:31 +02:00
Navin
ef93512de8 Extract quote parsing into a method 2013-05-22 21:38:45 +02:00
Robin Ward
b9a310f4b1 Search Refactor: Let's use a class to keep track of our state rather 
than passing params everywhere. Also make the private API private.
 2013-05-22 15:22:06 -04:00
Robin Ward
0f296cd42b Refactor + Fix: Wasn't correctly loading activity streams. Code is a lot more Ember-y now. 2013-05-22 12:06:37 -04:00
Matt Van Horn
872995db57 refactor guardian class for clarity & correctness 
introduce NullUser to avoid type-checking
DRY up code
reduce number of multiple returns
remove some redundant/impossible logic branches
add pending test for possible bug
add test & fix for ability to flag archived posts
add #secure_category? method to topic class
Fix bug that prevented flagging of archived topics
Rename NullUser to AnonymousUser
DRY up can_<action>? methods
Fix some ownership logic, and a test, for Guardian
 2013-05-22 01:09:34 -07:00
Sam
96f8d79e83 Merge pull request #876 from chrishunt/chrishunt/observe-changes-for-topic-users 
Trigger UserActionObserver when updating TopicUser
 2013-05-21 23:02:27 -07:00
Sam
c4d8085fc5 remove moderator status posts from best feed 2013-05-22 15:04:53 +10:00
Chris Hunt
d0bc8c95d3 Trigger UserActionObserver when tracking visit 2013-05-21 20:45:03 -07:00
Chris Hunt
685f4960f1 Trigger UserActionObserver when updating TopicUser 2013-05-21 20:43:43 -07:00
Robin Ward
45361934b9 User the BasicUserSerializer for the invited user 2013-05-21 12:03:51 -04:00
Robin Ward
046e6e5d86 Simplified grouping on user views, fixed issue with messages not loading on initial load. Really 
simplified the restricted user route.
 2013-05-21 11:50:01 -04:00
Robin Ward
27828c5ec2 Merge pull request #871 from avdi/refactoring-with-josh-and-avdi 
Various refactorings towards Ruby/Rails idiom from Josh Susser and Avdi Grimm
 2013-05-21 07:18:50 -07:00
Sam
b5eff93a9d update message bus to support per client filtering 
start work on user_tracking_state
fix can_ban? in guardian
expose protected scopes on topic_query we need
move guardian spec to use build as opposed to creating topics / posts / users
start work on user tracking spec
 2013-05-21 16:39:51 +10:00
Jeff Atwood
7e3e6ab78d icon tweak on merge/split 2013-05-20 12:34:15 -07:00
Robin Ward
dee45d8dba Changed elementId to be id 2013-05-20 15:31:05 -04:00
Robin Ward
42248a7164 Removed many unnecessary paths that included content.x when just x would do. 2013-05-20 15:27:58 -04:00
Robin Ward
9544cfd7dc target="controller" is unnecessary. By default it will target the controller. 2013-05-20 14:37:05 -04:00
Robin Ward
a79d53c628 Removed many unnecessary controller. uses in templates. 2013-05-20 13:45:14 -04:00
Robin Ward
c7aebbf4d6 Replace Ember.Text* insertions with helpers. 2013-05-20 12:56:36 -04:00
Robin Ward
1097d51b33 Replaced {{view Discourse.TextField}} with {{textfield}} helper. 2013-05-20 12:47:59 -04:00
Robin Ward
b794830a25 Replaced Em.run.next with the more proper Em.run.schedule('afterRender') 
when we are waiting for rendering to finish.
 2013-05-20 12:20:10 -04:00
Sam
a3dce9afd7 don't error out on not posts if its a json request 2013-05-20 17:32:53 +10:00
Sam
fc57578c85 proper 404 for json request 404 2013-05-20 17:28:32 +10:00
Sam
e91ed83586 the private message stream is different to normal streams, improving the ui a bit and collapsing conversations 2013-05-20 16:44:06 +10:00
Sam
80fb20816c get rid of nonsense 404.html 
correct 404 handling for invalid pages
 2013-05-20 10:29:49 +10:00
Sam
18b00d01d0 Merge pull request #859 from lengarvey/user_refactoring 
Light refactoring of the User model
 2013-05-19 16:41:20 -07:00
Neil Lalonde
5f7f87437c Fix for topic excerpt being from the wrong post 2013-05-18 13:35:21 -04:00
Leonard Garvey
b16705be0d Clean up update_visit_record! 
update_visit_record! appears to add user_visit record if one
doesn't exist and days_visited is simply a counter for the number
of visit records.
 2013-05-18 16:02:06 +10:00
Leonard Garvey
32f4dfd2fb DRY up the user model slightly 
regular? is just the inverse of staff?
 2013-05-18 16:00:35 +10:00
Sam
25105082d5 Merge pull request #850 from bplexico/refactor_post_rb 
Refactored post model to reduce duplication in validator methods
 2013-05-17 15:56:53 -07:00
Neil Lalonde
546a2b654a Improve style of security tab of category modal 2013-05-17 16:09:52 -04:00
Josh Susser and Avdi Grimm
2acc80d192 Various idiomatic User refactorings. 2013-05-17 15:44:35 -04:00
Josh Susser and Avdi Grimm
5659b66729 Refactor select().map() to use pluck. 
Remove a method already provided by ActiveRecord.
 2013-05-17 15:11:37 -04:00
Neil Lalonde
191d454589 Show Inbox before Sent Items 2013-05-17 14:11:33 -04:00
Josh Susser and Avdi Grimm
d30330441a Refactored conditional to an || to be more idiomatic. 2013-05-17 14:06:58 -04:00
Brian Plexico
a86646312b Refactored post model to reduce duplication in validator methods 2013-05-17 12:15:21 -04:00
Neil Lalonde
2265c046ba Some tweaks to category modal 2013-05-17 11:19:58 -04:00
Neil Lalonde
f3282e33a3 Add tabs to category create/edit modal. Categories can have a default auto-close setting that applies to all new topics created in the category. Add rspec-given and write some integration tests. Tests for topic auto-close with category default 2013-05-17 11:05:35 -04:00
Sam
8f46653345 refactor 2013-05-17 09:03:52 +10:00