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

2350 commits

Author SHA1 Message Date
Neil Lalonde
bd9b85f076 Screened Urls page shows results for each domain instead of each url 2013-11-04 16:24:48 -05:00
Robin Ward
0b79636b99 Typo! 2013-11-04 15:56:03 -05:00
Robin Ward
ec7298d548 FIX: Regression on topic list for best of links. 2013-11-04 15:48:51 -05:00
Robin Ward
b8e63719f8 FIX: Don't autolink within a markdown link. 2013-11-04 14:24:40 -05:00
Robin Ward
cc47ade2ed missing semi colon 2013-11-04 13:59:31 -05:00
Robin Ward
69503345c4 FIX: Some more non-english category errors 2013-11-04 13:43:33 -05:00
Robin Ward
ee6b97754a Merge pull request #1611 from awesomerobot/master 
Category-dropdown items have consistent widths... other fixes
 2013-11-04 10:17:21 -08:00
Robin Ward
a13d05660f FIX: Show status icons on user topic pages 2013-11-04 13:13:22 -05:00
Kris Aubuchon
5c3f12f369 merging 
Merge remote-tracking branch 'upstream/master'
 2013-11-04 12:59:17 -05:00
Neil Lalonde
ede59a4386 FIX: issue 1538. After upgrading and before a new version check request has been made, dashboard might still say that an update is available. 2013-11-04 12:51:09 -05:00
Kris Aubuchon
1c2b5015a3 fixing user title line-height, adding @mention style back in, consistent category width/alignment 2013-11-04 12:45:18 -05:00
Robin Ward
7360112759 Merge pull request #1600 from GManzato/user_page_flat 
Flatter design on User Page
 2013-11-04 07:25:57 -08:00
Régis Hanol
b063c4326f Merge pull request #1609 from awesomerobot/master 
some general simplification to modal, menus, etc
 2013-11-04 06:52:25 -08:00
Kris Aubuchon
70fd4f7f6b merging local with master 
Merge remote-tracking branch 'upstream/master'
 2013-11-04 09:17:12 -05:00
Kris Aubuchon
4ce711a3b7 some general simplification to modal, menus, etc 2013-11-04 09:16:47 -05:00
Régis Hanol
4f8d0a1a96 revert changes to magnific-popup.scss 2013-11-04 14:44:52 +01:00
Régis Hanol
12ac2f2e99 FIX issues with quote button 
Fix the following issues
- Quote button quotes only one word on iOS
- Quote reply popup should not come up when selecting the text in the ‘reply’ button
 2013-11-04 12:51:39 +01:00
Régis Hanol
934ede7d91 shorter message for untranslated strings 2013-11-04 11:52:12 +01:00
Robin Ward
7a567d730d Merge pull request #1601 from awesomerobot/master 
main logo size consistency fix
 2013-11-01 13:32:37 -07:00
Robin Ward
52c3457133 Site setting to support showing real names in posts. Also put back in type to search on site settings 2013-11-01 16:32:12 -04:00
Robin Ward
04aa1690e2 Adjust ul,ol margins 2013-11-01 15:48:28 -04:00
Kris Aubuchon
1f283b5ca9 main logo size consistency fix 2013-11-01 15:45:56 -04:00
Robin Ward
bbf0312e72 FIX: Non-Admins couldn't send private messages through the new user expansion 2013-11-01 15:18:26 -04:00
Neil Lalonde
0060050c08 Replace data-dismiss=modal with action close. It's better to use our own ember code instead of relying on bootbox magic. 2013-11-01 12:14:08 -04:00
Neil Lalonde
92a0729937 When banning a user, a reason can be provided. The user will see this reason when trying to log in. Also log bans and unbans in the staff action logs. 2013-11-01 10:47:26 -04:00
Gilles Manzato
3826e67007 Flatter design on User Page 
- Cleanup of the design ( remove border-radius ... )
- Fixed some alignment and width in mobile and lower screen size
 2013-11-01 15:38:07 +01:00
Robin Ward
b93ca1089e List subcategories on categories page 2013-10-31 18:02:24 -04:00
Robin Ward
5a78c1cb34 Changed confusing 'all categories' text 2013-10-31 16:41:13 -04:00
Robin Ward
6ff2abd6aa Move category badge to left of topic name in non-fixed header 2013-10-31 16:31:01 -04:00
Robin Ward
7ef76fd4c3 Change "Create XXX Topic" to "Create Topic" 2013-10-31 16:29:41 -04:00
Robin Ward
744cd93f28 FIX: Non-English category name regression 2013-10-31 16:25:26 -04:00
Neil Lalonde
e1d956f5ee Improve styling of staff action logs UI 2013-10-31 12:17:06 -04:00
Neil Lalonde
d3c7bbe268 Merge pull request #1597 from awesomerobot/master 
topic vertical alignment fixes, admin logs table width fix
 2013-10-31 06:58:10 -07:00
Kris Aubuchon
396b626bdc topic vertical alignment fixes, admin logs table width fix 2013-10-31 09:35:49 -04:00
Régis Hanol
727d628a0e Merge pull request #1595 from velesin/logo_component 
extracts logo component from header
 2013-10-30 14:52:04 -07:00
Sam
c97ab672c7 Merge pull request #1593 from awesomerobot/master 
Some code cleanup, touch/non-touch gutter, little design/alignment tweaks
 2013-10-30 14:45:29 -07:00
Wojciech Zawistowski
489dab333a extracts logo component from header 2013-10-30 21:56:48 +01:00
Robin Ward
3d6d7c8abe SiteSetting to hide regular names from users 2013-10-30 15:45:34 -04:00
Kris Aubuchon
d01185215d some reorganization, touch optimization, poster expansion design 2013-10-30 12:40:16 -04:00
Robin Ward
2305cf94ea Don't wait for loading to finish before resetting category 2013-10-30 11:28:51 -04:00
Kris Aubuchon
9f42bde110 fixing topic title line height to accomodate overflow 2013-10-30 09:57:56 -04:00
Régis Hanol
689c4cd947 Merge pull request #1592 from awesomerobot/master 
fixing errors in formatting from last commit
 2013-10-30 06:33:23 -07:00
Kris Aubuchon
032997ccff fixing errors in formatting from last commit 2013-10-30 09:31:26 -04:00
Régis Hanol
9a2e3245b8 Merge pull request #1591 from awesomerobot/master 
fixing pre/sub/sup/code/kbd formatting, post selection buttons
 2013-10-30 06:20:59 -07:00
Kris Aubuchon
7900fa0184 fixing pre/sub/sup/code/kbd formatting 2013-10-30 09:11:05 -04:00
Kris Aubuchon
ef954f46ba fixing blockquote that I just broke 2013-10-29 22:33:09 -04:00
Kris Aubuchon
be27e1dfee fixed compose preview spacing issue on blockquotes/paragraphs - made post selection buttons more prominent 2013-10-29 22:00:18 -04:00
Sam
4fa32c4dc0 Merge pull request #1590 from awesomerobot/master 
fixing the category creation/edit modal alignment
 2013-10-29 18:40:35 -07:00
Kris Aubuchon
0337c293c1 fixing the category creation/edit modal alignment 2013-10-29 21:01:41 -04:00
Sam
36352e437f Merge pull request #1589 from awesomerobot/master 
Some underlying topic title clean-up, fixed private message user list alignment
 2013-10-29 17:49:28 -07:00
