Commit Graph

15652 Commits

Author SHA1 Message Date
Sam
dd3c685d39 Merge branch 'master' of github.com:discourse/discourse 2015-08-20 12:23:16 +10:00
Régis Hanol
9ae9aed010 FIX: change **default** notification state when a topic is recategorized within 5 days of creation 2015-08-19 22:40:20 +02:00
Régis Hanol
eafeec51a5 FIX: don't show current topic when moving posts to another topic 2015-08-19 21:40:43 +02:00
Robin Ward
00c9469fba FIX: Don't include admin in non-admin and vice versa 2015-08-19 15:12:15 -04:00
Régis Hanol
ffb0690119 FIX: edit history navigation issues 2015-08-19 21:10:12 +02:00
Robin Ward
42cb1fcaf6 FIX: Embed now needs mixins 2015-08-19 14:14:39 -04:00
Robin Ward
aa36671de3 Lighten code blocks 2015-08-19 13:30:16 -04:00
Robin Ward
54c0bea294 Darken asides on a dark theme. Create a mixin to DRY things up. 2015-08-19 13:27:41 -04:00
Robin Ward
e2c9e11dd9 Merge pull request #3662 from b-studios/include-options-in-serialization
Use userfield serializer in json dump
2015-08-19 12:16:25 -04:00
Robin Ward
6d6b41dbcc Merge pull request #3660 from tgxworld/wrong_message_on_rate_limit
FIX: Rate limit message not shown.
2015-08-19 12:14:51 -04:00
Robin Ward
4062e4a464 Merge pull request #3671 from riking/css-cleanup
CLEANUP: Coalesce repeated CSS properties
2015-08-19 12:13:49 -04:00
Robin Ward
cdc3fdae5d Merge pull request #3677 from YesThatAllen/patch-2
fix for links in smtp providers
2015-08-19 12:12:40 -04:00
Robin Ward
5c7056c15c Merge pull request #3675 from ligthyear/patch-2
Replace unused showNames-if with new plugin-outlet on user-cards
2015-08-19 12:11:46 -04:00
Robin Ward
abd9b26642 Convert Badges / User Badges to ES6. 2015-08-19 12:09:10 -04:00
Allen Hancock
dfd33c849d fix for links in smtp providers 2015-08-19 10:20:55 -05:00
Robin Ward
113e8d62ba FIX: Looks like a celluloid release was pulled 2015-08-19 10:14:29 -04:00
Régis Hanol
fadd6582af Merge pull request #3674 from tgxworld/increment_posts_count_when_closing_topic
FIX: Closing and opening topic should increment posts count.
2015-08-19 12:58:51 +02:00
Benjamin Kampmann
a9c25afc29 Replace unused showNames-area with new plugin-outlet 2015-08-19 12:44:12 +02:00
Guo Xiang Tan
23c4b51805 FIX: Closing and opening topic should increment posts count. 2015-08-19 18:12:09 +08:00
Régis Hanol
3ba929de9a Merge pull request #3669 from tgxworld/fixes_for_destroy_recover_post
Fixes for destroy recover post
2015-08-19 11:37:42 +02:00
Régis Hanol
efd7fbd49d Merge pull request #3672 from tgxworld/add_plugin_outlet_beside_poster_name
Add a plugin outlet beside the poster's name.
2015-08-19 11:36:30 +02:00
Jeff Atwood
f1a2a46e70 Merge pull request #3673 from dandv/patch-2
Mandrill silently stopped offering free accounts
2015-08-19 00:26:54 -07:00
Dan Dascalescu
872675c5b1 Mandrill silently stopped offering free accounts 2015-08-19 00:18:24 -07:00
Guo Xiang Tan
5f5933b4bb Add a plugin outlet beside the poster's name. 2015-08-19 15:05:49 +08:00
Sam
2203a4147d add some extra diagnostics 2015-08-19 16:58:25 +10:00
Sam
9364194f36 cut out an exception 2015-08-19 16:57:26 +10:00
Sam
157b118559 FIX: pointless error in log when failing to save post
rate_limit gets fired for rollback on in which case there is not post_number
2015-08-19 16:28:04 +10:00
Sam
f1bce927b3 Merge pull request #3670 from riking/dark-theme-fix
Dark theme fixes, part 3
2015-08-19 15:25:41 +10:00
Kane York
2f595f27e9 CLEANUP: Coalesce repeated CSS properties 2015-08-18 22:02:33 -07:00
Kane York
7ede107be9 FIX: User directory dark theme 2015-08-18 21:45:05 -07:00
Kane York
c4e5594826 FIX: Keyboard shortcuts dark theme 2015-08-18 21:42:41 -07:00
Kane York
7ee0ee6769 Optimize CSS properties 2015-08-18 21:40:19 -07:00
Kane York
f7b024eafe FIX: User profiles
Note on removing the color: $secondary - I did a test with browser inspector by
turning the text pink. The only text affected was 'helpful flags', which I
fixed below.
2015-08-18 21:35:25 -07:00
Guo Xiang Tan
33260f3203 FIX: Errors raised for recovering post not being handled. 2015-08-19 10:48:35 +08:00
Sam
82a6176b08 lower the volume on failed to pull hotlinked image
add more diagnostics
2015-08-19 12:32:45 +10:00
Sam
5f5d055a86 only if \u0000 is included for the perf 2015-08-19 12:32:45 +10:00
Sam
431def1f52 need to dup strings, some may be frozen 2015-08-19 12:32:45 +10:00
Neil Lalonde
71644add2f add plugin-outlet at end of site-map 2015-08-18 22:26:18 -04:00
Sam
714f841f0a FIX: null bytes in user input should not cause post creation to fail 2015-08-19 12:15:38 +10:00
Sam
c493f82907 cleaner fix 2015-08-19 11:54:12 +10:00
Sam
feed822c48 FIX: grant badge dialog not working 2015-08-19 11:51:29 +10:00
Guo Xiang Tan
019191a944 FIX: undoDeleteState() should restore delete button. 2015-08-19 09:31:09 +08:00
Sam
c20b3b85f9 Merge pull request #3664 from tgxworld/use_popupAjaxError
Use ajax-error in controller:topic.
2015-08-19 09:29:36 +10:00
Sam
b38a1309f7 FIX: add more quoting to avoid invalid terms 2015-08-19 09:27:47 +10:00
Sam
27b1ec2917 FIX: incorrect emoji stripping logic 2015-08-19 09:12:08 +10:00
Sam
c2197de11e upgrade logster to resolve error forwarding issue 2015-08-19 08:54:16 +10:00
Kane York
689449b233 FIX: Post highlight on mobile dark theme 2015-08-18 15:51:50 -07:00
Kane York
75f7631367 FIX: Small-actions in dark theme 2015-08-18 15:20:19 -07:00
Sam
08ce974b3a Merge pull request #3667 from riking/dark-theme-fix
Dark theme fixes, part 2
2015-08-19 08:15:47 +10:00
Kane York
924e67af9d FIX: Header icons should be header_primray in dark theme 2015-08-18 15:11:49 -07:00