Commit Graph

1364 Commits

Author SHA1 Message Date
Chris Hunt afa519b3ae Only pass searchContext type, id in search request 2013-05-30 12:54:34 -07:00
Juan de Dios Herrero 807f763fb0 Merge remote-tracking branch 'upstream/master' 2013-05-30 21:42:26 +02:00
DI2uNk 24e32092e7 Refactored two class methods into scopes (to achieve a better 'rails way')
Also added some tests to the methods
2013-05-30 21:21:31 +02:00
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