Commit graph

6006 commits

Author SHA1 Message Date
Sam
05a3c8090f Merge pull request #1658 from salbertson/sa-refactor-users-controller-create
Refactor UsersController#create
2013-12-12 22:16:50 -08:00
Sam
96fdf72d5e rails master compatability 2013-12-13 17:04:45 +11:00
Sam
8ccab6d140 Got rid of buggy yepnope spaghetti, however mobile detection really should be driven from the server. 2013-12-13 15:17:05 +11:00
Régis Hanol
1884bd959f make sure extension-based oneboxes are first to run 2013-12-13 00:56:48 +01:00
Régis Hanol
6641230b7f Merge pull request #1733 from voisintotoro/newmaster2
Updated French translation and fixed the fr_FR: to fr:
2013-12-12 15:02:05 -08:00
Neil Lalonde
eadf5e9b02 Move columns around on wide categories page 2013-12-12 17:27:25 -05:00
voisintotoro
cb7de5d2de Updated French translation and fixed the fr_FR: to fr: 2013-12-12 23:17:43 +01:00
Neil Lalonde
50bd05663c Fix category ordering on categories page. I broke it. 2013-12-12 17:13:35 -05:00
Robin Ward
b41ee7256e Support for importing Disqus posts into a category 2013-12-12 16:31:24 -05:00
Neil Lalonde
ee5637d4ff FIX: font-awesome issue on site settings buttons 2013-12-12 16:09:44 -05:00
Neil Lalonde
9f9852a8dd FIX: broken font-awesome icons on user activity pages 2013-12-12 16:07:34 -05:00
Neil Lalonde
52cf27b0a6 FIX: layout problems on categories page 2013-12-12 15:52:36 -05:00
Neil Lalonde
6fa2e68742 Show more than one topic per category on the wide categories page. Disable support for the 2-column categories page. The category_featured_topics site setting controls how many topics to show. 2013-12-12 15:52:30 -05:00
Sam
50c4e3707b Merge pull request #1731 from chancancode/no_more_scoped_in_rails_4_1
✂️ scoped for Rails 4 compat
2013-12-12 12:38:57 -08:00
Robin Ward
fcad3b8119 Experimental: Disqus XML importer 2013-12-12 15:36:19 -05:00
Régis Hanol
cf44b9e9d9 add image dimensions & size in lightbox 2013-12-12 17:39:20 +01:00
Régis Hanol
c7741c9622 FIX: absolute canonical link on topic pages 2013-12-12 17:24:00 +01:00
Régis Hanol
dd93407789 FIX: images should also be inlined in the cooked view 2013-12-12 16:57:56 +01:00
Régis Hanol
1457a3792d that fix should have been in the emoji plugin 2013-12-12 16:42:27 +01:00
Régis Hanol
be835785f8 FIX: allow new user to post emojis 2013-12-12 15:05:18 +01:00
Régis Hanol
0525cbdb11 Corrected the mention string in the user stream. (props to @sunyatasattva)
Previously the string would show *You mentioned {{Your Name}}*. Now it
correctly shows *You mentioned {{Other user name}}*
2013-12-12 11:46:36 +01:00
Régis Hanol
1d058e57e5 Merge pull request #1729 from S-YOU/master
amazon oneboxer
2013-12-12 02:42:14 -08:00
Régis Hanol
fe0188fd24 remove unused diff_engine class 2013-12-12 10:37:57 +01:00
Godfrey Chan
3c80ee0b8a ✂️ scoped for Rails 4 compat 2013-12-12 00:37:04 -08:00
Régis Hanol
06dd7ffe3c better revision history 2013-12-12 03:41:34 +01:00
Jeff Atwood
14328a24ef attempt to fix amazon item descriptions 2013-12-11 16:40:15 -08:00
Neil Lalonde
5171a23a9c Re-apply with fixes: Stop using user agent to detect mobile devices. Use a media query and yepnope to load the appropriate css and customizations. 2013-12-11 11:19:22 -05:00
Neil Lalonde
ed3d3ae1e1 Upgrade font-awesome to version 4 2013-12-11 10:31:09 -05:00
YOU
43ce37a653 changed . to \. 2013-12-11 16:06:43 +09:00
YOU
dacd3409cb added international amazon domains to matcher 2013-12-11 16:05:15 +09:00
Sam
003ac02a67 Disable ddl transactions for realz! 2013-12-11 11:52:55 +11:00
Sam
c53873110f improve bench script 2013-12-11 10:32:40 +11:00
Neil Lalonde
5ed80561ee Add retry to migrate_word_counts 2013-12-10 18:10:52 -05:00
Neil Lalonde
763b36baa6 Version bump to v0.9.7.8 2013-12-10 17:42:21 -05:00
Robin Ward
8fd9776e43 Use COALESCE in case there are no posts in a topic 2013-12-10 17:27:01 -05:00
Neil Lalonde
557f6ff499 Version bump to v0.9.7.7 2013-12-10 16:15:14 -05:00
Robin Ward
6853f37bee Show estimated reading time near summarize button. 2013-12-10 13:47:36 -05:00
Neil Lalonde
561961eff6 FIX: can grant titles to regular users. Guardian initializer needs current_user, not the target user. 2013-12-10 12:46:35 -05:00
Robin Ward
b0e6475b07 FIX: Staff should be able to see PMs 2013-12-10 11:30:45 -05:00
Sam
2179baf062 downgrade pg, pg 1.7 is buggy it is being fixed, we need to wait for the next release
see: https://groups.google.com/forum/#!topic/ruby-pg/5_ylGmog1S4
2013-12-10 11:41:05 +11:00
Neil Lalonde
2596f7dec2 Revert "Stop using user agent to detect mobile devices. Use a media query and yepnope to load the appropriate css and customizations." 2013-12-09 16:28:11 -05:00
Robin Ward
ef432902ce Missing percentage. CANADIAN SORRY! 2013-12-09 14:48:32 -05:00
Robin Ward
744add9ece FIX: Post count progress was a little off. Minor fix to hidden posts 2013-12-09 14:28:32 -05:00
Robin Ward
5280e279f7 FIX: Merge conflict; "of" number in progress bar was incorrect. 2013-12-09 13:44:37 -05:00
Neil Lalonde
ca5d4d5e54 Stop using user agent to detect mobile devices. Use a media query and yepnope to load the appropriate css and customizations. 2013-12-09 13:28:42 -05:00
Robin Ward
17110ead98 Merge pull request #1722 from vikhyat/enable-names
enable_names site setting functionality
2013-12-09 10:03:55 -08:00
Robin Ward
06b10ea951 Merge pull request #1727 from velesin/search_template_tests
adds unit tests for the search dropdown template
2013-12-09 10:02:59 -08:00
Robin Ward
7e784d3f8c Merge pull request #1726 from ofgeek/patch-1
Update client.zh_CN.yml
2013-12-09 09:55:20 -08:00
Robin Ward
e20d649dee FIX: Performance issue with [\] characters. 2013-12-09 12:54:10 -05:00
Wojciech Zawistowski
9dbc2f1039 adds unit tests for the search dropdown template 2013-12-09 18:15:38 +01:00