Commit Graph

4221 Commits

Author SHA1 Message Date
Andrew Brown
ff954484ce character edit and show pages 2014-07-20 03:44:46 -05:00
Andrew Brown
8adc24e9e5 character page form 2014-07-20 03:19:41 -05:00
Andrew Brown
e6917e2259 Create helper for generating form rows 2014-07-20 02:28:12 -05:00
Andrew Brown
976de6439c Specify rubyracer and libv8 to make server work locally :( 2014-07-20 02:27:38 -05:00
Andrew Brown
edac459671 Merge pull request #342 from Cantido/travis
Add experimental build for Ruby 2.1.0
2014-07-09 23:13:12 -05:00
Andrew Brown
9afc3cad0d bring attribution page up to speed in new design 2014-05-21 21:13:14 +00:00
Andrew Brown
385182ca8b login pages restyling 2014-05-21 20:39:52 +00:00
Andrew Brown
d37bc792c8 restyle hero on landing 2014-05-21 20:28:41 +00:00
Andrew Brown
3a673c7d12 fix font size discrepency 2014-05-21 19:50:05 +00:00
Andrew Brown
ff8de20eee add some labs for later 2014-05-21 19:40:35 +00:00
Andrew Brown
8ebef947f0 character view changes 2014-05-21 19:40:02 +00:00
Robert Richter
ff043557e4 Add experimental build for Ruby 2.1.0 for issue #338 2014-03-22 18:53:15 -05:00
Andrew Brown
db6129a724 Merge pull request #341 from Cantido/master
Testing milestone from Cantido
2014-03-22 15:18:42 -05:00
Robert Richter
dfc5c43c3b Make factories and tests work 2014-03-19 00:33:32 -05:00
Robert Richter
a90540605e Keep trying trying to fix tests 2014-03-16 23:30:45 -05:00
Robert Richter
5792cfbb1d Continue to wrestle with factories 2014-03-16 23:11:25 -05:00
Robert Richter
99ce984aeb Persist created test objects 2014-03-16 22:59:28 -05:00
Robert Richter
d381c0978f Do sequences correctly 2014-03-16 22:39:27 -05:00
Robert Richter
f3f0e829ea Factories create sequence of usernames and emails 2014-03-16 22:24:15 -05:00
Robert Richter
66ef6bebe7 Add User association to Character factory 2014-03-16 21:54:21 -05:00
Robert Richter
c37c2502b7 Iron out more factory_girl usage mistakes 2014-03-16 21:31:14 -05:00
Robert Richter
559822f63a Get factory_girl working *correctly* 2014-03-16 21:21:26 -05:00
Robert Richter
a56e427d8b Get factory_girl working 2014-03-16 21:14:51 -05:00
Robert Richter
f60e52e3f9 Configure the default test database *correctly* 2014-03-16 21:01:05 -05:00
Robert Richter
ff943dbe40 Configure default test database 2014-03-16 20:51:30 -05:00
Robert Richter
ac033ffabd Use factory_girl for test fixtures 2014-03-16 20:34:30 -05:00
Robert Richter
c18ab5a91a Remove reference to fixtures
Mongoid doesn't work like this
2014-03-16 19:17:50 -05:00
Robert Richter
7ba5abdf0a Attempt to get tests to work with Mongoid 2014-03-16 19:03:17 -05:00
Andrew Brown
bb1c222d6f Merge branch 'master' into fix-bootplus 2014-03-14 20:48:24 +00:00
Andrew Brown
bc9746bdc8 add my_content helper for getting content owned by currently-logged-in user 2014-03-14 20:47:29 +00:00
Andrew Brown
963567ec77 move pickers to their own helper and dear god remove a little of that duplicated code 2014-03-14 20:39:58 +00:00
Andrew Brown
12811d1412 use glyphicon for dropdown control in navbar 2014-03-14 16:50:19 +00:00
Andrew Brown
13e91476c8 encourage the installation of ruby 2.0, not 2.1
until #338 is closed
2014-03-14 10:29:29 -05:00
Andrew Brown
f23f481476 use new lists in universe content listing 2014-03-13 19:28:14 +00:00
Andrew Brown
a5092007bb Merge branch 'master' into fix-bootplus 2014-03-13 18:22:49 +00:00
Andrew Brown
649860f1f9 magic design pass 2014-03-13 18:21:43 +00:00
Andrew Brown
56ea03d647 locations design pass 2014-03-13 18:17:05 +00:00
Andrew Brown
a493c41eef languages design pass 2014-03-13 17:59:15 +00:00
Andrew Brown
2c8a32ec64 equipment pass 2014-03-13 17:56:46 +00:00
Andrew Brown
c29be33e90 characters design pass 2014-03-13 17:39:31 +00:00
Andrew Brown
49424543f2 dashboard and universes design pass 2014-03-13 17:02:02 +00:00
Andrew Brown
0143fab5d7 fix tab issue introduced with bootstrap 3 hidden style changes 2014-03-13 15:16:38 +00:00
Andrew Brown
2aac54f642 Show travis status for this repo, not a fork :) 2014-03-13 09:49:46 -05:00
Andrew Brown
3d34f5a041 redesign pass over login/signup 2014-03-13 14:27:57 +00:00
Andrew Brown
8299e6c0d3 card-comments restyling 2014-03-13 13:37:02 +00:00
Andrew Brown
4097d961cd scale landing page cards down properly on phones 2014-03-13 13:28:23 +00:00
Andrew Brown
14f4ae6fcb clean up css 2014-03-13 13:05:21 +00:00
Andrew Brown
8525385d5a Merge pull request #331 from Cantido/master
Set up Travis
2014-03-13 08:02:26 -05:00
Robert Richter
53a8087fbe Add build status image to README 2014-03-12 23:46:55 -05:00
Robert Richter
ff5a24dba8 Fix undefined method errors in test cases 2014-03-12 23:42:18 -05:00