codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-12-20 20:42:44 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
4444 commits 7 branches 179 tags 87 MiB
Commit graph

1515 commits

Author SHA1 Message Date
Chris Hunt
fb9f1ae3e8 Totally re-write favicon notifier 
- Black on white text
- Larger font
- Works with any size favicon (16, 32, 64)
 2013-08-16 18:37:24 -07:00
Régis Hanol
ea6e73076b change your avatar in a modal 2013-08-17 00:35:29 +02:00
Neil Lalonde
7dd470ccc0 Oops, make highlight in topic list style-able too 2013-08-16 14:24:51 -04:00
Neil Lalonde
b6285b85d2 Add reject option to pending users page 2013-08-16 11:42:43 -04:00
Régis Hanol
865c882a61 larger avatars in embedded posts 2013-08-16 10:14:05 +02:00
Jeff Atwood
946b02533b better copy for password change button 2013-08-15 22:25:26 -07:00
Jeff Atwood
4718929d52 "change" to edit pencil glyph on user pref buttons 2013-08-15 16:11:24 -07:00
Neil Lalonde
2e640baffd Fix a broken avatar when showing who deleted a post 2013-08-15 16:31:13 -04:00
Neil Lalonde
73e4d866d2 Make it possible to customize post highlight colour with css 2013-08-15 16:17:37 -04:00
Neil Lalonde
5a4b939cf7 Fix edit category modal for uncategorized when showing it the second time 2013-08-15 15:18:04 -04:00
Neil Lalonde
293361dcd3 Screened URLs list in admin 2013-08-15 10:52:26 -04:00
Neil Lalonde
9170166e93 Finish renaming blocked emails to screen emails 2013-08-14 16:45:30 -04:00
Neil Lalonde
86647f0a54 Add ScreenedUrl. Rename BlockedEmail to ScreenedEmail. 2013-08-14 16:08:23 -04:00
Neil Lalonde
bc0d4f1bfc Add a confirm modal to Delete All Posts button 2013-08-14 11:48:18 -04:00
Neil Lalonde
506dd748da Add warning sign icons to all the delete user buttons 2013-08-14 11:20:00 -04:00
Sam
5f46dfedf1 Merge pull request #1320 from ZogStriP/local-avatars 
Local avatars
 2013-08-14 00:36:42 -07:00