Kris Aubuchon
60d9b4d808 fixing private message users, post title alignment 2013-10-29 20:47:37 -04:00
Kris Aubuchon
3043efcb0a cleaning up the topic-title alignment a bit 2013-10-29 17:15:56 -04:00
Robin Ward
bb135fafb4 Replace slow auto-filter in site settings with a filter button 2013-10-29 17:03:50 -04:00
Robin Ward
6063b52d6a Support for choosing a destination category when splitting topics. 2013-10-29 15:30:06 -04:00
Robin Ward
be0d5bd1f0 Let's try the category on the left side of the title 2013-10-29 13:12:12 -04:00
Robin Ward
5689e314c5 Upgrade Ember to 1.1.2 2013-10-29 13:01:57 -04:00
Kris Aubuchon
4c8944626a making post-info text brighter, making category nav dropdown text smaller and bold 2013-10-29 00:37:18 -04:00
Kris Aubuchon
0d0a2cb947 category nav style 2013-10-28 17:37:31 -04:00
Kris Aubuchon
5d19e66470 merging with the new category nav feature 
Merge remote-tracking branch 'upstream/master'
 2013-10-28 17:08:00 -04:00
Neil Lalonde
e52f6e0f6d FIX: weird scroll position on visiting a topic page for the first time (chrome OS X, maybe mobile safari too) 2013-10-28 16:17:06 -04:00
Neil Lalonde
8ea1a1069e Use the debounce parameter instead of hard-coding 100 2013-10-28 16:17:06 -04:00
Robin Ward
8c882fd392 Changed breadcrumb dropdowns 2013-10-28 15:34:38 -04:00
Kris Aubuchon
c016a081f1 further simplification over all, changes include: flatter button style, styling admin table, topic-list style 2013-10-28 13:46:59 -04:00
Robin Ward
70ce07ae49 Oops JSHint again :( 
)
 2013-10-28 13:00:34 -04:00
Robin Ward
26a8156f08 Better blockquote button in Markdown editor when non-traditional markdown linebreaks 
are enabled.
 2013-10-28 12:44:10 -04:00
Kris Aubuchon
cafc1a088d catching up with the master 
Merge remote-tracking branch 'upstream/master'
 2013-10-28 12:26:12 -04:00
Kris Aubuchon
1cb7b29b62 some topic-list simplification 2013-10-28 12:25:52 -04:00
Robin Ward
098673ecc0 Put back the user collapsing 2013-10-28 11:29:23 -04:00
Robin Ward
1775271d46 Reverse positions of buttons on user profile 2013-10-28 11:19:18 -04:00
Sam
88ccd287b4 allow uncategorized category in 2 more spots (hamburger and drop down) 2013-10-28 08:39:55 +11:00
Régis Hanol
c77a20eea5 do not deselect text when clicking on the reply button below the post 2013-10-27 19:44:46 +01:00
Neil Lalonde
ce2af5c6d1 Show Log In button at the bottom of the page body when login_required and not logged in 2013-10-25 16:08:59 -04:00
Robin Ward
a3a2c5fa24 FIX: Mobile breadcrumb formatting 2013-10-25 15:44:28 -04:00
Robin Ward
e9c4465ec7 FIX: Various bugs with Category breadcrumbs 2013-10-25 15:24:03 -04:00
Neil Lalonde
90938df967 FIX: make it possible to close popup-input-tips on touch devices, and position them a bit better 2013-10-25 11:17:11 -04:00
Sam
a65407b2cb implemented UI for filtered down by category view 2013-10-25 14:18:34 +11:00
Sam
572f036e74 filter down the top level navs 2013-10-25 11:15:20 +11:00
Neil Lalonde
017efdece5 A form to add ip addresses to be blocked or whitelisted 2013-10-24 17:19:10 -04:00
Robin Ward
61468f6f27 Can assign a parent category to a category. 2013-10-24 17:03:28 -04:00
Robin Ward
ee2dd9d24c Working drop downs for category changing 2013-10-24 15:19:15 -04:00
Robin Ward
9adcd1579d Renamed components to lib in the JS project, as Ember has components and they mean something different. 2013-10-24 12:36:46 -04:00
Sam
b7d3b52e4f basic implementation of per-category new/latest etc filters 2013-10-24 21:05:06 +11:00
Sam
636976e5d4 fix alignment of n person liked this. 2013-10-24 15:30:41 +11:00
Sam
24d732b12a regressions post merge 2013-10-24 12:25:20 +11:00
Sam
666264879c change it so all topics MUST include a category, we store a special uncategorized category to compensate 
this cleans up a bunch of internals and removes some settings
 2013-10-24 12:08:02 +11:00
Robin Ward
cc9b11ecc5 Simple category breadcrumb component 2013-10-23 17:00:02 -04:00
Robin Ward
541620c115 Routes and support for sub-categories 2013-10-23 15:22:49 -04:00
Robin Ward
49a11e51df Ember support for parent categories 2013-10-23 15:22:49 -04:00
Neil Lalonde
237312dbde Styling on screened ip addresses page 2013-10-23 13:01:50 -04:00
Neil Lalonde
3db7529ad4 More icons on screened ip addresses page 2013-10-23 13:01:50 -04:00
Régis Hanol
a98d4d9b35 régis' git-fu at his best... 2013-10-23 11:35:27 +02:00
Régis Hanol
3cc08c3b27 fixed JSHINT 2013-10-23 11:27:50 +02:00
Régis Hanol
e39242b6ff missed a single quote 2013-10-23 11:25:16 +02:00
Régis Hanol
d05547e7f3 fix arrow direction in post incoming links 2013-10-23 11:16:03 +02:00
Régis Hanol
a12a1bcc66 bring back attachment icons 2013-10-23 09:52:15 +02:00
Sam
9ae4245955 Merge pull request #1565 from awesomerobot/master 
topic page: alignment fixes for replies, minor alignment changes
 2013-10-22 23:09:44 -07:00
Kris Aubuchon
ca82d07f6d simplfying the header, some more alignment adjustments on the topic page 2013-10-23 00:22:24 -04:00
Kris Aubuchon
0ef064fd93 removed white line in quotes, cleaned up some markup 2013-10-22 18:31:40 -04:00
Robin Ward
348e2e3ef2 Support for per-user API keys 2013-10-22 17:34:39 -04:00
Jeff Atwood
5e2d8dcf37 even out blockquote top/bottom padding 2013-10-22 14:18:41 -07:00
Jeff Atwood
d90001e857 even out blockquote paras w/top & bottom margin 2013-10-22 14:17:19 -07:00
Kris Aubuchon
649b3d44a6 topic page: alignment fixes for replies, minor alignment changes 2013-10-22 16:36:32 -04:00
Neil Lalonde
7d582fbee3 Screened ip address can be edited, deleted, and changed to allow or block. 2013-10-22 16:30:46 -04:00
Neil Lalonde
b8d586251c Use i18n for the word Cancel in admin/.../user.js.handlebars 2013-10-22 16:30:46 -04:00
Kris Aubuchon
c2865e3e2c fixing alignment on replies, buttons - also making topic new gutter link visible on touch 2013-10-22 15:37:44 -04:00
Robin Ward
13fa473c6d Fix JSHINT 2013-10-22 11:33:45 -04:00
Robin Ward
e2845f7f16 Restrict SIZE= to numbers 2013-10-22 11:08:13 -04:00
Robin Ward
97ca7a0052 FIX: topic filter menu dissapeared 2013-10-22 10:41:41 -04:00
Régis Hanol
f96ea42974 fix last activity column in suggested topics 2013-10-22 10:43:00 +02:00
Jeff Atwood
d2cc9c39ac don't define bgcolor on in-reply-to 2013-10-22 01:33:51 -07:00
Jeff Atwood
5203ba41eb tighten up spacing on notification control 2013-10-21 23:56:46 -07:00
Jeff Atwood
4693019e90 remove bottom border on posts-wrapper 2013-10-21 23:39:17 -07:00
Jeff Atwood
e994ac451b fix quote reply z-order 2013-10-21 23:31:54 -07:00
Régis Hanol
9aca8e14ba fix code highlithing in list 2013-10-21 22:57:06 +02:00
Régis Hanol
6adba747b9 fix images height on IE 2013-10-21 22:56:59 +02:00
Robin Ward
0f5bd08aee Merge pull request #1558 from awesomerobot/master 
differentiating visited topics better, fixing extra white space & alignment in header
 2013-10-21 13:45:51 -07:00
