Commit graph

5255 commits

Author SHA1 Message Date
Jeff Atwood
224ae7fc92 don't let topic-progress be selected 2014-06-27 15:28:22 -07:00
Vikhyat Korrapati
228a2a8992 Show number of grants on the admin badge pages. 2014-06-28 01:24:07 +05:30
Vikhyat Korrapati
0d16ae0ecf Fix typo. 2014-06-28 01:24:07 +05:30
Vikhyat Korrapati
83749779cc Add consistency check to revoke duplicate badges. 2014-06-28 01:24:00 +05:30
Vikhyat Korrapati
2e52f795ea Backend changes to support improved badge pages. 2014-06-28 01:24:00 +05:30
Robin Ward
386a45aab7 Merge pull request #2479 from vikhyat/badge-system
Badge system updates
2014-06-27 15:09:04 -04:00
Robin Ward
380bfd0819 Merge pull request #2478 from riking/patch-email
Fix email code & tests
2014-06-27 15:07:46 -04:00
riking
da9048f3ea Fix email code & tests 2014-06-27 12:04:31 -07:00
Vikhyat Korrapati
23983efeea Don't grant multiple_grant badges multiple times for the same post. 2014-06-28 00:32:09 +05:30
Robin Ward
85747137ef FIX: Put in admin title when browsing admin section 2014-06-27 11:58:46 -04:00
Robin Ward
c6e08deee2 Merge pull request #2477 from ligthyear/fix-outlet-double-render
Fix Plugin-Outlets: remove block from views so Ember doesn't complain
2014-06-27 10:26:11 -04:00
Benjamin Kampmann
b942dbfb43 remove block from views so Ember doesn't complain 2014-06-27 10:49:25 +02:00
Neil Lalonde
b69bc5a5f5 Trust level 3 measurements redone 2014-06-26 17:33:22 -04:00
Robin Ward
0289e60a25 Merge pull request #2476 from techAPJ/suppress-invite-search
FIX: show search filter only when invites are greater than or equal to ten
2014-06-26 15:02:24 -04:00
Arpit Jalan
46f734bb83 FIX: show search filter when invites are greater than ten 2014-06-27 00:22:08 +05:30
Régis Hanol
c0cd109e9d TRIVIAL: code formatting 2014-06-26 19:50:29 +02:00
Robin Ward
6907739a0b Merge pull request #2474 from techAPJ/add-topic-id-to-bulk-invite
FEATURE: Add topic invitation support to Bulk Invite
2014-06-26 13:30:30 -04:00
Arpit Jalan
dad2d34d02 Refactor methods post feedback 2014-06-26 22:50:09 +05:30
Robin Ward
07cb3aff97 We shouldn't have to redeclare tab panels in the category edit menu 2014-06-26 12:30:07 -04:00
Andrew Bezzub
386d1e231a move profile_background from User to UserProfile 2014-06-26 12:30:07 -04:00
Arpit Jalan
52f9984804 FEATURE: Add topic invitation support to Bulk Invite 2014-06-26 20:46:53 +05:30
Jeff Atwood
00910679ad more topic summary tweaks 2014-06-26 00:46:22 -07:00
Sam
24ddb6cfad FIX: Bold, italic should not expect a space boundary 2014-06-26 17:45:51 +10:00
Jeff Atwood
7a65ee3282 convert topic summary links to <table> 2014-06-26 00:08:29 -07:00
Sam
b8357aa90a BUGFIX: newline after bold was not producting a BR 2014-06-26 15:28:08 +10:00
Sam
dd8a06187a FIX: Invalid URLs cause post not to save 2014-06-26 11:38:23 +10:00
Kane York
6f5b58969b Only give necessary context 2014-06-25 17:01:23 -07:00
Sam
e05aa9bdc8 Stop spamming mods even on exceptional cases 2014-06-26 09:58:37 +10:00
Sam
67804cb56b Merge pull request #2465 from riking/email_rejections
Give specific message for each kind of email rejection
2014-06-26 09:55:24 +10:00
Robin Ward
2f710142f0 Use partials for category modal sections, components for pills 2014-06-25 16:12:35 -04:00
Robin Ward
983f4829f0 Merge pull request #2470 from techAPJ/refactor-bulk-invite
FEATURE: Add groups support to Bulk Invite
2014-06-25 16:08:06 -04:00
Arpit Jalan
b227f736f1 Refactor code and update specs 2014-06-26 01:34:26 +05:30
Neil Lalonde
b3ec88b016 Add plugin-outlets to the user profile page 2014-06-25 15:03:00 -04:00
Arpit Jalan
c2055732c7 FEATURE: Add groups support to Bulk Invite 2014-06-26 00:15:26 +05:30
Robin Ward
b21496e3fb ES6: Convert search views 2014-06-25 14:03:41 -04:00
Robin Ward
2e378e9980 Merge pull request #2469 from awesomerobot/master
horizontal scroll on search dropdown be gone!
2014-06-25 12:21:41 -04:00
Robin Ward
7f6bace7c5 FIX: In IE9 *shudder* the path will be incorrect and reloading the
latest posts will fail.
2014-06-25 12:09:47 -04:00
Kris Aubuchon
d280390cd3 horizontal scroll on search dropdown be gone! 2014-06-25 11:39:46 -04:00
Régis Hanol
ebb27860ac OOPS: remove debugger 2014-06-25 16:20:49 +02:00
Régis Hanol
4b0eb0e159 BUGFIX: share a link to a post instead of the topic 2014-06-25 16:20:06 +02:00
Sam
39b5539ba8 BUGFIX: downcase slugs 2014-06-25 11:36:17 +10:00
Sam
7e1bd88c33 BUGFIX: eliminate drafts for system user 2014-06-25 10:55:35 +10:00
Sam
d5d1473ced BUGFIX: better seperation of action from act too.
Also create spans for styling.
2014-06-25 10:39:55 +10:00
Sam
9f6102e137 BUGFIX: double loading of replies 2014-06-25 10:31:57 +10:00
Sam
fd52c88548 Add classes for styling 2014-06-25 09:47:12 +10:00
Sam
bbca684f6d BUGFIX: not updating tracking state after entering a topic
Occurs in 2 cases:

