Régis Hanol
a566657d7a
Merge pull request #2960 from awesomerobot/master
...
simplifying the spinner due to IE/Win Chrome issues
2014-11-11 15:50:41 +01:00
Kris Aubuchon
6ca555eee0
simplifying the spinner due to IE/Win Chrome issues
2014-11-11 09:22:14 -05:00
Régis Hanol
58f46642dd
FIX: don't put the footer insider container in topic page
2014-11-11 12:05:50 +01:00
Régis Hanol
a1f56183ca
FIX: don't put the footer inside a container (allow for full width footers)
2014-11-11 11:37:59 +01:00
Sam
4e85fc9dae
PERF: cache all site_text in memory
2014-11-11 16:28:59 +11:00
Sam
b2af49251d
PERF: remove superflous queries from initial page loads
...
stop doing expensive work to figure out discourse style sheet
2014-11-11 15:32:44 +11:00
Sam
23ad68678e
rails master fixes
2014-11-11 12:58:56 +11:00
Sam
4e1c5177db
update rails master
2014-11-11 10:32:47 +11:00
Sam
34180eba93
FIX: official benchmark crashing while populating db
2014-11-11 10:28:17 +11:00
Sam
1a775aa784
Merge pull request #2784 from chancancode/upgrade-to-rails-master-4-2
...
[WIP] Upgrade to rails master/4.2
2014-11-11 09:46:02 +11:00
Sam
37aada7e6a
Merge pull request #2952 from joshk/patch-2
...
faster and more stable bundle installing
2014-11-11 09:30:31 +11:00
Régis Hanol
988835a9a3
FEATURE: users can see the raw email source of their own posts
2014-11-10 22:00:17 +01:00
Régis Hanol
ec76be964e
UX: better footer handling
2014-11-10 21:51:55 +01:00
Robin Ward
c89064f7c0
Merge pull request #2901 from JKillian/patch-1
...
Add additional fields that indicate reply
2014-11-10 15:44:14 -05:00
Robin Ward
f414020be8
FIX: New topics were not showing in suggested
2014-11-10 15:20:01 -05:00
Robin Ward
a6b1be81b1
Upgrade to Ember 1.7.1 + group patch
2014-11-10 14:49:02 -05:00
Robin Ward
c32df362d4
Add loading template for routes that return promises
2014-11-10 13:07:49 -05:00
Robin Ward
e1d26736b2
FIX: Missing tab delegation
2014-11-10 12:04:16 -05:00
Robin Ward
9f127d8183
UX: Focus on the user card when it's rendered
2014-11-10 11:31:28 -05:00
Robin Ward
bfa5835025
Merge pull request #2957 from techAPJ/patch-1
...
add user title in exported csv
2014-11-10 10:11:24 -05:00
Sam
6a42588007
remove X from search in ie
2014-11-10 21:31:15 +11:00
Sam
d77f218122
Don't try to publish messages on broken posts
2014-11-10 21:24:54 +11:00
Sam
2920cfc319
fix excerpt code
2014-11-10 21:08:01 +11:00
Godfrey Chan
5cc9f5bff5
Add RAILS_MASTER to the travis build matrix
2014-11-10 01:05:47 -08:00
Godfrey Chan
b4679075de
Upgrade to the latest AMS 0.8.x (unreleased)
...
The current released version (0.8.2) does not work with Rails master at all. In
fact, it was quite surprising to me that this is the only test that broke...
See https://github.com/rails-api/active_model_serializers/pull/655
2014-11-10 01:05:47 -08:00
Godfrey Chan
4d188ca5b0
Added back the last_use timestamp to the AbstractAdapter
...
This was removed in 9e457a8654
2014-11-10 01:05:47 -08:00
Godfrey Chan
bddaf8193a
HAX: check the message object, not the MessageDelivery object
...
See 669bf73 for background. It's probably better to rewrite these test without
using the internal `NullMail` class anyway.
2014-11-10 01:05:47 -08:00
Godfrey Chan
5d7aca3cc6
Use *_url instead of *_path to avoid a deprecation warning
2014-11-10 01:05:47 -08:00
Godfrey Chan
f749961d97
Sprockets::Context takes a Pathname for its third argument
...
As far as I can tell, sprockets has always expected the third argument to be a
`Pathname` object. Not sure what actually changed and why it was working before,
but it now throws a `NoMethodError` for `dirname` on `String` in
`Context#resolve`
# , not sure why this was working before
2014-11-10 01:05:47 -08:00
Godfrey Chan
568ed3beaa
HAX: force the lazy MessageDelivery object to create the mailer
...
Starting from Rails 4.2, calling MyMailer.some_method no longer result in an
immediate call to MyMailer#some_method. Instead, a "lazy proxy" is returned
(this is changed to support #deliver_later). As a quick hack to fix the test,
calling #message (or anything, really) would force the Mailer object to be
created and the method invoked.
2014-11-10 01:05:46 -08:00
Godfrey Chan
b1a0cd417d
Avoid a deprecation warning by poly-filling #deliver_now and #deliver_now
2014-11-10 01:05:46 -08:00
Godfrey Chan
7351917ee4
Boolean -> String quoting has changed on Rails master
...
CustomField.create(name: 'zomg', value: true).reload.value # => 't' on Rails 4.1, '1' on 4.2
rails/rails@42be84ba
2014-11-10 01:05:46 -08:00
Godfrey Chan
f955ec6018
Use Rails 4.2+ API for typecasting on master
...
Note: this is still considered a private (internal) API on Rails side and is
subject to change in the future.
2014-11-10 01:05:46 -08:00
Godfrey Chan
84d4307b1c
actionpack-action_caching was released a long time ago
2014-11-10 01:05:46 -08:00
Godfrey Chan
903b505394
Rebuild Gemfile_master.lock based on the lastest Gemfile.lock
2014-11-10 01:05:46 -08:00
Jeff Atwood
a90176550c
let's try no table border on email digests
2014-11-10 00:54:59 -08:00
Sam
283720bb30
Merge pull request #2959 from awesomerobot/master
...
fixing very bizarre Safari 8.0 bug on title input
2014-11-10 11:37:29 +11:00
Kris Aubuchon
00bb72f52d
fixing very bizaare Safari 8.0 bug on title input
2014-11-09 19:26:22 -05:00
Jeff Atwood
435cd37021
copyedits; email image auto for > 250 width/height
2014-11-09 01:27:09 -08:00
Arpit Jalan
0ea1ad4785
add user title in exported csv
2014-11-08 20:07:22 +05:30
Jeff Atwood
e669fed8ea
increase auto email img width threshold to 50px
2014-11-07 14:34:15 -08:00
Robin Ward
0777efe74d
FIX: 1000 was a crazy threshold for showing categories at the bottom of
...
digests
2014-11-07 17:16:52 -05:00
Robin Ward
bfe2021859
UX: In digest email lists of topics, show striped version of category
...
badge
2014-11-07 17:00:09 -05:00
Robin Ward
872cfff49b
FIX: Shouldn't overwrite styles in emails that we explicitly set, like category
...
colors.
2014-11-07 16:42:57 -05:00
Robin Ward
5defaca197
FIX: Don't use auto sizes for very small images (emoticons)
2014-11-07 16:09:16 -05:00
Robin Ward
8199c3b440
Don't add the g flag
2014-11-07 12:09:45 -05:00
Robin Ward
0044a99000
Don't raise an error for global regexps; warn the plugin author instead.
2014-11-07 12:04:44 -05:00
Neil Lalonde
60578afefd
Merge pull request #2888 from lidel/emoji-pl-locale
...
Add pl_PL locale for emoji plugin
2014-11-07 11:57:26 -05:00
Robin Ward
564e7a988c
Merge pull request #2848 from riking/whitelist-api
...
Improve Markdown.whiteListTag, code dialect
2014-11-07 11:33:37 -05:00
Robin Ward
d6ff1630a8
Merge pull request #2898 from kellec/remove_focus_link_href
...
Remove href attribute from tab link to prevent duplicate event on enter.
2014-11-07 11:01:06 -05:00