Kris Aubuchon
2feb82b4b7 differentiating visited topics better, fixing extra white space in the title header (also realigning title header) 2013-10-21 16:23:55 -04:00
Robin Ward
51b2f512a3 Merge pull request #1557 from awesomerobot/master 
fixed deleted/mod post highlight, reduced some gutter padding, re-aligne...
 2013-10-21 12:19:11 -07:00
Kris Aubuchon
ecb6ec0b6d fixed deleted/mod post highlight, reduced some gutter padding, re-aligned some title elements, better spacing around .logo-small 2013-10-21 15:15:32 -04:00
Robin Ward
b51fb4d3fb Sync up with markdown-js + our changes 2013-10-21 15:06:58 -04:00
Neil Lalonde
648b11a0eb Add screening by IP address. When deleting a user as a spammer, block all signups from the same IP address. 2013-10-21 14:50:18 -04:00
Régis Hanol
c9dd83cba4 force max-width on images/svgs in composer preview and post view 
Conflicts:
	app/assets/stylesheets/desktop/topic-post.scss
 2013-10-21 20:01:10 +02:00
Régis Hanol
9c820443fa do not select the marker in Chrome 2013-10-21 19:59:18 +02:00
Robin Ward
d9a16079a5 FIX: Do not allow users to create tables 2013-10-21 13:32:15 -04:00
Robin Ward
7a5c3bfcd8 whitelist acceptable syntax highlighting classes 2013-10-21 13:11:10 -04:00
Robin Ward
d10f9f756f FIX: [code] blocks with # headers within 2013-10-21 12:12:58 -04:00
Robin Ward
1783089d64 FIX: [quote] without params was failing. 2013-10-21 11:12:47 -04:00
Robin Ward
f565766b1e Merge pull request #1555 from awesomerobot/master 
fixed progress indicator a bit, line under title doesn't span full width...
 2013-10-21 07:51:07 -07:00
Robin Ward
4d9ca99929 Merge pull request #1542 from velesin/debounce_refactoring 
refactors Discourse.debounce
 2013-10-21 07:50:26 -07:00
Robin Ward
c5f14cdd0e Merge pull request #1549 from velesin/debounce_promise_refactoring 
refactors Discourse.debouncePromise
 2013-10-21 07:49:47 -07:00
Kris Aubuchon
2c384e0073 fix for long usernames 2013-10-21 10:13:16 -04:00
Kris Aubuchon
77540ed999 fixed progress indicator a bit, line under title doesn't span full width anymore 2013-10-21 09:38:35 -04:00
Jeff Atwood
21ee05583c no line above topic footer buttons please 2013-10-21 01:38:01 -07:00
Jeff Atwood
cec9bcfb5d make user titles smaller than usernames 2013-10-21 01:22:36 -07:00
Jeff Atwood
1a0e800afb fix line-height on topic titles 2013-10-21 00:51:11 -07:00
Jeff Atwood
2ac8f3d20b extra-info-wrapper at top of topic too narrow now 2013-10-21 00:38:24 -07:00
Sam
e7a037709f allow ordering categories in the edit category ui 2013-10-21 17:21:34 +11:00
Sam
a241ddf9d2 Merge pull request #1554 from awesomerobot/master 
gutter links shouldn't fade, fixed
 2013-10-20 22:20:10 -07:00
Kris Aubuchon
d4db161133 css transitions were too slow, sped up 2013-10-21 00:45:19 -04:00
Kris Aubuchon
94b5b24d88 gutter links shouldn't fade, fixed 2013-10-21 00:41:16 -04:00
Sam
29c8d2ebec oops add security 2013-10-21 15:33:42 +11:00
Sam
6067795780 categories can now be re-ordered 2013-10-21 15:25:20 +11:00
Sam
38a33a8c1b work in progress sortable categories 2013-10-21 15:25:20 +11:00
Sam
243a6ae291 Merge pull request #1552 from awesomerobot/master 
a few general fixes to the new flatter theme
 2013-10-20 19:33:38 -07:00
Kris Aubuchon
5d88bfa8e3 a few more fixes, detailed here: http://meta.discourse.org/t/flatter-styling-now-deployed/10515 2013-10-20 22:16:02 -04:00
Kris Aubuchon
aa42a36b8a a few general fixes to the new flatter theme 2013-10-20 21:59:46 -04:00
Sam
6cfdd083d5 Merge pull request #1525 from squareleaf/logo_header_height 
Change fixed width of logo in header to max-height.
 2013-10-20 17:37:55 -07:00
Sam
614f45d003 correct topic and category counting query 
revive old styling that was stripped
 2013-10-21 10:20:16 +11:00
Tiffany Green
6681751531 Change fixed width of logo in header to max-height. Addresses issue #1045 
Add max width
 2013-10-20 17:35:37 -05:00
Wojciech Zawistowski
4c4a2f220e refactors Discourse.debouncePromise 2013-10-20 10:38:26 +02:00
Kris Aubuchon
88a97bcb71 minimizing the desktop topic view, also effects the background on all pages and removed bootstrap 2013-10-19 18:18:25 -04:00
Wojciech Zawistowski
d0f3765967 refactors Discourse.debounce 2013-10-19 09:13:00 +02:00
Robin Ward
aef4227073 Remove debug message 2013-10-18 17:49:33 -04:00
Robin Ward
db2283b9d3 FIX: JSHint 2013-10-18 17:48:19 -04:00
Robin Ward
1113b8d7a8 FIX: Don't double sanitize values, allow blockquotes with leading text 2013-10-18 17:34:54 -04:00
Robin Ward
d7182d0b14 FIX: Only wrap inline html tags in <p> 2013-10-18 15:21:05 -04:00
Régis Hanol
28fd63bd11 don't stretch images in the mobile view 2013-10-18 16:43:53 +02:00
Sam
6f32cb52d6 minor styling changes, kill n+1 query 2013-10-18 11:23:08 +11:00
Sam
e82d975279 work in progress new category list page 2013-10-18 11:10:10 +11:00
Sam
1ee49798b2 work in progress wide category list 2013-10-18 11:10:10 +11:00
Sam
9ad01a1afb more work in progress, wide category list 2013-10-18 11:10:10 +11:00
Sam
8f0e3de675 work in progress, wide categories page 2013-10-18 11:10:10 +11:00
Sam
b567bd3d37 shift site settings in front of routes 2013-10-18 11:10:10 +11:00
Jeff Atwood
e26cbe79ad add "this" to category year stats for clarity 2013-10-17 15:54:48 -07:00
Jeff Atwood
4b53c45d3d make category descriptions plain black 2013-10-17 15:32:11 -07:00
Robin Ward
3408fc395d FIX: User stream pagination 2013-10-17 16:10:11 -04:00
Robin Ward
5fa47984b4 Link large user avatar to user profile 2013-10-17 16:06:58 -04:00
Neil Lalonde
3927913a7e FIX: composer for creating a new topic on mobile 2013-10-17 13:17:54 -04:00
Neil Lalonde
71571b9316 Never show preview pane in composer on mobile. 2013-10-17 12:19:28 -04:00
Robin Ward
a215fc5bdc Collapse user details when not viewing index view 2013-10-17 11:27:03 -04:00
Robin Ward
d206e1416c Merge pull request #1533 from velesin/remove_return_from_attach_view_with_args 
removes unused return statement from ContainerView.attachViewWithArgs
 2013-10-17 06:57:24 -07:00
