Commit Graph

349 Commits

Author SHA1 Message Date
Robert Richter
695cdc4f05 Migrate to built-in ActiveModel secure passwords 2015-04-19 13:43:44 -05:00
Robert Richter
6d05bc769e Fix a string containing escape characters 2015-04-18 22:57:11 -05:00
Robert Richter
cbe0dbda1d Create tests for the locations generator 2015-04-01 16:57:58 -05:00
Robert Richter
1c87087861 Add missing equals sign 2015-03-29 20:17:34 -05:00
Robert Richter
8266acdd56 I did translation parameters wrong 2015-03-29 16:52:08 -05:00
Robert Richter
9206f97c51 Clean style of SessionsController 2015-03-29 16:25:57 -05:00
Robert Richter
86f1a29b7f Clean style of MagicController 2015-03-29 16:24:55 -05:00
Robert Richter
ced01ecd28 Clean style of LocationsController 2015-03-29 16:23:01 -05:00
Robert Richter
7c817c9984 Clean style of LanguagesController 2015-03-29 16:22:08 -05:00
Robert Richter
5bf4e4fcf5 Loosen RuboCop restrictions to fit respon_to block 2015-03-29 16:19:28 -05:00
Robert Richter
9ce65f6f48 Add Login method required by users_controller 2015-03-29 16:18:13 -05:00
Robert Richter
bcdd4721c7 Clean style of UsersController 2015-03-29 16:16:58 -05:00
Robert Richter
b484e04b49 Clean style of UniversesController 2015-03-29 16:05:27 -05:00
Robert Richter
47e8e4b057 Fix reference to self 2015-03-29 11:27:54 -05:00
Robert Richter
6fdefcd3a9 Extract NilsBlankUniverse concern 2015-03-29 11:26:10 -05:00
Robert Richter
bcb5e84af5 Fix RuboCop rule disable 2015-03-28 21:58:03 -05:00
Robert Richter
d2a5219fb6 Fix failures I created 2015-03-28 21:51:03 -05:00
Robert Richter
0565266a20 Clean style of ApplicationHelper 2015-03-28 21:45:05 -05:00
Robert Richter
c07717e30e Add comments to Helper classes 2015-03-28 12:55:15 -05:00
Robert Richter
302813ff6c Delete unused Helper classes 2015-03-28 12:37:50 -05:00
Robert Richter
9a0475c516 Refactor to access data via User object 2015-03-28 12:22:47 -05:00
Robert Richter
5b623ce7e9 Clean style of MainController 2015-03-28 12:18:33 -05:00
Robert Richter
d939d5bd44 Clean style of Model classes 2015-03-28 12:11:37 -05:00
Robert Richter
e7340ea2c8 Consolidate model update and creation translations 2015-03-28 11:09:42 -05:00
Robert Richter
0f8fbc70a2 Fix two minor offenses in the CharactersGenerator 2015-03-27 23:47:41 -05:00
Robert Richter
c032b57318 Refactor GeneratorController
Split it up into three generator controllers.

Also i18n'd all strings
2015-03-27 22:56:45 -05:00
Robert Richter
a6728af397 Clean style in the EquipmentController 2015-03-27 18:20:29 -05:00
Robert Richter
70de798c77 Use ActiveRecord ordering instead of array.sort 2015-03-26 18:24:05 -05:00
Robert Richter
a7ba0ff9d6 Remember that Ruby is not Java 2015-03-26 18:19:16 -05:00
Robert Richter
636c020f85 Make Character set a blank Universe value to nil 2015-03-26 18:14:36 -05:00
Robert Richter
00e793bf1e Refactor style using the Rubocop auto-correct 2015-03-25 22:42:45 -05:00
Robert Richter
dfd80d9539 Refactor CharactersController for style 2015-03-25 22:38:18 -05:00
Robert Richter
1e06763f98 Refactor ApplicationController for style
Strings were internationalized, methods extracted, partials written.
2015-03-24 20:25:57 -05:00
Robert Richter
532e2ef0a6 Extract username/password digest function 2015-03-22 12:20:16 -05:00
Robert Richter
e2a882117e Extract fragment and text from quote card for #89 2015-03-17 21:35:52 -05:00
Robert Richter
b5668aa1a9 Revert "Comment out some validations for import"
This reverts commit 90ee3cc136.
2015-03-16 17:19:27 -05:00
Andrew Brown
78305d4166 Temporarily disable S3 map uploading until bucket bug is fixed 2015-03-16 02:59:39 -05:00
Andrew Brown
6602d8bb26 Log out users with the old style of cookies 2015-03-16 02:53:41 -05:00
Andrew Brown
cea24d8416 Hopefully fix migration json parse 500 2015-03-16 02:40:31 -05:00
Andrew Brown
90ee3cc136 Comment out some validations for import 2015-03-16 00:50:11 -05:00
Andrew Brown
97dca04ec1 Fix the rest of the broken tests #410 2015-03-14 01:54:42 -05:00
Andrew Brown
c2497d5123 Fix non-anon users sometimes seeing anon banner #366 2015-03-14 01:31:47 -05:00
Andrew Brown
50944c3727 Fix some tests 2015-03-14 01:29:17 -05:00
Andrew Brown
6138dc86c8 Fix design problems #410 2015-03-13 23:59:59 -05:00
Andrew Brown
3fd6d604fe Revert "Revert "Resolve merge with master""
This reverts commit 6f8ae925ba.

Conflicts:
	app/assets/stylesheets/bootplus_overrides.css.less
2015-03-13 22:46:31 -05:00
Andrew Brown
e3e8cbdaf6 Clean up after the merge conflict 2015-03-13 20:43:55 -05:00
Robert Richter
6f8ae925ba Revert "Resolve merge with master"
This reverts commit 8524963f1c12d6f4667964acc16680749dec20cf, reversing
changes made to bdb208e18769be9ea95c06d54c72f86d2d6a0209.
2015-03-13 20:18:49 -05:00
Robert Richter
12ea8f8b48 Include fix for #378 2015-03-13 20:15:54 -05:00
Robert Richter
9ade889a35 Change Mongo reference to ActiveRecord reference 2015-03-13 20:15:54 -05:00
Robert Richter
1cab3282ff Add all the remaining tests and code to get the site functional 2015-03-13 20:15:54 -05:00