Commit Graph

904 Commits

Author SHA1 Message Date
Robin Ward 45cff9c674 Merge pull request #1011 from chrishunt/add-parens
Add missing parentheses to moment()
2013-06-11 09:01:04 -07:00
Chris Hunt d5c7e6b5f4 Add missing parentheses to moment() 2013-06-11 08:46:14 -07:00
Neil Lalonde 5ff7e570ac Add support for enum site settings that render as a dropdown; use a dropdown for default_locale 2013-06-11 11:40:14 -04:00
Sam c27d5dc2bd regression, empty suggested list after posting a topic 2013-06-11 18:10:28 +10:00
Sam c2cfbce9ce automatically updating times for posts on topic
moved moment.js into localization file (we need to localize it)
added helpers for date formatting use, moment().shortDate() moment().longDate() moment().shortDateNoYear()
2013-06-11 17:25:50 +10:00
Sam 6d85dc1724 bring in unread items to "latest" as well as new items. 2013-06-11 15:51:43 +10:00
Sam 4d7a520a8c don't render 0 ... also this file needs some love 2013-06-11 15:27:26 +10:00
Sam 4e01b84695 fix digest 2013-06-11 15:27:26 +10:00
Sam fa8a84f20c removed sugar.js, port functionality to moment and underscore.js
bring in latest ace from local so we don't mess up with https
2013-06-11 15:27:26 +10:00
Sam eed5875505 fix bug with wrapping 2013-06-11 15:27:26 +10:00
Sam a92bb46966 edit date to use formatter, compensate for invalid local time (at least don't blow up) 2013-06-11 15:27:26 +10:00
Robin Ward 850123dce8 FIX: User Pill errors 2013-06-10 18:51:25 -04:00
Neil Lalonde 78000fe870 Fix category delete 2013-06-10 14:20:06 -04:00
Robin Ward 0d83f373b8 Add some logic to jumpTop/jumpBottom when best of is enabled 2013-06-10 13:07:54 -04:00
Robin Ward ad6705cca7 Update Ember to latest master (RC5) 2013-06-10 10:14:42 -04:00
Sam 2d14b54096 Merge pull request #988 from chrishunt/add-dynamic-favicon
Add 'dynamic favicon' setting
2013-06-09 16:13:54 -07:00
Chris Hunt 3bdfdd7c04 Redirect when can_edit === false or undefined 2013-06-07 22:09:51 -07:00
Chris Hunt af1c14939e Add 'dynamic favicon' setting 2013-06-07 17:15:49 -07:00
Robin Ward eab38b5c34 JSHint fix :(
)
2013-06-07 18:08:08 -04:00
Robin Ward b46b533e70 Create the composer view with the defaultContainer. This is in prep for redeploying
on RC5. Ideally we'll change how the composer is instantiated altogether but that will
have to wait for a future release.
2013-06-07 18:04:51 -04:00
Sam a6f67d85eb also should have caught this earlier 2013-06-08 07:47:48 +10:00
Sam 1e725629cd no idea how this was even working 2013-06-08 07:45:45 +10:00
Robin Ward fa4cfa1269 ScreenTrack refactor - removes logic from TopicView didInsertElement 2013-06-07 17:20:10 -04:00
Robin Ward cdc3a57a91 Merge pull request #983 from ZogStriP/fix-combobox-not-working-properly
FIX: combobox were not working properly
2013-06-07 12:08:04 -07:00
Régis Hanol 3f5c12ca1b FIX: combobox were not working properly 2013-06-07 20:45:31 +02:00
Robin Ward 668a4a3042 Move MessageBus subscribing/unsubscribing out of view 2013-06-07 14:28:33 -04:00
Robin Ward 3ae72259a6 Merge pull request #979 from iancmyers/strong-parameters
All parameters for #create in PostsController pass through strong_parameters
2013-06-07 09:17:29 -07:00
Robin Ward 7c715e76e8 Refactor: Light pass of didInsertElement calls of views 2013-06-07 12:13:46 -04:00
Ian Christian Myers b61e10f9ad All parameters for #create in PostsController pass through strong_parameters.
We are now explicitly whitelisting all parameters for Post creation. A nice side-effect is that it cleans up the #create action in PostsController. We can now trust that all parameters entering PostCreator are of a safe scalar type.
2013-06-07 01:29:25 -07:00
Sam d1784f1f87 more moment goodness 2013-06-07 18:27:42 +10:00
Sam 000847b8d2 date helper uses the formatter now 2013-06-07 18:27:42 +10:00
Sam 5fa20ce357 more progress towards full migration to moment.js 2013-06-07 18:27:42 +10:00
Chris Hunt d50a598e62 Notify admin of successful user approval 2013-06-06 18:37:25 -07:00
Sam 7ff42377ac $.browser is gone from jQuery 1.9 ... and this is a check for ie7 and 6 ... don't care 2013-06-07 10:38:39 +10:00
Sam 6ed79e66bc jquery 1.9.1 upgrade ... remove jquery rails 2013-06-07 09:12:46 +10:00
Sam 11afa0c11b work in progress migrate to moment 2013-06-07 08:49:22 +10:00
Robin Ward b758427572 Fix annoying jshint :) 2013-06-06 16:48:15 -04:00
Robin Ward ba5f2d23a1 Fixed ContainerView code to build views correctly 2013-06-06 16:45:25 -04:00
Robin Ward 526f2af69a FIX: Touch events conflicted on mobile safari with `{{action}}`s, preventing admin menu
option from working. Mobile Safari works with click so this seems to fix it.
2013-06-06 13:16:36 -04:00
Robin Ward 06e83c9e6a FIX: Hitting enter while the invite dialog is up should submit the form, not refresh the
entire page :)
2013-06-06 12:06:43 -04:00
Robin Ward a3d62fdf69 Temporarily roll back ember rc5. We identified some things we need to fix. 2013-06-06 01:25:43 -04:00
Robin Ward 7b70330e85 FIX: Javascript errors when navigating to some topics 2013-06-05 20:53:48 -04:00
Sam 2ca734c118 Merge pull request #964 from chrishunt/exclusive-club
Add 'invite only' site setting
2013-06-05 16:38:47 -07:00
Robin Ward 0b97ea6345 Better HTML emails, smarter email digests, new email section in admin with digest preview 2013-06-05 17:47:25 -04:00
Robin Ward eb673c7e5d Merge pull request #963 from chrishunt/chrishunt/refresh-user-list-after-approval
Refresh admin user list after approval
2013-06-05 12:07:49 -07:00
Stephan Kaag 469bf044c3 Remove superfluous } 2013-06-05 21:54:07 +03:00
Chris Hunt 8f14e46964 Hide registration on login modal if 'invite only' 2013-06-05 11:06:54 -07:00
Robin Ward 7d089fdfb5 FIX: Compile templates properly with the latest handlebars 2013-06-05 14:00:02 -04:00
Robin Ward 07cd87f941 FIX: Couldn't navigate to Categories list via link 2013-06-05 12:40:06 -04:00
Robin Ward a0bd51862e Upgrade Ember to RC5. Disabled a deprecation warning that I believe is in error. 2013-06-05 12:07:18 -04:00
Chris Hunt f05c30ab8d Refresh admin user list after approval 2013-06-05 08:57:25 -07:00
Neil Lalonde f0d4a38433 Admin flags UI shows when it's loading and when there are no results 2013-06-05 10:24:50 -04:00
Sam 2509d0f4fa Merge pull request #959 from chrishunt/chrishunt/login-required-fixes
'login required' site setting improvements
2013-06-04 19:09:40 -07:00
Sam 93be638d93 message format is awesome, remove 0 unread and 0 new links. 2013-06-05 12:04:54 +10:00
Chris Hunt 3774808a6e Redirect to '/' if OmniAuth login from '/login' 2013-06-04 18:35:20 -07:00
Sam e52e46a609 fix blank created_at .. date is unbound, we should rename it to unboundDate 2013-06-05 11:32:53 +10:00
Sam 9a57aaaaa9 fix encoding for category excerpt
fix missing secure category topics in categories page
2013-06-05 11:22:47 +10:00
Sam 21b3359ea4 Merge pull request #957 from chrishunt/chrishunt/lock-down-the-base
Add 'login required' site setting
2013-06-04 17:22:08 -07:00
Sam 5f85aaee1d correct message bus regression
implement automatically updating dates in list
2013-06-05 09:32:44 +10:00
Chris Hunt 122f9188c9 Redirect Ember routes to login if login required 2013-06-04 16:10:10 -07:00
Chris Hunt 789289a290 Show login modal on header buttons if required 2013-06-04 16:10:10 -07:00
Neil Lalonde 2465c9c724 Add min_private_message_title_length site setting so private messages can have short titles 2013-06-04 17:59:23 -04:00
Chris Hunt f58dd7a6fb Set properties of AdminApi after ajax response 2013-06-04 11:05:44 -07:00
Robin Ward 11e703f6a0 Merge pull request #953 from chrishunt/chrishunt/fix-featured-topic
Add missing handlebar in featured_topics template
2013-06-04 10:31:44 -07:00
Robin Ward 4392a17b54 Strip out links when displaying a new user's bio 2013-06-04 12:06:25 -04:00
Neil Lalonde 2259e97d42 Add a count of blocked users on the dashboard 2013-06-04 11:53:19 -04:00
Chris Hunt 5ef4bcdecc Add missing handlebar in featured_topics template 2013-06-04 08:33:47 -07:00
Neil Lalonde c4904aacc0 Automatically flag someone as a spammer if their posts get at least X spam flags from N users while their trust level is 'new user'. Staff can clear and set this status from the user record in admin. 2013-06-03 16:37:40 -04:00
Sam 24131bcc0e correct regressions, not loading topics on click 2013-06-03 19:03:57 +10:00
Sam 978bc0ca4e auto refresh suggested list 2013-06-03 14:54:51 +10:00
Sam 3ef16f292d remove dead code
update title properly when count in list changes
remove broken (*) title notification from topic cause its just weird
2013-06-03 10:38:57 +10:00
Robin Ward 1833c124d9 FIX? : Sometimes preloaded data is missing 2013-06-02 14:05:38 -04:00
Robin Ward 545dbfc07e New Feature: Staff can choose to "Take Action" when flagging to immediately reach hiding
thresholds.
2013-05-31 17:39:32 -04:00
Jeff Atwood 476ffcc627 make delete user button a Danger Button 2013-05-31 12:50:11 -07:00
Robin Ward d23ef1d090 FIX: You could update a topic to have a title that's too short if the TextCleaner
removed extra characters. Additionally, updating the title will not return an error
message to the client app if the operation fails (rather than failing silently.)
2013-05-31 15:24:13 -04:00
Robin Ward a4d88fbaa7 New categories weren't getting correct default colors 2013-05-31 13:42:46 -04:00
Robin Ward 0af0a214b2 Refactor: Back all modals by controllers 2013-05-31 12:29:38 -04:00
Sam b35b3da077 allow eviction of computer help for @geek 2013-05-31 15:09:19 +10:00
Chris Hunt afa519b3ae Only pass searchContext type, id in search request 2013-05-30 12:54:34 -07: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
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
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
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
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 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
Robin Ward 55526e24d6 FIX: The `title` attribute was missed when refactoring UserAction streams 2013-05-28 10:20:56 -04: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 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 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
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
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
Robin Ward 3037e9adf6 FIX: Clearing flags wasn't making topics visible again. 2013-05-24 16:03:20 -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
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
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 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
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
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
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
Neil Lalonde 546a2b654a Improve style of security tab of category modal 2013-05-17 16:09:52 -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