Robin Ward
7e9b119c9c Minor tweaks to user view 2013-10-16 16:22:16 -04:00
Robin Ward
dd63e6d28f Two Column User View 2013-10-16 15:51:01 -04:00
Robin Ward
f81b2dc3f2 Extra comma 2013-10-16 14:16:14 -04:00
Robin Ward
c2a66a1b3b Post Expansion enhancements 2013-10-16 14:10:18 -04:00
Wojciech Zawistowski
3f02e0bca6 removes unused return statement from Discourse.ContainerView.attachViewWithArgs 2013-10-16 17:52:04 +02:00
Neil Lalonde
c7aaee907b When system flags users as sockpuppets, show a reason in the admin flags ui 2013-10-16 11:47:16 -04:00
Robin Ward
67771d6bdf FIX: New line after blockquote 2013-10-16 10:28:48 -04:00
Robin Ward
f27413219e Support for MDTest 2013-10-16 10:28:42 -04:00
Neil Lalonde
42cdad9d1d FIX: edit category modal with no title, empty modals that can't be closed. Added a better way to hide a modal without really closing it. 2013-10-15 15:41:15 -04:00
Neil Lalonde
7dcd3117fe On mobile, show new user usernames in grey, and highlight system posts like the desktop site does. 2013-10-15 12:53:14 -04:00
Robin Ward
afff145bd3 FIX: Query params were going a bit haywire when going from topic to topic. 2013-10-15 12:40:12 -04:00
Robin Ward
5281b7f80c Upgraded and refactored Sanitizing. Much less crap should get through now! 
Conflicts:
	app/assets/javascripts/discourse/components/syntax_highlighting.js
 2013-10-15 10:53:11 -04:00
Nathaniel Palmer
20ab14e1b8 prevent share-view being clipped at viewport bounds 2013-10-12 10:45:21 -04:00
Robin Ward
af931f0444 Reverting the Sanitizer commit in case we have to do something urgent 
before we deploy it early next week. It's in the branch `sanitizer` for
now.

This reverts commit 9e93d8ed52.
 2013-10-11 16:44:26 -04:00
Robin Ward
9e93d8ed52 Upgraded and refactored Sanitizing. Much less crap should get through now! 
Conflicts:
	app/assets/javascripts/discourse/components/syntax_highlighting.js
 2013-10-11 16:25:40 -04:00
Régis Hanol
7938843b50 ooops. régis can't refactor... 2013-10-11 18:49:17 +02:00
Régis Hanol
35214f0b3a Merge pull request #1522 from velesin/syntax_highlighting_context_refactoring 
removes unused context binding from Discourse.SyntaxHighlighting
 2013-10-11 09:46:47 -07:00
Régis Hanol
cf3c4fd743 no need for a computed property 2013-10-11 18:43:10 +02:00
Wojciech Zawistowski
c446cc6ce1 removes unused context binding from Discourse.SyntaxHighlighting 2013-10-11 18:37:18 +02:00
Wojciech Zawistowski
b4a6a5e841 removes unused context binding from Discourse.Lightbox 2013-10-11 17:40:30 +02:00
Robin Ward
20cba4e092 Never bind the poster expansion twice. 2013-10-10 15:18:38 -04:00
Wojciech Zawistowski
107932576e removes redundant context binding 2013-10-10 18:33:24 +02:00
Robin Ward
ea9398467b For @Sam - hide the poster expansion if you click on the avatar of the user who's expanded 2013-10-10 12:03:52 -04:00
Régis Hanol
ae72724648 add educational hint in the upload selector dialog 2013-10-10 17:54:44 +02:00
Neil Lalonde
c3fd79d61c Fix rendering of muted topic button 2013-10-10 11:26:20 -04:00
Sam
8afff108bf css.scss makes rails 4 sad 2013-10-10 15:23:14 +11:00
Sam
b490fd2f88 Merge pull request #1513 from velesin/computed_self_refactoring 
refactors Discourse.Computed to bind context to self
 2013-10-09 21:16:19 -07:00
Régis Hanol
3854c2d24f Merge pull request #1510 from velesin/model_refactoring 
refactors Discourse.Model
 2013-10-09 09:26:15 -07:00
Wojciech Zawistowski
708a55cb38 refactors Discourse.Computed to bind context to self 2013-10-09 18:24:33 +02:00
Wojciech Zawistowski
41a4f15d62 removes unused context binding from Discourse.Site 2013-10-09 18:06:48 +02:00
Wojciech Zawistowski
56a519c583 refactors Discourse.Model to bind context to self plus some minor clean-ups 2013-10-09 18:00:55 +02:00
Neil Lalonde
4a0b17bb16 Pressing enter in username field of login form will submit the form 2013-10-09 11:07:42 -04:00
Neil Lalonde
24598c80af Improve login modal on mobile 2013-10-09 10:16:22 -04:00
Robin Ward
8e6ae0e278 Only show filter button if the user has more than 2 posts 2013-10-08 15:44:36 -04:00
Neil Lalonde
bccb37b6f3 When creating a topic, don't select a category by default when allow_uncategorized_topics is false. Also, added category validation on the server to enforce allow_uncategorized_topics. 2013-10-08 14:41:20 -04:00
Neil Lalonde
32af23884e FIX: category validation in composer was still using categoryName instead of categoryId 2013-10-08 14:41:20 -04:00
Régis Hanol
94d68d2453 more vertical space in the upload selector dialog 2013-10-08 19:48:27 +02:00
Régis Hanol
2e5e6b8c15 better file upload dialog 2013-10-08 18:58:24 +02:00
Robin Ward
0bda906da4 Merge pull request #1494 from ScotterC/present-user-name 
Presenting name for user stream description
 2013-10-08 08:42:59 -07:00
Scott Carleton
256d82b916 Present Name for stream description 2013-10-08 11:40:16 -04:00
Robin Ward
50c74237cb Supress full name in expansion if it's the same as the username 2013-10-08 11:28:32 -04:00
Robin Ward
e7935d4263 Merge pull request #1501 from velesin/debounce_promise_tests 
adds unit tests for Discourse.debouncePromise
 2013-10-08 07:56:07 -07:00
Neil Lalonde
6713db7133 Close notifications dropdown on mobile after you click something 2013-10-07 16:11:54 -04:00
Robin Ward
cf4666d363 FIX: If the user asks for 0 similar topics, don't show an empty box 2013-10-07 15:14:01 -04:00
Robin Ward
744266374a FIX: Invalid i18n string appearing at bottom of topic 2013-10-07 15:01:51 -04:00
Robin Ward
6949bc6611 Make clickable area for progress much bigger on mobile 2013-10-07 14:41:17 -04:00
Robin Ward
75aaafc06e Don't show the user expansion on mobile 2013-10-07 14:32:15 -04:00
Wojciech Zawistowski
034d00b83a adds unit tests for Discourse.debouncePromise 2013-10-07 17:45:09 +02:00
Robin Ward
d2a1118e67 Make date on User expansion gray 2013-10-04 17:50:56 -04:00
Robin Ward
7da01e2389 Changes to user expansion 2013-10-04 16:55:54 -04:00
Robin Ward
7eac7303cd Better unloading of Poster expansion 2013-10-04 15:35:43 -04:00
Robin Ward
89e78f5c64 User expansion loading improvements 2013-10-04 15:33:03 -04:00
Robin Ward
d126259f03 Fixes #1496 - Ember 1.0 regression 2013-10-04 13:47:30 -04:00
Robin Ward
baa2ab8604 Small visual tweaks to user expansion 2013-10-03 16:12:17 -04:00
Robin Ward
db1f8370ee Don't show private message button when not logged in 2013-10-03 15:51:12 -04:00
Robin Ward
88476800f8 FIX: Private Message link was broken 2013-10-03 15:41:38 -04:00
Robin Ward
3cb6bb6c54 FIX: Missing username in link to user 2013-10-03 14:36:24 -04:00
Robin Ward
46219bbe02 Increase size of click target on topic progress 2013-10-03 14:33:57 -04:00
Robin Ward
fc00269b7f Pop up with user information when clicking avatar on topic page 2013-10-03 13:06:30 -04:00
Robin Ward
578ef2098b Merge pull request #1488 from cfstras/removeAllowedUser 
Allow removing users from private conversations
 2013-10-03 08:02:41 -07:00