1. Change "Regular" to "Tracking" other browsers do not update
2. If you are set to track all new topics on enter.
2014-06-25 09:45:12 +10:00
Neil Lalonde
f8f0fb15e3 FIX: use the correct check isUncategorizedCategory in the js 2014-06-24 17:45:34 -04:00
Neil Lalonde
27fb65b562 Add uncategorized_description site setting 2014-06-24 17:45:34 -04:00
Robin Ward
39c2c958e6 ES6: ComposerView 2014-06-24 16:53:10 -04:00
Robin Ward
4b745612d8 FIX: Gaps weren't refreshing on refresh 2014-06-24 15:07:13 -04:00
Neil Lalonde
8762e6aa34 FIX: centre category-dropdown-menu text 2014-06-24 14:27:58 -04:00
Robin Ward
3521fb97e4 FIX: More safety for going back while stuff is uncloaking 2014-06-24 13:50:45 -04:00
Robin Ward
a7ad7f6a45 Remove some obscure HTML tags from sanitization 2014-06-24 11:03:45 -04:00
Neil Lalonde
f0932a7de8 FIX: like counts in suggested topics should use condensed number format 2014-06-24 10:36:17 -04:00
Jeff Atwood
d7fe4d4997 minor copyedit 2014-06-24 02:29:26 -07:00
Jeff Atwood
1513d5ecb1 css error 2014-06-24 01:01:37 -07:00
Jeff Atwood
eeb2e48f4f fix share link styles for mobile 2014-06-24 00:55:43 -07:00
Jeff Atwood
a7ce8c6418 move .cooked word-wrap: break-word into base CSS 2014-06-24 00:40:20 -07:00
Jeff Atwood
fa415cd120 de-duplicate <footer> ids 2014-06-24 00:12:07 -07:00
Sam
3c84876660 BUGFIX: Chinese search was broken
BUGFIX: User locale was used index data
BUGFIX: missing Norwegian fulltext config
FEATURE: store the text used to index stuff in fulltext (for diagnostics / in page search)
FEATURE: re-index posts when locale changes (in bg job)
FEATURE: allow reindexing by trucating post_search_data

