Commit Graph

6447 Commits

Author SHA1 Message Date
Sam
8a4b603bfd rails master upgrade 2014-02-11 10:22:15 +11:00
Sam
820fe572ca BUGFIX: phantom new and unread for category definition topics 2014-02-11 10:22:15 +11:00
ca17f8a437 FIX: Wrong text. Thanks @riking 2014-02-10 17:36:13 -05:00
14449f236a FIX: Back button in chrome on static pages 2014-02-10 17:07:39 -05:00
b61df08d1b FEATURE: Admin selector to choose a primary group for a user, display it
and apply a CSS class to their posts.
2014-02-10 17:00:15 -05:00
Sam
c97481623d Merge pull request #1928 from velesin/post_creator_refactoring
Refactors PostCreator.
2014-02-11 08:38:08 +11:00
dd7fa2d946 FIX: restore category when opening draft 2014-02-10 15:30:08 -05:00
2a7b609cae Refactors PostCreator. 2014-02-10 20:29:31 +01:00
f1a9e52d7e When creating/editing a category the parent shoudl be none. 2014-02-10 14:08:16 -05:00
45afed8720 FIX: Chrome has a bug where if you request the same URL with a different
MIME type, then leave and hit the back button, you'll get the last MIME
type requested instead of HTML. This fixes it.
2014-02-10 12:43:17 -05:00
b61b33c0fa Add groups list to the poster expansion when you click an avatar while
in a topic.
2014-02-10 12:30:36 -05:00
25070dcde7 FIX: Show the renamed uncategorized name instead of "(no category)" 2014-02-10 11:15:42 -05:00
dec7a9b998 now that wbr tags are inputted, breaking usernames a bit more natually 2014-02-10 09:45:35 -05:00
a89018db87 Use GlobalSetting to enable CORS at application level 2014-02-09 23:11:52 -08:00
c900ee055b Merge pull request #1924 from awesomerobot/master
simplfying color palette, collecting colors into unified variables
2014-02-09 22:34:25 -08:00
2d872795d6 simplfying color palette, collecting colors into unified variables 2014-02-10 01:04:21 -05:00
Sam
4f6cef01e4 fix build 2014-02-10 16:07:09 +11:00
Sam
172d0ffd08 oops clean gemfile lock 2014-02-10 15:43:53 +11:00
Sam
212ece3e80 Remove memory profiler at least until I push a new docker image 2014-02-10 15:40:32 +11:00
Sam
d3b8ec36d0 warning if running an old version of bundler 2014-02-10 15:34:08 +11:00
Sam
5d0cae2dd1 BUGFIX: seen logic was incomplete, you can have user_data and still unseen topic 2014-02-10 15:27:46 +11:00
Sam
ca170e4636 Add memory profiler gem for ruby 2.1 2014-02-10 15:27:46 +11:00
5569f52f70 Update client.es.yml 2014-02-09 20:51:01 -05:00
Sam
a8faac5f0a Merge pull request #1912 from davidcelis/include-rails-binstubs
Include binstubs generated by Rails 4
2014-02-10 12:35:24 +11:00
Sam
de9e1a5049 BUGFIX: allow sorting prior to sidekiq starting 2014-02-10 09:21:46 +11:00
f4e3ec905c Merge pull request #1923 from rjackson/security-update-for-ember
Update Ember for CVE-2014-0046.
2014-02-09 11:25:07 -05:00
7acef17a35 Update Ember for CVE-2014-0046. 2014-02-09 11:10:14 -05:00
dd5a25b676 Merge pull request #1921 from joallard/locale-fr
Locales/fr: Add filter strings and change :read_more_MF
2014-02-08 16:21:04 -08:00
862faf2a17 Locales/fr: Add filter strings and change :read_more_MF 2014-02-08 18:51:18 -05:00
b51bebb200 Extract queries to keep logic in the Categories Model
This creates two methods in the Category model. This moves the model
logic to the model and just calls the Category class methods in
ListController.

This also adds tests for the two methods created in the Category
model. The motivation for this refactor is the code climate score of the
this class and readability of the code.

 Please enter the commit message for your changes. Lines starting
2014-02-08 14:10:48 -08:00
Sam
90ae4c6224 Try to fix random failing spec 2014-02-09 07:55:11 +11:00
Sam
56e09802fe BUGFIX: Use email sender 2014-02-09 07:29:16 +11:00
Sam
87a07e2355 attempt to work around concurrency issue with active record 2014-02-08 15:19:10 +11:00
6c8e47bcc6 minor copyedits on name entry 2014-02-07 16:34:29 -08:00
84fbb8028c added translations to spanish 2014-02-07 19:08:17 -05:00
0a7dc83681 BUFGIX: read more should take you to the first post 2014-02-07 15:07:13 -08:00
350eb82223 Don't include category definitions on Categories page 2014-02-07 17:01:31 -05:00
33661b2d56 Update onebox to fix a couple of bugs 2014-02-07 16:32:32 -05:00
e0df404d7e Add site setting tos_accept_required. If enabled, users must check a box saying that they've read and accept the terms of service. 2014-02-07 16:04:13 -05:00
d769938660 NEW: Don't show the filter on the homepage. Just show the Forum's name 2014-02-07 16:03:26 -05:00
6bea09a82a clarify on mutes, because noise 2014-02-07 12:39:58 -08:00
ecca66dbfe simpler copy for mailing list mode 2014-02-07 12:35:47 -08:00
9db044d54b FIX: Component was not refreshing all the time 2014-02-07 14:16:34 -05:00
58247a51e8 Small tweaks to Group page 2014-02-07 13:46:59 -05:00
130f0e19ec FIX: more protection from nil in count_with_subcategories 2014-02-07 11:38:22 -05:00
5f992ae34c Merge pull request #1913 from davidcelis/default-category-fields
Default values for posts/topics fields on Category
2014-02-07 11:27:57 -05:00
2490837929 Added some specs for the group controller methods 2014-02-07 11:07:23 -05:00
3b617b04b0 FEATURE: First stab at groups page with member list 2014-02-07 10:44:51 -05:00
e511e8a80b Link to groups from user profile 2014-02-07 10:44:51 -05:00
2d47fe4473 Can list group members 2014-02-07 10:44:51 -05:00