Sam
ac56b119a7 refactor actions, try keeping them short so indenting does not confuse us 2013-10-03 16:01:52 +10:00
Claus Strasburger
15a973fd45 Improved private message user removal, locale edit 
replaced array iteration with findProperty (will be renamed and aliased to findBy with Ember 1.1)
added modal dialog to verify
catched nil-error on topic.rb
 2013-10-02 19:16:43 +02:00
Robin Ward
89c25d355d FIX: Progress bar not updating properly sometimes 2013-10-02 11:24:55 -04:00
Régis Hanol
af96ef2994 FIX: deleting a flagged post issue 
cf. http://meta.discourse.org/t/deleting-a-flagged-post-issue/10061

The bug was only happening when you were about the delete the first post, which means deleting the entire topic.
 2013-10-02 16:59:57 +02:00
Robin Ward
7caefded86 Merge pull request #1484 from velesin/resolver_refactoring 
refactors Discourse.Resolver
 2013-10-02 07:28:29 -07:00
Sam
ee286cc270 fix inability to save posts when navigated away, 
oh my ... what a mess, there must be a better way
 2013-10-02 16:18:16 +10:00
Sam
30bedff2c9 BUG: editing first PM was showing category selector 2013-10-02 07:43:57 +10:00
Robin Ward
9e815dbef9 FIX: Blockquote issue 2013-10-01 16:45:45 -04:00
Robin Ward
63d86eb9eb FIX: Allow Spoiler plugin (and others that use prototype.on) to work even if ListView was not initialized. 2013-10-01 13:53:26 -04:00
Robin Ward
be0ce08cc2 Ember Upgrade: 1.0 2013-10-01 11:16:27 -04:00
Claus Strasburger
b089805dc0 Added method removeAllowedUser to topic_details.js 
perform a request to /t/:id/remove-allowed-user,
then delete the user from the local list
 2013-10-01 16:44:07 +02:00
Sam
75a8dfc467 rename all css.scss to scss 2013-10-01 17:35:26 +10:00
Sam
f0a122a66c move job files so they live underneath app/ and not in lib/ 
introduce new setting email_always, that will force emails to send to users regardless of presence on site
 2013-10-01 17:04:02 +10:00
Robin Ward
ca0c41fd40 Merge pull request #1477 from velesin/remove_builders_from_merge_attributes 
removes unused builders param from Discourse.Model.mergeAttributes
 2013-09-30 10:07:50 -07:00
Wojciech Zawistowski
f388226217 refactors Discourse.Resolver 2013-09-30 18:18:03 +02:00
Tiffany Green
4d9dba6d27 Adjust css for user page to work at mobile sizes 
Style user page for mobile sizes

Remove guard

Bundle without guard

Remove guardfile
 2013-09-30 09:18:52 -05:00
Robin Ward
37304b7eba FIX: Too many new lines in long quotes 2013-09-27 15:08:56 -04:00
Wojciech Zawistowski
5905669270 removes unused builders param from Discourse.Model.mergeAttributes 2013-09-27 19:46:26 +02:00
Régis Hanol
cd4cda5b4c allow users to specify thumbnail size 2013-09-27 10:57:31 +02:00
Robin Ward
175e48b061 Revert "remove unnecessary (empty) view class" 
This reverts commit 58ba8a0e49.
 2013-09-22 10:38:41 -07:00
Robin Ward
a70e9cac4d Merge pull request #1452 from velesin/remove_application_view 
remove unnecessary (empty) view class
 2013-09-20 17:13:02 -07:00
Robin Ward
5bc0f7e9ee Merge pull request #1454 from awesomerobot/master 
mobile: fixed quote control jump
 2013-09-20 14:42:45 -07:00
Kris Aubuchon
67c2560f8c mobile: fixed quote control jump 2013-09-20 17:28:00 -04:00
Sam
13527a1df7 Merge pull request #1448 from velesin/remove_redundant_presence 
Remove duplicate mixing in of Discourse.Presence
 2013-09-20 14:22:10 -07:00
Wojciech Zawistowski
58ba8a0e49 remove unnecessary (empty) view class 
Discourse.ApplicationView does not provide any functionality above what
already automatically happens via Ember's "convention over
configuration" behavior and is therefore redundant.
 2013-09-20 17:52:38 +02:00
Robin Ward
e3a56864dd Changes to support Spoiler Alert plugin 2013-09-19 18:01:30 -07:00
Neil Lalonde
147887bc63 Remove duplicate list.js.handlebars 2013-09-19 16:52:57 -07:00
Neil Lalonde
5b455152d0 Add wrench icon to Edit Category button 2013-09-19 16:41:52 -07:00
Neil Lalonde
0a07b37ae9 Add email icon to password reset email button 2013-09-19 16:37:37 -07:00
Neil Lalonde
95257a192a Remove posts icon and make post count bold in mobile topic lists 2013-09-19 16:24:46 -07:00
Neil Lalonde
01180e78cc Use two lines per topic list item on mobile 2013-09-19 14:36:38 -07:00
Wojciech Zawistowski
7da10c0149 Remove duplicate mixing in of Discourse.Presence 
AdminEmailIndexController and AdminEmailPreviewDigestController explicitely mix in Discourse.Presence, but they extend base classes Discourse.Controller and Discourse.ObjectController that already mix in Discourse.Presence, so this explicit inclusion is redundant.
 2013-09-18 18:40:57 +02:00
Kris Aubuchon
79b8991ed8 fixing blockquote on mobile 2013-09-18 11:05:23 -04:00
Kris Aubuchon
c60912f714 mobile: blockquote title fix 2013-09-18 00:37:56 -04:00
Kris Aubuchon
05c4173723 mobile: suggested topics will now fill the viewport width 2013-09-17 23:46:12 -04:00
Kris Aubuchon
9808ae2970 mobile: reduce vertical space between posts, prevent titles from wrapping 2013-09-17 23:32:11 -04:00
Neil Lalonde
21b018192f Style categories page for mobile 2013-09-17 17:02:10 -04:00
Neil Lalonde
fdc7267ad9 Add margin to topic list footer message 2013-09-17 16:40:23 -04:00
Neil Lalonde
be71dbfd94 Topic list styling for mobile 2013-09-17 16:07:14 -04:00
Neil Lalonde
c04613f269 Fix resolver for mobile templates 2013-09-17 16:07:14 -04:00
Neil Lalonde
0fafe124db Add enable_mobile_theme site setting. Uncheck it to disable the mobile theme. 2013-09-17 11:25:37 -04:00
Robin Ward
2baf5fda8e Merge pull request #1438 from Elegios/composer_use_category_id 
Make the composer and TopicCreator use category id instead of category name
 2013-09-17 08:03:48 -07:00