Note: I removed japanese specific config cause it requires custom pg config,
  happy to add it once our base docker config ships with it
2014-06-24 17:11:13 +10:00
Jeff Atwood
51ff644409 stray <br/> in suggested-topics for spacing, kill it 2014-06-23 23:59:15 -07:00
Jeff Atwood
9e4ccfdf6d mobile needs un-boxed topic map too 2014-06-23 23:53:54 -07:00
Jeff Atwood
34d80464cf fix bottom of topic list h3 on mobile 2014-06-23 23:31:36 -07:00
Sam
c23a4fcbee FEATURE: flag resolution in admin screen 2014-06-24 13:20:57 +10:00
Sam
bd13fedba5 display probe function to help debugging mobile etc. 2014-06-24 12:04:04 +10:00
riking
420d3d651b Make sure from is present 2014-06-23 17:51:22 -07:00
riking
222db71dd7 Cleanup 2014-06-23 17:48:51 -07:00
riking
8b5d2b835a Add case for bad reply key 2014-06-23 17:46:22 -07:00
riking
d2823fc5ee More detailed email rejection responses 2014-06-23 17:17:53 -07:00
riking
edc17dddb3 Let's see if this works 2014-06-23 17:17:53 -07:00
Kris Aubuchon
6029ef960d moving more topic-list styles to base, aligning badges in poster expansion 2014-06-23 16:11:55 -04:00
Robin Ward
ff55a30dd7 FIX: <pre> blocks were adding too many new lines. 2014-06-23 15:21:07 -04:00
Robin Ward
68d323faaf FIX: Load order for non-ES6 2014-06-23 13:32:34 -04:00
Robin Ward
42d1fcbbc2 [code] should work just like other kinda of code formatting. 2014-06-23 13:19:27 -04:00
Robin Ward
07ae7435f2 ES6: Convert all button views 2014-06-23 12:37:38 -04:00
Robin Ward
d9fb5c4468 TRIVIAL: Remove border thickness from handlebars template. Just do the
color there.
2014-06-23 11:44:23 -04:00
Régis Hanol
211536e561 BUGFIX: buttons have a different size when clicked on FF (cc @awesomerobot)
cf. https://meta.discourse.org/t/browse-buttons-in-the-edit-history-have-a-different-size-when-clicked/16698
2014-06-23 17:39:35 +02:00
Robin Ward
823e32462d Merge pull request #2463 from awesomerobot/master
changing the tracking dropdown highlight for consistency
2014-06-23 11:27:46 -04:00
Régis Hanol
3181424d8e BUGFIX: can't ctrl+click post datestamps 2014-06-23 17:11:37 +02:00
Kris Aubuchon
32202e432a changing the tracking dropdown highlight for consistency 2014-06-23 11:04:54 -04:00
Régis Hanol
86b4f53777 TRIVIAL: remove commented file 2014-06-23 17:04:45 +02:00
Neil Lalonde
9e4fb383f0 FIX: make pm notification badge green on mobile 2014-06-23 10:51:11 -04:00
Neil Lalonde
6aa44fd412 Merge pull request #2461 from peternlewis/pop3s_polling_period_mins
Add a SiteSetting to control the pop3 polling period.
2014-06-23 10:48:40 -04:00
Régis Hanol
b0d1bd1c3a BUGFIX: properly enforce image dimensions on mobile 2014-06-23 15:54:56 +02:00
Jeff Atwood
fc12091a93 get rid of some needless (?) img styles on mobile 2014-06-23 01:17:23 -07:00
Jeff Atwood
26c8538e4c remove extra border on flags/flaggers td 2014-06-23 00:09:18 -07:00
Arpit Jalan
7e946a718e Make bookmarks menu appear all the time 2014-06-23 10:21:33 +05:30
Peter N Lewis
5da2eac1bb Add a SiteSetting to control the pop3 polling period.
The default 5 minutes may add too much lag for some sites used to mailing list performance.