Régis Hanol
92b0cfe3d3 cleaned up non-used code 2013-08-13 22:09:10 +02:00
Régis Hanol
c867b67a0b custom avatar support 2013-08-13 22:08:29 +02:00
Régis Hanol
95a2405c9e larger avatar in the "in reply to" box 
This one is for @BrentleyJones (cf.
http://meta.discourse.org/t/small-avatar-in-in-reply-to-box/8761)
 2013-08-13 22:04:38 +02:00
Neil Lalonde
b36c6d7b78 Users cannot change their own username after 3 days since registering. Site setting username_change_period allows you to change the number of days. 2013-08-12 14:55:09 -04:00
Neil Lalonde
879652f055 Add setting edit_history_visible_to_public to control whether post edits can be viewed by everyone. Uncheck it so only staff users can see edits. 2013-08-12 11:12:20 -04:00
Jeff Atwood
556cb792e9 change topic share button to match link button 2013-08-10 21:07:42 -07:00
Neil Lalonde
bb492eb8bf Add filtering to staff logs page 2013-08-09 16:59:05 -04:00
Robin Ward
730f57a751 Tiny CSS change: add background to inline code values. 2013-08-09 12:54:46 -04:00
Neil Lalonde
4d8585ac10 Put staff user in the first column 2013-08-09 11:24:50 -04:00
Neil Lalonde
90a3bcf6ff Add filter by action to staff logs page 2013-08-09 10:06:59 -04:00
Neil Lalonde
33bddbff85 Use Ember.ListView for staff action logs page 2013-08-09 10:06:58 -04:00
Neil Lalonde
0d44313a4b Use Ember.ListView for blocked emails list 2013-08-09 10:06:58 -04:00
Robin Ward
7fdaefcd86 FIX: Should allow support for ember list view 2013-08-08 23:13:26 -04:00
Robin Ward
477eb81bc9 Updated docs for Discourse.Singleton 2013-08-08 13:00:48 -04:00
Neil Lalonde
ce05b43c1d Fix delete user button on admin/user page so it's enabled at the right times, and update its title attribute to be more helpful 2013-08-08 12:54:38 -04:00
Robin Ward
86246a64eb Convert Discourse.Site and Discourse.ScreenTrack to use Discourse.Singleton 2013-08-08 12:49:58 -04:00
Robin Ward
51f5cf77fb Convert Discourse.User to use Discourse.Singleton 2013-08-08 12:42:08 -04:00
Robin Ward
8e1fae0459 Add Discourse.Singleton class mixin for creating singletons. 2013-08-08 12:00:58 -04:00
Jeff Atwood
7343874360 oops, meant both 2013-08-07 16:42:26 -07:00
Jeff Atwood
0ab5388839 hook nth-of-type to reply, not "row" 2013-08-07 16:38:54 -07:00
Jeff Atwood
6656410c58 reduce padding between repeat embedded posts 2013-08-07 16:31:07 -07:00
Jeff Atwood
6caf55994b tighten up user page spacing a tiny bit 2013-08-07 16:11:16 -07:00
Neil Lalonde
b097d780d0 Tweaks to staff action logs page 2013-08-07 18:29:13 -04:00
Neil Lalonde
b6b30dabd4 Send context of where a user was deleted as a spammer so it can be logged 2013-08-07 18:18:18 -04:00
Neil Lalonde
b0848db6de Oops, forgot to use i18n in some places 2013-08-07 16:46:23 -04:00
Neil Lalonde
5c8c52482a Add a way to view staff action logs in admin 2013-08-07 16:27:34 -04:00
Neil Lalonde
d2fb6ec53f Blocked Emails list in admin 2013-08-07 16:27:34 -04:00
Robin Ward
66f9506481 FIX: IE9 regression 2013-08-07 16:20:22 -04:00
Robin Ward
1c3804934e Show the entire history of replies above a post when you expend "in reply to" 2013-08-06 17:43:10 -04:00
Neil Lalonde
57baf1f112 Logout takes you to the front page instead of leaving you on your user activity page 2013-08-06 16:04:02 -04:00
Neil Lalonde
879aa06601 Change tiny date formatting for dates in past years. Example: 10 Dec '12 2013-08-06 13:47:24 -04:00
Jeff Atwood
890ded7b1b make topic progress more visible 2013-08-05 15:10:53 -07:00
Jeff Atwood
27f44e7e7e increase modal max-width so errors fit better 2013-08-05 14:57:56 -07:00
Robin Ward
c714b98595 Update ember-renderspeed slightly. 2013-08-05 16:20:36 -04:00
Robin Ward
de3c657ea3 FIX: Oneboxes with incorrect URL 2013-08-05 16:15:16 -04:00
Robin Ward
dbbc5248aa Update ember-renderspeed. Much less overhead. 2013-08-05 15:00:35 -04:00
Régis Hanol
e90bbc6a6c don't display debug information when running tests 2013-08-14 00:12:25 +02:00
Jeff Atwood
ab2b7fc882 get rid of text-shadow in gutter 
I blame iOS for this shit
 2013-08-04 01:26:41 -07:00
Robin Ward
8d08391ff5 FIX: Allow Discourse.Session.current() API to update to 0 2013-08-02 18:48:02 -04:00
Robin Ward
91efbc1830 FIX: If an error occurs loading posts, revert state correctly 2013-08-02 18:42:46 -04:00
Neil Lalonde
98b58150bb Dashboard calculations are done with an async job now 2013-08-02 18:32:33 -04:00
Neil Lalonde
1552c4b69e Remove users column from Top Traffic Sources table on dashboard. It's not useful and very expensive to calculate. 2013-08-02 18:32:33 -04:00
Robin Ward
f337aea982 FIX: Can edit 1st posts that have no categories 2013-08-02 17:41:01 -04:00
Jeff Atwood
f996a8757a add "post last edited at" to edit tooltip 2013-08-02 13:15:50 -07:00
Jeff Atwood
94c969b7d8 set min-width on post unread counts 2013-08-02 12:41:40 -07:00
Robin Ward
701843552a Fixes to {{#groupedEach}} 2013-08-02 15:14:24 -04:00
Neil Lalonde
9db0ac16a9 Add site setting delete_removed_posts_after to configure after how many hour posts that were deleted by their authors will be deleted 2013-08-02 13:35:52 -04:00
Robin Ward
ef82b66e95 Easier to group bindings. Perf improvements. 2013-08-02 13:18:09 -04:00
Jeff Atwood
d8c2856a4c flatten the new / unread post badges 2013-08-02 03:47:06 -07:00
Sam
c4af6297b4 read restricted categories should have a glyph 2013-08-02 15:33:16 +10:00
Sam
af685e83ea oh my this convenience method sure is not convenient 2013-08-02 15:11:09 +10:00
Neil Lalonde
cf333268d5 Fix: flag modal sometimes doesn't have nuke user button when it should 2013-08-01 22:00:00 -04:00
Sam
76678f0024 broken hinting fixed 2013-08-02 11:09:54 +10:00
Régis Hanol
faeb4a9ebd enhance upload selector 
- Change the icon on the button to a file when attachments are enabled
- Display the list of allowed extensions in the upload selector
- FIX : regexps for validating uploads weren't escaping the dots
 2013-08-02 01:30:18 +02:00
Robin Ward
952b1f6d71 Performance: Improve Ember.Object.create speed 2013-08-01 17:16:55 -04:00
Neil Lalonde
b194bafcc8 Fix rendering of email logs rows. Needed thead around the first row. 2013-08-01 17:15:28 -04:00
Jeff Atwood
236356bfe2 add foreground color to @mentions 2013-08-01 11:43:46 -07:00
Robin Ward
be3c0f2bb4 FIX: Post Menu wasn't updating the bookmark icon properly. 2013-08-01 12:20:20 -04:00
Robin Ward
4a0ea7f776 Upgrade jQuery to 2.0.3 2013-08-01 11:58:22 -04:00
Neil Lalonde
361f158b27 Change category by editing first post updates topic title 2013-08-01 10:56:15 -04:00
Sam
1132c10074 support server side js and arbitrary assets 
proper chaining for emoji so other hooks can be called
 2013-08-01 17:35:31 +10:00
Sam
160107a712 working plugin interface for custom openid auth, custom css and custom js 2013-08-01 16:02:43 +10:00
Neil Lalonde
2af6cd616d Use allow_uncategorized_topics site setting in categoryChoose 2013-07-31 16:48:23 -04:00
Robin Ward
023c908d5a FIX: Back button broke when clicking @mentions 2013-07-31 15:08:03 -04:00
Robin Ward
51d86b7a91 Front-end Optimizations 2013-07-31 14:53:10 -04:00
Jeff Atwood
5028fdbed6 oops background-color not color 2013-07-31 11:41:29 -07:00
Zachary Lewis
5ee1df6bca Fix assets:precompile failure from missing @include 2013-07-30 21:02:11 -05:00
Jeff Atwood
c5f03986c0 prettify staff bg slightly 2013-07-30 16:25:18 -07:00
Jeff Atwood
90bcd73b31 make topic title icons properly sized 2013-07-30 16:18:29 -07:00
Jeff Atwood
b6f17a6493 we don't need a whole extra group for 1 pref 2013-07-30 15:43:38 -07:00
Jeff Atwood
81de7dc0af simplify @mention CSS, add $quote-background color 2013-07-30 15:28:18 -07:00
Robin Ward
a2844ea3c6 An attempt at some Perf improvements 2013-07-30 17:27:56 -04:00
Neil Lalonde
277e4db2cb Use ellipsis in dashboard referred topics table. Add .overflow-ellipsis css helper. 2013-07-30 16:48:45 -04:00
Neil Lalonde
16cd3e2a53 Fix to allow admins to change the case of a someone's username 2013-07-30 16:48:45 -04:00
Robin Ward
fc25da09e3 Revert "Remove RawDivView and use regular handlebars" 
This reverts commit e7f349ff0f.
 2013-07-30 11:20:11 -04:00
Neil Lalonde
8ef771ad8d Use warning-sign icon instead of trash for nuke user buttons 2013-07-29 18:31:47 -04:00
Neil Lalonde
4fd5087f91 Add button to delete a spammer in the flag modal 
Add SiteSettings: delete_user_max_age, delete_all_posts_max. Add delete spammer button to admin flags UI
Moderators can delete users too
 2013-07-29 15:29:44 -04:00
Neil Lalonde
e076158789 Add ip_address, email, and context to staff_action_logs table. Context should usually be the url from which the staff member performed the action, but could be any string that describes what the staff member was doing when the action was performed. 2013-07-29 15:29:43 -04:00
Neil Lalonde
5f3e9131ed Deleting a user from admin user page has the option to also block signups from the same email address 2013-07-29 15:29:43 -04:00
Neil Lalonde
5f8a130277 Add BlockedEmail, to block signups based on email. Track stats of how many times each email address is blocked, and last time it was blocked. Move email validation out of User model and into EmailValidator. Signup form remembers which email addresses have failed and shows validation error on email field. 2013-07-29 15:29:43 -04:00
Robin Ward
cc4ae05be3 Left in an extra function. 2013-07-29 14:56:59 -04:00
Robin Ward
1c17f409bd Remove an {{#if}} 2013-07-29 14:50:19 -04:00
Robin Ward
08ebaf926b Move deleted at into actions history, where it should be. 2013-07-29 14:46:25 -04:00
Robin Ward
323aea78e2 Remove unused PrependPostView 2013-07-29 14:19:35 -04:00
Robin Ward
e7f349ff0f Remove RawDivView and use regular handlebars 2013-07-29 14:17:03 -04:00
Robin Ward
b11e1f8b40 Added ember-renderspeed library for profiling rendering. Removed old probes stuff that 
that was just profiling the run loop.
 2013-07-29 12:52:09 -04:00
Sam
22893e203a Merge pull request #1260 from sir-pinecone/reactivate-admin-refresh-btn 
Fix auto-group refresh response so that ajax callback runs
 2013-07-28 22:22:55 -07:00
Sam
56f7c18b09 Merge pull request #1259 from sir-pinecone/hide-admin-group-link-from-staff 
hide groups nav link from non-admins
 2013-07-28 22:22:09 -07:00
Sam
aa6c92922d SECURITY: correct our CSRF implementation to be much more aggressive 2013-07-29 15:13:13 +10:00
Robin Ward
a0cbbab37a FIX: Loading was broken on activity streams 2013-07-27 13:55:34 -04:00
Michael Campagnaro
aa7e96c0fa Fix auto-group refresh response so that ajax callback runs 2013-07-26 19:47:32 -04:00
Michael Campagnaro
16d5032143 hide groups nav link from non-admins 2013-07-26 18:58:50 -04:00
Robin Ward
385b2fbde2 Some tests for the user stream 2013-07-26 17:09:54 -04:00
Robin Ward
5d66f6ed8e Minor fixes. Link directoy to user activity to avoid a redirect. 2013-07-26 15:56:29 -04:00
Robin Ward
e77ee1eaa8 Moved highestSeenByTopic to the Discourse.Session 2013-07-26 15:18:46 -04:00
Robin Ward
894dc2c6fd Moved Discourse.ajax into a mixin. 2013-07-26 15:12:40 -04:00
Robin Ward
20f3707fbe Moved Resolver to new File 2013-07-26 15:04:29 -04:00
Robin Ward
773823c41f Remove Discourse.transient. Use a singleton for session data, it's a lot cleaner. 2013-07-26 14:59:28 -04:00
Robin Ward
fca83cb185 Upgrade Ember to Fix CVE-2013-4170 2013-07-26 13:10:52 -04:00
Robin Ward
29519ece23 Merge branch 'add-audio-onebox' of git://github.com/jamesaanderson/discourse into jamesaanderson-add-audio-onebox 
Conflicts:
	app/assets/stylesheets/application/compose.css.scss
	app/assets/stylesheets/application/topic-post.css.scss
 2013-07-26 11:30:40 -04:00
Robin Ward
d71e7cdfde Merge pull request #1254 from crob611/master 
Prevent 'Quote reply' from appearing when using find in Chrome
 2013-07-26 08:09:08 -07:00
Neil Lalonde
c9c68c2cb2 Show Edit buttons to staff on categories page again 2013-07-26 10:39:26 -04:00
Neil Lalonde
234474af1b Fix 'undefined' in Create Category modal title 2013-07-26 10:31:56 -04:00
Neil Lalonde
d579e4c5d5 Prevent category badges from wrapping on white space 2013-07-26 10:11:00 -04:00
Sam
809594c00a correct ScreenTrack so it properly flushes everything that happened on stop and resets on start 2013-07-26 14:41:46 +10:00
Corey Robertson
d25d1f777c Prevent 'Quote reply' from appearing when using find in Chrome 2013-07-25 22:57:03 -05:00
James Anderson
d7d3be1130 Add audio onebox 
http://meta.discourse.org/t/audio-html5-tag/8168
 2013-07-25 19:03:23 -07:00
Robin Ward
9edd163228 Oops, left in another console.log :) 2013-07-25 16:06:58 -04:00
Robin Ward
0317cf9608 Show topics as a list of topics on the User Stream. 2013-07-25 15:56:20 -04:00
Sam
589e9916f2 fix so some half working locales boot 2013-07-25 11:25:30 +10:00
Sam
d0f50cb266 fixing up moment locales, they were not set up properly 2013-07-25 11:09:29 +10:00
Robin Ward
1b02a7c580 missing semi colon 2013-07-24 17:32:07 -04:00
Robin Ward
8408795093 Support for default User Index 2013-07-24 17:18:10 -04:00
Robin Ward
9132931aa9 Use {{outlets}} for user activity views so we can swap some out. 2013-07-24 15:54:02 -04:00
Michael Campagnaro
867ce0310c display group validation errors in alert modal 2013-07-24 00:42:44 -04:00
Régis Hanol
be9217d4c8 add server-side filesize check on uploads 2013-07-24 00:54:41 +02:00
Robin Ward
75491d2cf6 remove console.log 2013-07-23 18:03:35 -04:00
Robin Ward
82465caf97 Clean up user activity code in preparation for topic rendering 2013-07-23 17:01:43 -04:00
Robin Ward
c9c6a8fd9d User stream now uses eyeline for loading more content. 2013-07-23 16:06:26 -04:00
Neil Lalonde
44bebf255d Fix layout of category badges on categories page and in combobox 2013-07-23 15:05:37 -04:00
Robin Ward
96af490d7c FIX: Deleting posts in bulk was broken. 2013-07-23 14:59:05 -04:00
Robin Ward
6237a155e7 FIX: Linking to users on admin dashboard was broken 2013-07-23 13:35:32 -04:00
Robin Ward
d8978cb4a0 FIX: Redirect on some URLs to wrong path 2013-07-23 12:15:44 -04:00
Sam
7c5e15966f Merge pull request #1225 from ZogStriP/upload-selector-handles-attachments 
uploads selector texts is now different when attachments are enabled
 2013-07-23 00:44:17 -07:00
Sam
9ac6c6e2e9 Merge pull request #1233 from sir-pinecone/improve-group-deletion 
Add confirmation modal to admin group deletion
 2013-07-23 00:43:06 -07:00
Sam
73e0418b41 deleted class only for real deleted posts 2013-07-23 15:42:44 +10:00
Sam
3ad7d74c52 correct no highlighting categories when clicked 2013-07-23 13:24:39 +10:00
Sam
9c5734b773 tone down badges for the love of all that is good 2013-07-23 12:44:20 +10:00
Régis Hanol
6474e7df97 uploads selector texts is now different when attachments are enabled 2013-07-22 23:15:23 +02:00
Robin Ward
6221fe2d60 JSHint fix 2013-07-22 16:56:09 -04:00
Robin Ward
43ceacabab Link to edit "About Me" links directly to the field. 2013-07-22 16:53:21 -04:00
Michael Campagnaro
a0465485b4 use group.get as per PR comment 2013-07-22 16:19:08 -04:00
Robin Ward
0ad93e436c Merge pull request #1232 from sir-pinecone/fix-group-member-removal 
Fix for autocomplete delete action removing only the last item
 2013-07-22 12:22:14 -07:00
Robin Ward
112b9f9c2a FIX: The previous flag reason was selected when opening the modal. 2013-07-22 12:05:13 -04:00
Robin Ward
e73c809836 FIX: Reply as new Topic wasn't clearing drafts 2013-07-22 11:42:22 -04:00
Neil Lalonde
52acbec647 Load pagedown_custom.js a bit later so it can use translations 2013-07-22 11:01:15 -04:00
Robin Ward
a71e4d5216 Merge pull request #1219 from bolandrm/fix_graphical_error_admin_dash 
Fix Graphical Error on Admin Dashboard
 2013-07-22 07:33:08 -07:00
Robin Ward
0f1533f41d Merge pull request #1229 from ZogStriP/close-lightbox-when-using-back-button 
FIX: lightbox is not closed when using the back button
 2013-07-22 07:29:53 -07:00
Robin Ward
8b181e0803 Merge pull request #1230 from ZogStriP/add-newuser-max-attachments-setting 
add newuser-max-attachments setting
 2013-07-22 07:22:23 -07:00
Sam
1f3c5cb656 allow end user to recover a post they delete 
automatically delete stubs after 1 day
 2013-07-22 17:48:47 +10:00
Jeff Atwood
d68f30c09d flatten and simplify default category badge styles 2013-07-22 00:11:34 -07:00
Jeff Atwood
5bb2090b81 fix way too tall line-height for user titles 2013-07-21 23:54:10 -07:00
Michael Campagnaro
9616767bff Add confirmation modal to admin group deletion 2013-07-22 02:48:23 -04:00
Michael Campagnaro
e471ffd07b Fix for autocomplete delete action removing only the last item 2013-07-21 22:37:01 -04:00
Régis Hanol
2986798ba7 add newuser-max-attachments setting 2013-07-22 02:39:17 +02:00
Régis Hanol
418d8c7377 FIX: lightbox is not closed when using the back button 2013-07-22 01:21:43 +02:00
Sam
cacbcaeb7e blank responses led to an undefined on the user screen 2013-07-19 17:21:51 +10:00
Ryan Boland
f6963a05c4 fix graphical error 2013-07-18 23:26:04 -04:00
Robin Ward
7a6f1b5aff Color moderator actions on user stream 2013-07-18 17:24:51 -04:00
Robin Ward
257ddf5fc9 FIX: Private message link on messages view did not work. Removed a lot of duplication. 2013-07-18 17:07:05 -04:00
Robin Ward
7d4b089cd1 FIX: Suggested Topics were sometimes disappearing 2013-07-18 16:09:03 -04:00
Robin Ward
419cbc7701 FIX: Double load on back button 2013-07-18 15:40:06 -04:00
Robin Ward
751b757c1d FIX: Some failing specs 2013-07-18 12:26:38 -04:00
Robin Ward
e3bbb2c8bb Never render an avatar img if we know the username is invalid. 2013-07-18 12:03:09 -04:00
Robin Ward
910c88c48e FIX: Private Message button wasn't populating username 2013-07-18 10:43:38 -04:00
Robin Ward
a97c093434 FIX: Don't transition to when viewing a user. Just render it. 2013-07-17 18:13:43 -04:00
Robin Ward
3761ccb018 FIX: Sometimes the total post count could be incorrect 2013-07-17 16:50:20 -04:00
Robin Ward
19f3a8d640 Each user activity filter has its own URL now. 2013-07-17 15:42:31 -04:00
Robin Ward
3238e0caa4 JSHINT 2013-07-17 10:31:27 -04:00
Robin Ward
86c884aa29 FIX: Only show undelete button when the topic is deleted 2013-07-17 10:21:47 -04:00
Robin Ward
5a5e9d0fd1 Merge pull request #1206 from BrentleyJones/fixed_modals 
FIX: Modal dialogs now truly center and work at all screen sizes (mobile), now with working Bootbox
 2013-07-17 06:59:48 -07:00
Robin Ward
e2ff064aa3 Merge pull request #1198 from prem-prakash/master 
Adding Portuguese Brazilian translations
 2013-07-17 06:59:31 -07:00
Sam
c2be81a76e Merge pull request #1199 from ZogStriP/uploads 
adds the `max_attachment_size_kb` setting
 2013-07-16 23:03:42 -07:00
Sam
2573935155 improve security UI 2013-07-17 15:10:49 +10:00
Sam
625204c8bd work in progress category UI 
refactor hack from earlier
 2013-07-17 14:54:21 +10:00
Sam
5a7e78f0fc fix unit tests 2013-07-17 14:22:55 +10:00
Sam
63cbe8dd17 fix links to site contents, fix it so the site contents page is refreshable 2013-07-17 14:15:09 +10:00
Sam
d1dbcf52fc see: https://github.com/emberjs/ember.js/pull/2148 2013-07-17 09:55:30 +10:00
Brentley Jones
f26b479458 FIX: History modal having custom (old) setting of min height and width. 
It is functional, but it no longer resizes down. I would look at making this fluid or having a style for mobile.
 2013-07-16 21:05:33 +00:00
Brentley Jones
a03e933eb6 Fix spacing 2013-07-16 19:16:22 +00:00
Brentley Jones
e060e952b5 Accidently removed some styles in the merge 2013-07-16 19:06:33 +00:00
Brentley Jones
5e08427dd3 Merge branch 'master' into fixed_modals 
Conflicts:
	app/assets/javascripts/discourse/templates/modal/modal.js.handlebars
	app/assets/stylesheets/application/modal.css.scss
 2013-07-16 18:58:49 +00:00
Brentley Jones
cc28a4ddc3 FIX: Bootbox modals were not coming through properly. Temp have them use the old way of displaying. Will look into how to have them be the same as the "fixed" way. 2013-07-16 18:32:35 +00:00
Robin Ward
7c9bd8e8c9 Remove EvilTrout's stupid mistake. 2013-07-16 13:51:00 -04:00
Robin Ward
2577d76e4f Revert "Merge pull request #1201 from BrentleyJones/fixed_modals" 
This reverts commit 7e889c4e24, reversing
changes made to e9d37f395f.
 2013-07-16 13:38:01 -04:00
Robin Ward
4bfb546942 Removed modelReady hack now that the async router exists 2013-07-16 13:24:59 -04:00
Robin Ward
6929ee9f46 Changed HTML again on hamburger menu to make it easier to style 2013-07-16 12:24:18 -04:00
Robin Ward
82c734ec84 FIX: FAQ wasn't loading sometimes 2013-07-16 12:11:30 -04:00
Robin Ward
d466d11e71 Ember RC6 update 2013-07-16 10:35:18 -04:00
Robin Ward
7e889c4e24 Merge pull request #1201 from BrentleyJones/fixed_modals 
FIX: Modal dialogs now truely center and work at all screen sizes (mobile)
 2013-07-16 07:31:17 -07:00
Sam
dc3079db37 fix mucked up styling, glyph should be inside the hyperlink so it gets color 2013-07-16 18:01:34 +10:00
Sam
ff7d9cac38 fix non localized said: in quotes 2013-07-16 17:22:54 +10:00
Sam
ef1c71ba98 missed a qunit test 2013-07-16 15:48:41 +10:00
Sam
352ac9e60c Finalize read only and post only categories, finished off UI work 2013-07-16 15:46:11 +10:00