Viktor Palmkvist
37673e3412 Make the composer and TopicCreator use category id instead of category name 
Also fixes #1171
Includes backwards compatibility for topic creation
 2013-09-17 12:13:19 +02:00
David Celis
279b1fbf48 Better padding for spoiler text 
With no padding currently surrounding [spoiler] text, the white text
gets close enough to the white post background that it's a bit more
difficult to read than it reasonably could be. Pad spoiler text with 2px
to alleviate this difficulty.

Signed-off-by: David Celis <me@davidcel.is>
 2013-09-16 12:49:38 -07:00
Neil Lalonde
e4e8d2fc34 Allow switching between mobile and desktop view on any device. 2013-09-16 14:26:20 -04:00
Neil Lalonde
13f17b2a5c Add ability to customize css and header for mobile 2013-09-16 12:28:02 -04:00
Sam
1eb1756dcf Merge pull request #1419 from mguillemot/non_editable_username_and_email 
Enable/disable the possibility of editing user's nickname or email
 2013-09-15 19:24:35 -07:00
Kris Aubuchon
045b1b0d96 fixed history modal, topic progress now sticky to last post, edits heatmap is back, date/edit links now grey 2013-09-14 23:28:28 -04:00
Matthieu Guillemot
3ba1f20674 New site settings to enable/disable the possibility of editing user's nickname or email address 2013-09-14 21:34:21 +09:00
Robin Ward
10c4dee67c Merge branch 'master' of git://github.com/awesomerobot/discourse into awesomerobot-master 
Conflicts:
	app/assets/stylesheets/mobile/topic-post.css.scss
	app/assets/stylesheets/mobile/topic.css.scss
 2013-09-14 00:39:08 -04:00
Kris Aubuchon
e1b11c62ea reintroducing the post progress indicator, fixing gutter links, reducing white space between posts 2013-09-13 23:03:29 -04:00
Robin Ward
5d8cfd69f7 FIX: JSHint errors 2013-09-13 12:29:57 -04:00
Robin Ward
7d9a84b496 New User Education goes through a server side ComposerMessages check. Composer message for users 
who don't have avatars.
 2013-09-13 12:23:53 -04:00
Neil Lalonde
32163bc356 Show post number in share dialog when clicking post date 2013-09-13 10:35:22 -04:00
Neil Lalonde
8f12212942 Remove duplicate css. Kris and I fixed the same thing. I imported variables.scss so we can use $red and $bookmarkColor 2013-09-12 18:08:12 -04:00
Neil Lalonde
e3c68bc500 Merge pull request #1432 from awesomerobot/master 
fixing bookmarks and blockquotes for mobile
 2013-09-12 14:41:15 -07:00
vagrant
4fbd011f39 fixing bookmarks and blockquotes for mobile 2013-09-12 16:00:53 -04:00
Neil Lalonde
90aaa27b98 Fix modal button spacing on mobile 2013-09-12 15:09:45 -04:00
Neil Lalonde
c260ae622d Fix closing a modal on mobile 2013-09-12 15:09:45 -04:00
Neil Lalonde
f0eede077d Show bookmark colours on mobile 2013-09-12 15:09:44 -04:00
Neil Lalonde
57dc8ed9f6 Add margin to auto-close message on mobile 2013-09-12 15:09:44 -04:00
Sam
fc203b7c2c fix broken text when clicking share at the bottom 2013-09-12 11:47:41 +10:00
Neil Lalonde
fe3693cdef Merge branch 'master' of github.com:discourse/discourse 2013-09-11 10:20:27 -04:00
Sam
def4f15795 Merge pull request #1427 from awesomerobot/master 
Reducing margins on mobile view
 2013-09-11 00:36:57 -07:00
Sam
8516059025 remove global check 2013-09-11 15:58:55 +10:00
Kris Aubuchon
a8bc789b81 reducing margins on mobile 2013-09-10 23:56:55 -04:00
Sam
681ff74cb8 Revert "inject currentUser into controllers & routes" 
This reverts commit 7ec34b205a.
 2013-09-11 13:26:46 +10:00
Neil Lalonde
e8ef55c446 Rename StaffActionLog to UserHistory 2013-09-10 22:01:20 -04:00
Robin Ward
30eed4c8b4 FIX: Showing suggested topics when composing a reply 2013-09-10 20:00:04 -04:00
Robin Ward
f2a1ef8d7d FIX: When expanding embedded replies, adjust the scroll position to not lose your place 2013-09-10 17:15:07 -04:00
Neil Lalonde
cc2acafc9a Enable mobile view. Use local storage to remember whether you chose mobile or desktop view. Mobile device detection needs to be replaced with a better solution. 2013-09-10 16:44:17 -04:00
Robin Ward
886787b157 Remove extra comma 2013-09-10 12:31:58 -04:00
Robin Ward
0de96a6059 Adds support for dynamic composer messages. 2013-09-10 12:30:56 -04:00
Robin Ward
84a8a358c3 Trivial: Rename dialect action to block quotes rather than simple quotes 2013-09-09 14:11:56 -04:00
Robin Ward
49910b860b FIX: Regression that removed the ability to quote code 2013-09-09 13:20:03 -04:00
Neil Lalonde
199584824b Don't show approval on admin user page if the site doesn't require approval of users (must_approve_users) 2013-09-09 12:24:26 -04:00
Robin Ward
360b8e32ca Merge pull request #1404 from ZogStriP/admin-can-always-upload-a-file 
staff can always upload a file
 2013-09-09 08:55:47 -07:00
Gosha Arinich
7ec34b205a inject currentUser into controllers & routes 
Through Ember's DI, instead of doing so via a mixin.
 2013-09-07 19:34:25 +03:00
Régis Hanol
eae30d7816 staff can always upload a file 2013-09-07 10:49:11 +02:00
Robin Ward
b87a78f7b2 Merge branch 'master' of github.com:discourse/discourse 2013-09-06 18:01:33 -04:00
Robin Ward
c8ad977c8a Revert "Merge pull request #1215 from Elegios/composer_use_category_id" 
This reverts commit 763859d439, reversing
changes made to b62caf80fb.
 2013-09-06 18:00:57 -04:00
Neil Lalonde
2ea6a61a17 Show post number in the share dialog 2013-09-06 17:34:31 -04:00
Robin Ward
a9f3489237 FIX: Don't onebox links with labels unless the labels are the same as the URL 2013-09-06 16:47:26 -04:00
Robin Ward
94917f47ed Remove brackets from username_filters[] URL 2013-09-06 15:58:54 -04:00
Neil Lalonde
eef34eea80 Fix IE9 bug in browser-update. Unable to get value of the property 'insertBefore': object is null or undefined 2013-09-06 14:57:26 -04:00
Robin Ward
763859d439 Merge pull request #1215 from Elegios/composer_use_category_id 
Make the composer and TopicCreator use category id instead of category name
 2013-09-06 11:55:27 -07:00
Robin Ward
b62caf80fb Merge pull request #1402 from LaunchAcademy/fix_index_out_of_range_error 
FIX: Index out of range error
 2013-09-06 11:53:59 -07:00