Unfortunately, this seems to require restarting the server for the change to be noticed - is there any way to avoid that, or otherwise should this be noted in the setting text?
2014-06-21 15:57:49 +08:00
Neil Lalonde
3fb74fd880 FIX: list site settings with no choices will not show the 'No results found' dropdown 2014-06-20 18:03:11 -04:00
Neil Lalonde
c2efa0b3c3 FIX: styling of select2 inputs in site settings. make it wide enough so autocomplete dropdown is readable. 2014-06-20 18:03:11 -04:00
Neil Lalonde
84f9809a6f FIX: topic wrench button wasn't visible when there's a custom header 2014-06-20 18:03:11 -04:00
Jeff Atwood
d01ebbfe58 remove code/pre monospace override 2014-06-20 14:17:31 -07:00
Robin Ward
8a4e96645c FEATURE: Can click to expand hidden posts to see the good stuff! 2014-06-20 17:07:12 -04:00
Robin Ward
a2fec165d5 Disable editing of hidden posts within a timeframe from when the post
was initially hidden.
2014-06-20 15:38:03 -04:00
Robin Ward
3811efa5e2 Record when a post was hidden 2014-06-20 15:03:23 -04:00
Régis Hanol
533244f39d BUGFIX: link user to his/her profile in edit history 2014-06-20 19:46:51 +02:00
Robin Ward
3ac688d763 ES6: A couple of views 2014-06-20 13:29:11 -04:00
Régis Hanol
f297517055 BUGFIX: prevent invisible topic from being pinned or becoming a banner 2014-06-20 19:05:26 +02:00
Régis Hanol
f733237075 TRIVIAL: remove default 'Read more' link in the banner 2014-06-20 19:05:26 +02:00
Régis Hanol
4878d88cbd FEATURE: overlay the banner when reading a topic 2014-06-20 19:05:26 +02:00
Robin Ward
94de396b99 Merge pull request #2459 from riking/email
DEBUG: Send all email processing errors to admins
2014-06-20 12:52:50 -04:00
Robin Ward
f027563447 Add group icon to restricted parent categories 2014-06-20 12:50:13 -04:00
Robin Ward
56096619c0 FIX: Use secondary category color for stripes when only showing the
stripe.
2014-06-20 12:46:42 -04:00
riking
a7a28454a1 DEBUG: Send all email processing errors to admins 2014-06-20 09:31:19 -07:00
riking
2d5f667160 Make ?preview-style make sense
New behavior:
?preview-style=(sha) -- see that stylesheet
?preview-style= -- see the currently selected stylesheet
?preview-style=default -- see the default stylesheet ("rescue mode")
2014-06-20 09:06:36 -07:00
Neil Lalonde
d704991609 FIX: subcategory badge styling problems 2014-06-20 10:49:51 -04:00
Régis Hanol
00cc33c110 BUGFIX: link colors on topic lists 2014-06-20 10:26:59 +02:00
Jeff Atwood
db863c7d67 strip font-family from pre/code on mobile 2014-06-20 00:02:27 -07:00
Sam
7a2d64b27f Merge pull request #2422 from peternlewis/honor_email_always_even_if_read
Honor email_always even if notification has been read
2014-06-20 16:14:37 +10:00
Sam
56a04366ec Merge pull request #2431 from vikhyat/badge-system
Custom badge icons
2014-06-20 09:13:29 +10:00
Neil Lalonde
753610f8db Add meta generator tag with the Discourse version. Use a partial for common head elements. 2014-06-19 18:18:09 -04:00
Neil Lalonde
82693daa3d Put the 'Powered by Discourse...' message shown to crawlers and no-js visitors in a footer element so that SEO something something. 2014-06-19 18:18:09 -04:00
Neil Lalonde
eeeb834b6b FIX: strip html tags from category badge tooltips 2014-06-19 18:18:09 -04:00
Neil Lalonde
cefdb98b79 Make the Visit topic link a button in flags UI 2014-06-19 18:18:09 -04:00
Robin Ward
7ae4c4dedc COSMETIC: visual tweaks to the categories page 2014-06-19 17:11:45 -04:00
Jeff Atwood
dca10468d6 remove serif fallback from code,pre
this was about an ancient Safari / WebKit bug as I recall
https://www.webkit.org/blog/67/strange-medium/
2014-06-19 13:50:41 -07:00
Jeff Atwood
736ac30071 remove serif fallback for mobile pre/code blocks 2014-06-19 13:11:03 -07:00
Robin Ward
f0da4bf632 We don't need an empty app-events file. 2014-06-19 15:28:42 -04:00
Robin Ward
49ae01ddea TWEAK: Don't focus on progress expansion on touch interfaces. 2014-06-19 15:19:49 -04:00
Neil Lalonde
12a0260a8c FIX: show 404 page for links to categories that don't exists or you don't have access to, instead of showing blank page with js errors 2014-06-19 15:18:58 -04:00
Robin Ward
51b99c6453 Merge pull request #2457 from awesomerobot/master
handful of alignment fixes
2014-06-19 14:18:10 -04:00
Neil Lalonde
f0a0be1c2c Merge pull request #2454 from riking/mobile-logo
Allow a sepearate mobile logo URL
2014-06-19 14:14:32 -04:00
Kris Aubuchon
e4d90038cf handful of alignment fixes 2014-06-19 14:09:25 -04:00
Robin Ward
194b04917a ES6: A few more views 2014-06-19 12:48:04 -04:00
Neil Lalonde
7d58c43006 FIX: clearfix at bottom of customize/colors UI 2014-06-19 12:33:02 -04:00
Vikhyat Korrapati
3ba65af19e Add like-based system badges. 2014-06-19 17:10:43 +05:30
Vikhyat Korrapati
b5eea1d79f Grant system badges in a background job. 2014-06-19 17:10:37 +05:30
Vikhyat Korrapati
b3f403952b Move badge grant_count updating to the UserBadge model callbacks. 2014-06-19 16:56:19 +05:30
Vikhyat Korrapati
a68b47cb9f Add notification_id column to user_badges. 2014-06-19 16:56:19 +05:30
Vikhyat Korrapati
7daf584251 Add missing <tbody> tags. 2014-06-19 16:56:19 +05:30
Vikhyat Korrapati
cd766ed587 Use Em.computed.match. 2014-06-19 16:56:19 +05:30
Vikhyat Korrapati
41ecba1b77 Mark badge notification as read when the notification is clicked. 2014-06-19 16:56:19 +05:30
Vikhyat Korrapati
fcfc6177c2 Allow specifying URLs as badge certificates. 2014-06-19 16:56:19 +05:30
Vikhyat Korrapati
e0fd1f6f5e Add ability to specify custom font awesome icon for badges. 2014-06-19 16:56:18 +05:30
Vikhyat Korrapati
67a2b2598d Cosmetic changes. 2014-06-19 16:56:18 +05:30
Régis Hanol
62a73f48cc BUGFIX: first pass on default banner styling 2014-06-19 00:02:57 +02:00
Robin Ward
42c7ad4670 FIX: build broke, also escaping issue on poster name 2014-06-18 17:47:31 -04:00
Robin Ward
60cb5ea6a9 FIX: If a user is deleted, don't break embedded comments for admins. 2014-06-18 17:39:36 -04:00
Régis Hanol
08b8cacdb0 BUGFIX: ctrl+click on logo doesn't open site in new tab 2014-06-18 22:52:31 +02:00
Robin Ward
d919a405cb ES6: Refactor embedded post views 2014-06-18 16:00:54 -04:00
Robin Ward
61fb0f736b Micro optimizations to {{plugin-outlet}}.
* Don't create a `ContainerView` if there is only one connection.

