Commit Graph

11981 Commits

Author SHA1 Message Date
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
Robin Ward
6f7cf8599f Merge pull request #2949 from fantasticfears/master
css tweak - expanding some room for zh_CN
2014-11-07 10:55:55 -05:00
Robin Ward
40900e59d1 Merge pull request #2955 from riking/include_raw_2
FEATURE: ?include_raw parameter for /t/id/posts.json
2014-11-07 10:50:15 -05:00
riking
d7a4e39e1d FEATURE: ?include_raw parameter for /t/id/posts.json
include_raw is not added for the wordpress view because it uses the
BasicPostSerializer, and is not a one-line change.

This is the only use of the TopicViewPostsSerializer class, and the
previous change covered the only use of the TopicViewSerializer class.
No other locations include the PostStreamSerializerMixin. Therefore,
this feature is most likely complete.
2014-11-07 07:28:07 -08:00
Régis Hanol
0380b42d25 Merge pull request #2954 from mcwumbly/rspec-deprecations
update specs to remove deprecation warnings
2014-11-07 15:08:45 +01:00
David McClure
efc4109902 update specs to remove deprecation warnings 2014-11-07 06:05:44 -08:00
Régis Hanol
2b8ab560e9 Merge pull request #2953 from mcwumbly/add-perf-to-release-notes
Include perf improvements in release notes
2014-11-07 15:02:15 +01:00
David McClure
844b92bf12 Include perf improvements in release notes
Add ability to specify 'from' and 'to' tags in rake task
2014-11-07 04:01:44 -08:00
Josh Kalderimis
e1eea7e73d oops, missed some -- 2014-11-07 17:05:24 +13:00
Josh Kalderimis
19b36dea43 faster and more stable bundle installing 2014-11-07 17:03:16 +13:00
Sam
067f552cd5 Merge pull request #2951 from joshk/patch-1
some possible improvements to build times
2014-11-07 14:43:05 +11:00
Josh Kalderimis
bca5c2192a looks like db:migrate is required 2014-11-07 14:10:17 +13:00
Josh Kalderimis
a687c32cc7 make the env vars global 2014-11-07 14:04:32 +13:00
Josh Kalderimis
970417e328 some possible improvements to build times
- use our new infrastructure based on LXC and EC2
- enable caching for bundler
- use schema:load (best practice)
- use --deployment (best practice when a Gemfile.lock is around)
2014-11-07 14:03:08 +13:00
Jeff Atwood
9f6a0cb126 minor style tweaks to file upload modal 2014-11-06 14:17:52 -08:00
Robin Ward
76f68e23e8 FIX: Strip the word "SECURITY" from the output too 2014-11-06 16:05:13 -05:00
Robin Ward
9e55215c71 FIX: Include security in release notes 2014-11-06 16:02:26 -05:00
Robin Ward
1333378f39 FIX: Don't include reverts in release notes 2014-11-06 16:02:26 -05:00
Neil Lalonde
8959ed9031 Version bump to v1.2.0.beta1 2014-11-06 15:50:44 -05:00
Neil Lalonde
e210e08e95 Version bump to v1.1.0 2014-11-06 15:35:56 -05:00
Neil Lalonde
361aca1156 merge master 2014-11-06 15:26:38 -05:00
Neil Lalonde
1565bd5e67 Update translations 2014-11-06 15:16:58 -05:00
Régis Hanol
684eb4045b Merge pull request #2950 from awesomerobot/master
some cleanup for new usercards on dark themes
2014-11-06 18:10:26 +01:00
Kris Aubuchon
5c84c74a69 some cleanup for new usercards on dark themes 2014-11-06 11:33:30 -05:00
Robin Ward
3b699daec3 UX: Fix some weird margins/padding when zoomed in on user profiles 2014-11-06 11:31:06 -05:00
Erick Guan
951b6e6bb8 css tweak - expanding some room for zh_CN 2014-11-06 22:06:21 +08:00
Jeff Atwood
9ae7c3c595 address odd user card issue with buttons 2014-11-06 03:29:24 -08:00
Jeff Atwood
8e38c129c5 minor login copy tweaks 2014-11-06 02:27:27 -08:00
Régis Hanol
bb2d538194 FEATURE: log impersonations 2014-11-06 10:58:47 +01:00
Sam
246f77c98d tweak positioning when it has no room to right 2014-11-06 16:25:40 +11:00
Sam
e3bfc2e447 correct positioning of user card on sites with custom headers
fix regression (can not click on links in card)
2014-11-06 13:00:21 +11:00
Jeff Atwood
30ce67f689 Merge pull request #2947 from awesomerobot/master
updated loading spinner
2014-11-05 17:24:07 -08:00
Kris Aubuchon
a0e5605869 updated loading spinner 2014-11-05 20:13:51 -05:00
Sam
9c81f2c6af remove duplicate code
fix issue where clicking on
the same user in 2 locations on the page would not work correctly

centralize logic
2014-11-06 12:13:46 +11:00
Sam
7b484937d0 minor debouncing fixes for user card 2014-11-06 10:30:38 +11:00
Jeff Atwood
20fa95801c tighten up flag copy for off-topic and notify mods 2014-11-05 14:19:50 -08:00
Régis Hanol
3d94808c00 UX: add the word it's before standard spam names to form a complete sentence 2014-11-05 22:46:07 +01:00
Régis Hanol
d104b72aee UX: remove 'ago' from user streams 2014-11-05 21:53:16 +01:00
Robin Ward
b328d47628 FIX: fa- check was incorrect on user card 2014-11-05 15:19:08 -05:00
Robin Ward
a0e92ef57a FIX: PageTracker was not sending the proper page title through at all
times.
2014-11-05 15:15:58 -05:00
Robin Ward
2d9187cd9d Admin controls to select a date range for reports 2014-11-05 14:46:44 -05:00
Régis Hanol
a5616146eb FIX: remove meta data from lightbox in both excerpt (html & text) 2014-11-05 20:37:00 +01:00
Robin Ward
e79c1c23d9 Show CSV groups on user profile 2014-11-05 14:05:16 -05:00
Robin Ward
068d22e9b3 Add API support for querying admin reports by date range 2014-11-05 13:11:37 -05:00