Régis Hanol
45b838009c proper content-disposition header when downloading attachments 2013-09-06 19:23:56 +02:00
Neil Lalonde
cbe38075ac Fix asset compile problems 2013-09-05 18:04:45 -04:00
Robin Ward
63be950e5f FIX: Quotes inside a list 2013-09-05 17:04:01 -04:00
Neil Lalonde
f47400fe2d Make post body have font-size 14px again 2013-09-05 16:45:38 -04:00
Neil Lalonde
9b526364ed Merge branch 'mobile' 2013-09-05 16:29:27 -04:00
Neil Lalonde
66d1cacdbd Hide flag modal while flag is submitted 2013-09-05 16:29:13 -04:00
Neil Lalonde
c0b3a0ec45 Merge .deleted-user-avatar into mobile topic-post 2013-09-05 16:28:16 -04:00
Robin Ward
38fb727c00 JSHINT: missing comma 2013-09-05 16:05:04 -04:00
Neil Lalonde
17585c7152 Merge branch 'mobile' of https://github.com/awesomerobot/discourse into mobile 2013-09-05 16:03:06 -04:00
Neil Lalonde
45d7765936 Merge branch 'master' into mobile 2013-09-05 15:54:22 -04:00
Robin Ward
2d6759d5a0 Add cancel button to delete replies dialog 2013-09-05 15:54:16 -04:00
Kris Aubuchon
b8493b024b adding missing files back in 2013-09-05 15:37:07 -04:00
Neil Lalonde
c2f37d36ab Hide flag modal while flag is submitted 2013-09-05 15:14:07 -04:00
Kris Aubuchon
80c4e02335 new mobile styles, some structure changes 2013-09-05 12:09:40 -04:00
Robin Ward
71c1b8b9b9 When deleting a post as staff, ask if you want to delete direct replies too 2013-09-05 11:03:34 -04:00
Robin Ward
f157ec1f91 Select +Replies for bulk operations 2013-09-05 11:03:29 -04:00
Neil Lalonde
117fc8db58 Change the way nuked users' posts are handled. Allow null in the user_id column of posts. Show these posts in the posts stream. 2013-09-04 15:42:21 -04:00
Sam
61d3e43744 better split logic for names starting with capitols eg: ABBob should split to AB Bob 2013-09-04 15:02:04 +10:00
Neil Lalonde
dc1efd6c78 If mobile view, don't switch to small logo in the header when scrolled down in a topic 2013-09-02 16:26:12 -04:00
Neil Lalonde
07e6956917 Restructure login form for mobile 2013-09-02 16:02:52 -04:00
Neil Lalonde
1fa6144067 Add span.btn-text around 'Reply' text in the post menu 2013-09-02 15:55:35 -04:00
Robin Ward
46efbac40e Add "Unread" filter to messages tab. Rename the other two views. 2013-08-30 12:32:05 -04:00
Robin Ward
63f2187d72 FIX: Don't do intraword italics when prefixed by a forward slash 2013-08-30 10:56:41 -04:00
Robin Ward
df5cbf76e0 Move insideGroup into the helper, not the class for grouped each 2013-08-30 10:44:34 -04:00
Eric Kelly
b70a38f485 FIX: Index out of range error 
Fixes 'index out of range error' that occurs when viewing a user's
profile page when they haven't yet posted a reply or created a topic
and is @mentioned in a topic.
 2013-08-30 00:43:54 -04:00
Neil Lalonde
82bc6b677f Add link in hamburger menu to switch between mobile and desktop views 2013-08-29 15:19:28 -04:00
Robin Ward
380a6c9e9d FIX: Blockquotes prefixed by spaces 2013-08-29 15:18:27 -04:00
Robin Ward
c99cf64d70 FIX: Quoting within code blocks. 2013-08-29 14:42:31 -04:00
Robin Ward
1204eb62c3 FIX: Escape contents when using the quote tool. 2013-08-29 14:15:05 -04:00
Robin Ward
45b9f8048a Documentation update to dialect 2013-08-29 13:59:41 -04:00
Robin Ward
eb5830f3b0 FIX: Make getURL available to plugins while they are starting up in a similar load order 
to the client app.
 2013-08-29 13:11:12 -04:00
Robin Ward
425b59d381 FIX: Don't name two routes the same. It breaks in Ember RC8. 2013-08-29 12:26:05 -04:00
Robin Ward
3cec95a2c3 Better API for parsing out blocks in the parser. 2013-08-29 11:47:44 -04:00
Sam
2c61828668 saving dialog somehow vanished during refactoring 
better error handling for posts that fail to save
 2013-08-29 17:06:27 +10:00
Neil Lalonde
4827634df9 rename application.css.erb to desktop.css.erb 2013-08-28 16:41:05 -04:00
Robin Ward
6029a77efb A nicer API for dealing with text replacements in Discourse's parser pipeline 2013-08-28 16:15:50 -04:00
Neil Lalonde
2b2c83ffb7 remove console.log 2013-08-28 15:53:42 -04:00
Neil Lalonde
c2088f5b5d Use moment.js in auto close js 2013-08-28 15:37:39 -04:00
Robin Ward
eeef24b9da Allow basic emoticons to work too. 2013-08-28 15:27:03 -04:00
Neil Lalonde
e3aafc154b Restructure the app/assets/stylesheets directory 2013-08-28 13:58:44 -04:00
Robin Ward
af18cc87fd Better documentation for new Dialect helpers. Migrated emoticon support to new helper format. 2013-08-28 13:55:08 -04:00
Robin Ward
550ef104c6 FIX: Markdown references within a list were not working properly. 2013-08-28 13:06:41 -04:00
Robin Ward
f7ad80ff7b A couple of important markdown fixes. 2013-08-28 11:14:31 -04:00
Sam
61281a3c81 invite only forums had very wonky logic, invited users were not being activated, invite_only forums were still registering users 2013-08-28 17:18:31 +10:00
Robin Ward
8f94760cd4 Better API for adding on to our Dialect 2013-08-27 18:17:34 -04:00
Régis Hanol
96772af35b FIX: avatar thumbnail won't save after upload 2013-08-27 23:01:35 +02:00
Neil Lalonde
b84c7e4efb Store mobile flag in Discourse.Session instead of Discourse 2013-08-27 16:50:50 -04:00
Neil Lalonde
3cfc9a7bba Create a mobile css manifest 2013-08-27 16:40:30 -04:00
Neil Lalonde
009dec833f Use Discourse.Resolver to load mobile templates when they exist 2013-08-27 13:41:36 -04:00
Robin Ward
73489b652e FIX: Allow intra-word underscores. 2013-08-27 12:25:05 -04:00
Neil Lalonde
89265c3a8b FIX: BAD CSRF on login. Don't check csrf in the fake login form since it doesn't actually do anything. 2013-08-27 11:31:14 -04:00
Robin Ward
07328e5e4b FIX: Navigating to a new topic after editing one was leaving edit controls open. 2013-08-27 11:29:30 -04:00
Sam
7787770758 leftover console.log 
jshint is upset
 2013-08-27 16:02:36 +10:00
Sam
c4a0152dc6 recover from bad CSRF tokens without requiring a hard refresh of the browser 2013-08-27 15:56:12 +10:00
Robin Ward
6c3cb9023c FIX: Allow backticks in code blocks 2013-08-26 16:53:10 -04:00
Neil Lalonde
068a674c39 Handle overflowing values on admin logs pages 2013-08-26 16:16:27 -04:00
Robin Ward
2d45c56ba5 Replace Markdown Linebreak Regexp with node parser. 2013-08-26 15:21:23 -04:00
Robin Ward
373b525ec1 Revert "FIX: New line insertion when a line begins with []" 
This reverts commit f84630a54d.
 2013-08-26 12:46:15 -04:00
Robin Ward
f84630a54d FIX: New line insertion when a line begins with [] 2013-08-26 11:42:52 -04:00
Sam
ac905d4a08 defer persona init till after people launch the login dialog 2013-08-26 17:51:41 +10:00
Sam
fd6e86483f strip out css fade-in animation from share dialog, it was only causing trouble. Fixing it is more hassle than it is worth. inivisible elements take height so we constantly need to worry about re-positioning the hidden share dialog. 2013-08-26 16:28:42 +10:00
Sam
0b74c2da9c fix jittering on click caused by re-positioning of invisible share dialog. it does not use display:none to preserve an animation. 2013-08-26 16:09:30 +10:00
Sam
818bf1355d PluginStore for plugin specific bits of storage 
Amended plugin interfaces so they work with the vk sample
 2013-08-26 12:59:17 +10:00