* Don't create a virtual view if there are no connectors and the
  block form of the plugin isn't used.
2014-06-18 16:00:53 -04:00
Neil Lalonde
8f2d1f7020 Merge pull request #2452 from techAPJ/patch-glyph
remove computed property for progress bar glyph
2014-06-18 15:46:55 -04:00
riking
cd186aee56 Allow a sepearate mobile logo URL 2014-06-18 12:44:00 -07:00
Neil Lalonde
ad2bd11d6e Add a way to get user based on sso external id 2014-06-18 14:40:25 -04:00
Arpit Jalan
79f19b6cca remove computed property for progress bar glyph 2014-06-18 23:58:25 +05:30
Régis Hanol
86b989f2ba BUILD: make jshint happy 2014-06-18 20:07:14 +02:00
Régis Hanol
00117c18c3 FEATURE: dismissable banner topic 2014-06-18 20:05:19 +02:00
Régis Hanol
39aa87dedf REFACTOR: extract MessageBus dependent initializers 2014-06-18 20:05:18 +02:00
Régis Hanol
30611c343c ensures only one banner topic at all time 2014-06-18 20:05:18 +02:00
Régis Hanol
5238a95efb add make/remove banner topic actions 2014-06-18 20:05:18 +02:00
Benjamin Kampmann
2aabf4fdcd ip locator on ipinfo.io basis added to admin 2014-06-18 09:22:44 +02:00
Sam
806ddb4ccb FEATURE: Quote reply at cursor 2014-06-18 15:17:55 +10:00
Jeff Atwood
6cab36bc13 remove progress bar glyph on expand 2014-06-17 21:59:59 -07:00
Jeff Atwood
68809ba1b4 progress bar icon changes from Kris
https://meta.discourse.org/t/expandable-topic-progress-bar/16373/10?u=codinghorror
2014-06-17 21:41:31 -07:00
Sam
dc0266cc22 FEATURE: correct muted category implementation
- Don't change tracking state on muted categories
- Exclude muted sub categories from parent
2014-06-18 11:23:31 +10:00
Sam
b0f8b104d2 PERF: eliminate N+1 query 2014-06-18 11:21:53 +10:00
Sam
fed8f7c6f2 BUGFIX: muted categories showing up in new via message bus 2014-06-18 11:21:40 +10:00
Sam
9007d96466 Merge pull request #2425 from vikhyat/read-notifications-silently
Allow reading notifications without marking them as read
2014-06-18 08:09:07 +10:00
Vikhyat Korrapati
9b89b1466f Allow reading notifications without marking them as read. 2014-06-17 23:34:04 +05:30
Régis Hanol
43496958fe PERF: improve 'has_enough_topics_to_redirect_to_top' for high scale 2014-06-17 11:26:36 +02:00
Jeff Atwood
737cb47307 category numbers a wee bit too large
twss
2014-06-17 01:23:55 -07:00
Sam
62de1fc0fa BUGFIX: use trust_level_0 cause it is less than 15 chars 2014-06-17 18:13:07 +10:00
Sam
012923186b BUGFIX: CSS animation based spinner was buggy
There seems to be no sane way to get the CSS spinner to work without
hosing the stacking context. Use gif based spinner.
2014-06-17 17:55:00 +10:00
Sam
a288ff331d BUGFIX/FEATURE: call out context for search. 2014-06-17 17:53:45 +10:00
Sam
d85d34bac8 BUGFIX: use plugin outlet instead of custom code 2014-06-17 13:39:52 +10:00
Sam
983a22004a FEATURE: register_custom_field_type, support bool and integer 2014-06-17 12:42:12 +10:00
Sam
f8dec65b95 BUGFIX: setting title to aggressively 2014-06-17 11:32:59 +10:00
Sam
92772bbf1d BUGFIX: icons all red 2014-06-17 11:09:01 +10:00
Sam
1af8a2fb63 BUGFIX: keeping noscript in DOM 2014-06-17 11:01:48 +10:00
Sam
56dcd00570 BUGFIX: trust_level_0 group not including trust_level_1
BUGFIX: manual trust level change not adding user to groups
BUGFIX: system not in correct trust level groups
2014-06-17 10:52:02 +10:00
Sam
73a4309723 Merge pull request #2444 from riking/my-fix
Allow all /my URLs
2014-06-17 09:32:03 +10:00
Jeff Atwood
5db621c5fe normalize to search.title for search help 2014-06-16 16:20:57 -07:00
Jeff Atwood
a0d9dcce17 improve hint on admin user search 2014-06-16 16:17:41 -07:00
Robin Ward
eedb0df4fb ES6: Just a couple of views 2014-06-16 15:55:09 -04:00
Neil Lalonde
2cd55b1fa2 FIX: topics in private sub-categories were visible to everyone on the categories page 2014-06-16 15:12:14 -04:00
Robin Ward
d53ac36818 FIX: New action arriving in stream via message bus 2014-06-16 14:49:58 -04:00
Robin Ward
1147b9d2e5 Merge pull request #2408 from peternlewis/pop3_insecure
Support for insecure POP3 (without SSL)
2014-06-16 11:51:44 -04:00
Robin Ward
198fc3db56 Merge pull request #2449 from ligthyear/plugin-outlet-defaults
Plugin-Outlets-defaults for template overriding
2014-06-16 11:36:40 -04:00
Neil Lalonde
e2d8f04ec0 FIX: allow saving profile preferences when name field is blank 2014-06-16 11:23:15 -04:00
Neil Lalonde
1f17871b0c FIX: chrome password manager, for reals fix 2014-06-16 11:23:15 -04:00
Neil Lalonde
b702ad2d54 Don't disable the composer's submit button. Let it be clicked to cause validation error messages to show. 2014-06-16 11:23:14 -04:00
Robin Ward
88b5e78424 Merge branch 'add_custom_embed_by_username' of github.com:justinleveck/discourse into justinleveck-add_custom_embed_by_username
Conflicts:
	config/site_settings.yml
