1
0
Fork 0
Commit graph

77 commits

Author SHA1 Message Date
44b4f7314d Merge branch 'atomaka/bugfix/api-n+1' into 'master'
Fix N+1 on API

Rarity
Type
Leader Skill
Passive Skill
Super Attack
Awaken Type
Dokkan Card
HP, ATK, Def
Links (one query per)

N+11-16 depending on link count * 224 cards = > 3000 queries.  WHOOPS.

Let's drop that down to 13 queries total.

See merge request !16
2015-11-03 12:09:23 -05:00
183ca46fa4 Fix N+1 on API 2015-11-03 12:04:58 -05:00
6910d6ae89 Merge branch 'development' into 'master'
Development



See merge request !15
2015-10-27 09:52:25 -04:00
8b7216e1ad Merge branch 'atomaka/feature/cors' into 'development'
Deal with cross origins



See merge request !14
2015-10-27 09:51:57 -04:00
7e82b16f29 Deal with cross origins 2015-10-27 09:42:56 -04:00
307262a701 Merge branch 'development' 2015-10-25 17:35:51 -04:00
092d712378 Finishing of stat import 2015-10-25 17:35:36 -04:00
242da0bfca Merge branch 'development' into 'master'
Development



See merge request !13
2015-10-25 11:49:34 -04:00
f50b344645 Merge branch 'atomaka/feature/importer-links' into 'development'
Add passive and link descriptions

Update the importer to add passive and link descriptions from atomaka data sources.

See merge request !12
2015-10-25 11:43:04 -04:00
2ba6dcaa17 Add passive and link descriptions 2015-10-25 11:41:37 -04:00
d0daf51aef Merge branch 'development' into 'master'
Development

Includes new importer

See merge request !11
2015-10-23 20:42:18 -04:00
d9b5ed17a5 Merge branch 'atomaka/feature/importer' into 'development'
Build importer

Attempt to import data from renzy's store.

See merge request !10
2015-10-23 20:40:28 -04:00
5730e0ade5 Build importer 2015-10-23 20:32:44 -04:00
8eccf7e152 Make passive skills more usable.
See merge request !9
2015-10-23 13:44:09 -04:00
70e44b948f Merge branch 'atomaka/bugfix/full-passive-skill' into 'development'
Show all relevant passive skill details

Fix to issue #2 

See merge request !8
2015-10-23 13:42:49 -04:00
72c012a5df Show all relevant passive skill details 2015-10-23 13:41:19 -04:00
aee4ec8da4 Merge branch 'development' into 'master'
Development

Bugfixes to add uniqueness constraints to Super Attacks and Leader Skills

See merge request !7
2015-10-23 11:29:04 -04:00
6e9ad101e0 Merge branch 'atomaka/bugfix/unique-passive-skill' into 'development'
Uniqueness constraint on passive skill



See merge request !6
2015-10-23 11:28:07 -04:00
23796373f0 Uniqueness constraint on passive skill 2015-10-23 11:27:15 -04:00
5a59c4d798 Merge branch 'atomaka/bugfix/unique-super-attacks' into 'development'
Super Attack name + description should be unique



See merge request !5
2015-10-23 11:22:32 -04:00
f5f91f0ff9 Super Attack name + description should be unique 2015-10-23 11:21:26 -04:00
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