Sam
011d3cf779 minor style change 2013-08-26 12:55:13 +10:00
Régis Hanol
fd7fd22932 FIX: changing another user's avatar changes yours 2013-08-25 17:33:43 +02:00
Robin Ward
b32e87c929 Merge pull request #1377 from ZogStriP/avatar-work 
Improved specs for avatar + added a warning whenever the uploaded image is not a square
 2013-08-25 07:30:34 -07:00
Régis Hanol
4c788e75f0 add a warning whenever the uploaded image is not a square 2013-08-25 00:25:47 +02:00
Robin Ward
c0b051c9f6 Show Private Messages pill as a topic list rather than individual messages. 2013-08-24 16:58:16 -04:00
Robin Ward
20e8a8a38a FIX: Don't onebox @mentions 2013-08-24 15:01:00 -04:00
Robin Ward
5e286443a8 FIX: Code blocks were trimming leading spaces sometimes when they should have only 
trimmed trailing spaces.
 2013-08-24 13:24:27 -04:00
Robin Ward
093ead7855 Support for ***bold and italics*** 2013-08-24 13:06:07 -04:00
Robin Ward
08762f5666 Merge pull request #1369 from voisintotoro/voisintotoro-branch 
PNG Files optimization
 2013-08-24 08:32:15 -07:00
Neil Lalonde
6e79197519 Enum site settings can have translatable names in dropdown. Add setting for how often users get digest emails by default: default_digest_email_frequency. 2013-08-23 17:36:25 -04:00
Régis Hanol
43a8bff652 add a site setting for allowing animated avatars 2013-08-23 18:55:02 +02:00
Neil Lalonde
6a3c849067 Fix [object Object] in staff logs details modal 2013-08-23 10:08:35 -04:00
Jeff Atwood
f36fc8c41f remove unnecessary onebox body padding 2013-08-23 02:53:14 -07:00
Jeff Atwood
5cf0c59628 remove onebox info left padding 2013-08-23 02:48:55 -07:00
Neil Lalonde
25e0c3eac1 Log IP addresses with screened emails and urls 2013-08-22 19:04:35 -04:00
Robin Ward
612c0ccccb FIX: Autolinking within a list 2013-08-22 18:03:01 -04:00
Robin Ward
513f941f50 Fixes @mentions inside of lists 2013-08-22 17:50:36 -04:00
Robin Ward
f2c4b3e37f FIX: Following a mention with a coded mention. 2013-08-22 16:13:02 -04:00
Robin Ward
6fe0d29a01 FIX: @mentions within backticks followed by proper @mentions. 2013-08-22 15:55:29 -04:00
Robin Ward
5e50c4624f FIX: New lines in code blocks were somewhat unpredictable 2013-08-22 13:46:51 -04:00
Robin Ward
0f27232711 FIX: Support inline code blocks with @mentions in them. 2013-08-22 12:18:36 -04:00
voisintotoro
1983da14c3 PNG Files optimization 2013-08-22 14:00:25 +02:00
Robin Ward
ae93fcebde FIX: Autolines were duplicating some text 2013-08-21 22:49:55 -04:00
Robin Ward
a3757016d9 FIX: Quotes with new lines were broken 2013-08-21 22:36:02 -04:00
Sam
d7596840e5 only staff should be able to see bookmarks and favs of other users 
ensure that when they click on them they see the correct topics (topics for user they are looking at, not current user)
 2013-08-22 09:18:54 +10:00
Neil Lalonde
adbb6a19bb Fix 'You must choose a category' when a category is already chosen 2013-08-21 16:14:22 -04:00
Robin Ward
30cfa33629 FIX: @mentions within simple quotes 2013-08-21 16:10:16 -04:00
Neil Lalonde
e5464a4bed Show staff action log details in a modal 2013-08-21 12:33:24 -04:00
Neil Lalonde
47add6da70 Log when a site customization is deleted 2013-08-21 12:33:24 -04:00
Neil Lalonde
a95303fcd8 Log site customization changes. Use a modal to show staff action log details for site customizations. 2013-08-21 12:33:24 -04:00
Robin Ward
7f69a58439 Replace Markdown parser. 2013-08-21 10:10:57 -04:00
Robin Ward
3760cba549 Merge pull request #1366 from ZogStriP/do-not-disable-the-radio-button 
do not disable the radio button in the avatar selection modal
 2013-08-21 07:09:58 -07:00
Sam
8a0a097dfb make message bus more robust to bad inputs, correct issue where notifications channel is not susbcribed 2013-08-21 09:07:38 +10:00
Sam
487788b65b correct missing progress bar on navigation to new topic. 2013-08-21 08:37:30 +10:00
Robin Ward
7546a29d10 FIX: After sharing links and navigating long topics sometimes you'd have a lot of blank space. 2013-08-20 18:04:40 -04:00
Régis Hanol
9204e0f420 do not disable the radio button in the avatar selection modal 2013-08-20 22:54:01 +02:00
Régis Hanol
dcfe4f2061 remove useless text beneath avatar 2013-08-20 21:53:17 +02:00
Neil Lalonde
3abeb5f793 Staff action logs can be filtered to changes of one site setting 2013-08-20 13:50:51 -04:00
Sam
d43bd55e5b HACK: hold back on loading more topics for a bit while we are repositioning the page for Safari 2013-08-20 11:25:15 +10:00
Sam
341a28402d speed up scrolling on android 2013-08-20 11:25:15 +10:00
Jeff Atwood
58b7df5480 change edit to std pencil glyph on avatars 2013-08-19 15:07:48 -07:00
Sam
dca0b6b9b8 Merge pull request #1358 from chrishunt/bump-favcount 
Improve readability of count for complex favicons
 2013-08-19 14:58:57 -07:00
Régis Hanol
8107170f08 FIX: images in the preview have rounded corners 2013-08-19 23:45:55 +02:00
Neil Lalonde
1d030666d8 Log site setting changes and show in admin 2013-08-19 16:58:38 -04:00
Neil Lalonde
3cc8354fe2 Don't trust topic title in template until it has been sanitized by the server 2013-08-19 14:19:59 -04:00
Chris Hunt
53f011e89e Bump to favcount v1.1.0 2013-08-19 08:55:38 -07:00
Sam
a9393e4a7a paging for flag list 
corrected reload behavior on flag list
refactored post actions ... extracted flag queries
 2013-08-19 21:14:26 +10:00
Viktor Palmkvist
f8129c4e43 Make the composer and TopicCreator use category id instead of category name 
Also fixes #1171
 2013-08-19 11:57:35 +02:00
Sam
9b5da77855 correct broken logic in screen track that was causing read status not to flush properly when navigating using the suggested topics list. 2013-08-19 11:35:06 +10:00
Sam
4b0a1179e9 link to first unread as opposed to last read in topic lists 2013-08-19 11:34:08 +10:00
Sam
b69d089d06 we need to decalre favcount to keep tests happy 2013-08-18 21:52:13 +10:00
Chris Hunt
4372fc2f2e Switch out faviconNotify for favcount.js 2013-08-18 11:26:03 -07:00
Sam
3735cfdadb Merge pull request #1348 from chrishunt/dynamically-png-me 
Re-write dynamic favicon javascript
 2013-08-17 03:26:14 -07:00
Chris Hunt
ef7231a66f Add 32px image to default favicons (for retina) 2013-08-16 18:37:33 -07:00
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