1
0
Commit Graph

56 Commits

Author SHA1 Message Date
cfac2aaff7 Merge branch 'atomaka/bugfix/unique-leader-skill' into 'development'
Require leader skills to be unique



See merge request !4
2015-10-23 11:06:22 -04:00
860f58b974 Require leader skills to be unique 2015-10-23 11:06:06 -04:00
83831df27f Add procfile 2015-10-21 14:25:44 -04:00
acf2ac26bb Clean up api serializers 2015-10-21 10:52:59 -04:00
5232273a37 Only set types during create 2015-10-21 10:33:48 -04:00
ea38a64ced Set stat_type correctly 2015-10-21 10:24:41 -04:00
faa1f56aec Finish up stattypes 2015-10-20 19:27:59 -04:00
7a839563f1 This changed...whatever 2015-10-20 18:57:20 -04:00
64d5d157b3 More ugly fixes 2015-10-20 18:06:44 -04:00
1e7d000f72 Fix state_id to stat_id 2015-10-20 18:02:49 -04:00
793e18a8f9 Update form/controller stuff 2015-10-20 17:57:58 -04:00
c9af398b8f Add new tables for stats 2015-10-20 17:41:09 -04:00
600fcef87d Fix schema issue 2015-10-20 16:43:19 -04:00
daceb1d21c hack in only allowing bulk uploads of max 10 2015-10-16 16:11:48 -04:00
9e68871ef6 Merge branch 'atomaka/feature/bulk-evidences' into 'master'
Bulk evidence uploading

Bulk evidence, needs a quick review.

See merge request !3
2015-10-16 15:16:40 -04:00
dd42725402 Bulk evidence uploading 2015-10-16 15:16:19 -04:00
d16bb6e03b AwakenType needs to be unqiue 2015-10-16 11:40:11 -04:00
c4af77914e Update aws-sdk version 2015-10-16 11:30:52 -04:00
dcafafbf7a Need aws-sdk gem 2015-10-16 11:28:01 -04:00
896e7eb175 Add S3 config to production for paperclip 2015-10-16 09:46:40 -04:00
d582af1238 Stop forcing SSL because custom domain 2015-10-15 22:56:18 -04:00
0a628a6a6e Add evidence creation and association 2015-10-14 13:42:59 -04:00
ffd01cee11 Update readme 2015-10-14 11:22:06 -04:00
4e78901739 Allow verification checkbox for cards 2015-10-14 11:20:13 -04:00
caf7178189 Fix undo link 2015-10-14 11:19:48 -04:00
d319211044 Merge branch 'atomaka/feature/paper_trail' into 'master'
Implement version tracking and undoing

Add version tracking using the paper_trail gem.  All models are currently being tracked. However, UI has only been implemented for the Cards model.  Cards will show a list of all previous versions when editing them.  Undoing was also implemented for cards.  Whenever any create, edit, or delete is performed, the flash notice will include an undo link that can be used to revert the change.

paper_trail does not track `has_and_belongs_to_many` so `link` changes will not be tracked.

See merge request !2
2015-10-14 10:03:00 -04:00
dfa4ffeaea Implement undoing 2015-10-14 10:00:16 -04:00
dc55fc10f1 Support associations (no has_and_belongs_to) 2015-10-14 10:00:06 -04:00
73d5f36357 Add listing and showing of old versions 2015-10-13 17:27:21 -04:00
f7adce658e Install paper_trail and track all models 2015-10-13 17:27:13 -04:00
a438b48726 Need to unscope to get correct User.count 2015-10-12 15:56:57 -04:00
eee6f9f995 Fix after_create bug 2015-10-12 15:30:06 -04:00
04d6aea297 Create sample dashboard stuff 2015-10-09 15:37:23 -04:00
215c989806 Create admin namespace for data admin 2015-10-09 12:52:49 -04:00
90ebcdf06b Clean up title 2015-10-08 21:52:03 -04:00
a477d5b969 Force SSL in production 2015-10-08 18:29:37 -04:00
92dbf98339 Null object pattern for User as GuestUser 2015-10-08 18:03:09 -04:00
d9bea7f39a Implement roles and authorization 2015-10-08 17:58:46 -04:00
621a8cf7c4 Merge branch 'atomaka/feature/api' into 'master'
Match current API endpoints (/links, /characters)

There is a pull request that is currently active (within the last day) for Active Model Serializers that will allow for nested and inline Serializers.  This will allow `CardSerializer` to go from the complicated monstrosity that it is to a much simpler representation. For example

```
has_one :character
```

instead of:

```
def character
  Api::V1::CharacterSerializer.new(object.character)
end
```

follow this pull request at https://github.com/rails-api/active_model_serializers/pull/1225

See merge request !1
2015-10-08 14:26:06 -04:00
2297d1341a Match current API endpoints (/links, /characters) 2015-10-08 14:20:56 -04:00
dae4760a5b Add some default ordering 2015-10-08 13:08:45 -04:00
a412fcf5d9 Super full width to dispaly description 2015-10-08 13:03:48 -04:00
97ae2f33b2 Cleanup a few N+1 2015-10-08 13:02:25 -04:00
5e458a3e48 Add bullet 2015-10-08 13:02:19 -04:00
1655d48d21 Rename prefix to title 2015-10-08 12:40:31 -04:00
e0c8c56dbd Add dokkan card 2015-10-08 11:45:05 -04:00
9ff9131d52 Fix leader skill dropdown 2015-10-08 11:00:55 -04:00
3e3ce86d16 generate dynamic titles temporarily 2015-10-07 16:28:31 -04:00
be4344823a leader skills only have a description 2015-10-07 16:17:40 -04:00
d063f75fcc Setup for heroku 2015-10-07 15:54:47 -04:00