2014-06-16 10:52:15 -04:00
Benjamin Kampmann
22d93bc43a Let Plugin-Outlet Render inner template data
- allows passing of template data to the plugin-outlet to be rendered if no plugin is using that slot
 - acts as a fallback when no plugin is found
 - allows wrapping of existing features inside a plugin-outlet that then plugins can overwrite with their own behaviour
 - backwards compatible
 - uses invisible emberviews (as Ember.Component does)
 - the template has full-access to the controller and view, should be totally transparent
2014-06-16 15:10:10 +02:00
Sam Saffron
92d2912ff2 Revert "Bugfix: Mailing list mode disables PM emails"
This reverts commit 6a2dde6417.
2014-06-16 16:36:02 +10:00
Sam
1542854a93 Merge pull request #2420 from peternlewis/mailing_list_mode_disables_private_message_emails
Bugfix: Mailing list mode disables PM emails
2014-06-16 16:32:05 +10:00
Sam Saffron
03cde003db BUGFIX: no network could mean no posts save. 2014-06-16 12:14:51 +10:00
Sam Saffron
944cda1f73 BUGFIX: do not strip spaces from raw_hash of posts 2014-06-16 12:14:06 +10:00
Sam Saffron
6f88fc3aa3 HACK: disable undo/redo editor functionality
TODO in a few weeks, rip out all code.
2014-06-16 10:39:51 +10:00
Jeff Atwood
258c353307 Merge pull request #2445 from techAPJ/invitation-patch
Consider User trust level while showing Invites tab
2014-06-15 03:15:34 -07:00
Jeff Atwood
00e285f55b remove legacy (deleted) username under avatar 2014-06-15 01:32:05 -07:00
Arpit Jalan
42375866cc Consider User trust level while showing Invites tab 2014-06-15 13:21:10 +05:30
Jeff Atwood
30ee16a72b add glyph to remove invite button 2014-06-14 16:13:17 -07:00
Jeff Atwood
1b3180f916 better copy for site and topic invites 2014-06-14 15:49:19 -07:00
riking
6e698315d6 Allow all /my URLs
Previously, URLs like /my/activity/posts were denied. This change allows those URLs.
2014-06-14 10:58:20 -07:00
Robin Ward
6f8888d405 XSS: Topic links needed sanitization 2014-06-14 12:53:48 -04:00
Robin Ward
dc6f30dd94 Don't focus on text field in mobile view when tapping the progress 2014-06-14 11:51:15 -04:00
Robin Ward
fb639bc5f9 FIX: Remove extra setting of view 2014-06-13 16:42:18 -04:00
Neil Lalonde
c1f9d76323 Don't disable the Sign In button in the sign in modal 2014-06-13 16:07:28 -04:00
Robin Ward
3c8a610f73 Extra safety to the post stream. Don't return undefined if we can't
retrieve a post for some reason.
2014-06-13 16:00:39 -04:00
Robin Ward
929a195c5d Merge pull request #2442 from techAPJ/add-tooltip-to-glyph
Add tooltip to Admin & Moderator glyph
2014-06-13 15:19:24 -04:00