scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
3304 commits 70 branches 179 tags 165 MiB
Commit graph

3304 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zanz2 b265beb386
Merge pull request #864 from Zanz2/move_desc 
Move protocol.io protocol description to step 1 of protocols [SCI-1695]
 2017-11-13 10:07:01 +01:00
Zanz2 4750d6f270
Merge pull request #862 from Zanz2/move_tablev2 
Protocols.io converted html tables to scinote table elements [SCI-1692]
 2017-11-13 10:06:21 +01:00
Zanz2 23d3ffa5a4 Fixed PR 2017-11-12 15:48:45 +01:00
Zanz2 e26adc2905 Quick formatting fix 2017-11-12 15:41:50 +01:00
Zanz2 e7384ac38d Code review fixes, made seperate helper file 2017-11-12 15:31:04 +01:00
mlorb a982472e4a
Merge pull request #863 from mlorb/ml-sci-1728 
Fix error with "event not defined" and add flowtype to ESLint [SCI-1728]
 2017-11-10 14:33:39 +01:00
zmagod 26912a14d6 fixes password validations [fixes SCI-1761] 2017-11-10 12:59:37 +01:00
mlorb fd743ec2d5 fix error with event not defined and add flowtype to ESLint 2017-11-10 09:30:55 +01:00
Zanz2 fa2c0fe556 merging 2017-11-09 18:55:17 +01:00
mlorb dfb2689fbf
Merge pull request #860 from mlorb/ml-sci-1730 
Fix team table does not retain the number of teams per page bug [SCI-1730]
 2017-11-09 17:53:19 +01:00
Zanz2 812fa3f1d5 Hopefully this will resolve my merge problems 2017-11-09 17:42:17 +01:00
Zmago Devetak 9678d2a50d
Merge pull request #858 from ZmagoD/zd_SCI_1576 
Implement Integration test: forgot password.feature
 2017-11-09 16:12:49 +01:00
zmagod 327e27e123 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1576 2017-11-09 15:55:10 +01:00
zmagod 16d4327010 rename sign_in_sign_up dir to sessions 2017-11-09 15:53:16 +01:00
Zanz2 a40a63ae50 Made code more aesthetic 2017-11-09 15:38:06 +01:00
Zanz2 60da9d136c
Merge pull request #859 from Zanz2/p_succ_msg_SCI-1694 
Protocols.io import success flash messagge [SCI-1694]
 2017-11-09 15:23:47 +01:00
mlorb b3e39697d5
Merge pull request #857 from mlorb/ml-sci-1575 
Implement login feature integration tests [SCI-1575]
 2017-11-09 13:48:57 +01:00
mlorb e227a75f5f rename folder 2017-11-09 13:40:30 +01:00
mlorb b0fe792f9c fix ESLint class-methods-use-this error 2017-11-09 13:33:41 +01:00
mlorb c7f5d6ed8c add state for number of teams per page 2017-11-09 13:29:14 +01:00
Zmago Devetak 7386974d64
Merge pull request #850 from ZmagoD/zd_SCI_1731 
add scenic gem, teams datatables sql view
 2017-11-09 11:37:20 +01:00
Zmago Devetak 26260d01fd
Merge pull request #856 from ZmagoD/zd_SCI_1610 
trigger an alert to on canvas save if page reload [fixes SCI-1610]
 2017-11-09 11:35:39 +01:00
Zanz2 518eb09110 Deleted un needed error flash 2017-11-09 10:49:44 +01:00
Zanz2 4b837dbe9d Forgot flash fail messagges, now added them for file too big and general error 2017-11-09 10:49:44 +01:00
Zanz2 feb686b4ac Fixed alignement 2017-11-09 10:49:44 +01:00
Zanz2 8b247770ef Added the success flash alert 2017-11-09 10:49:44 +01:00
Zanz2 9086cd8b6b Jira branch code 2017-11-09 10:49:44 +01:00
zmagod e0b6683a44 create view directory per @Ducz0r 's request 2017-11-09 10:06:53 +01:00
mlorb 4e92065ea0
Merge pull request #855 from mlorb/ml-sci-1633-v2 
Fix bug with import css styles [SCI-1633]
 2017-11-09 09:49:37 +01:00
zmagod 9eac014f1a Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1731 2017-11-09 09:05:22 +01:00
Zmago Devetak a3245eecff
Merge pull request #851 from ZmagoD/zd_SCI_1568 
adds integration tests for about sciNote modal
 2017-11-09 09:01:00 +01:00
zmagod f224629259 fixes failing team.feature:19 scenario 2017-11-09 09:00:00 +01:00
zmagod e2af987b80 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1568 2017-11-09 08:35:39 +01:00
zmagod b3a8f8b5e2 refactor dev env 2017-11-08 17:31:21 +01:00
zmagod e02f63276e fix failing sign_up scenario 2017-11-08 17:22:03 +01:00
zmagod 33ebe1f748 integration tests for forgot_password [fixes SCI-1576] 2017-11-08 16:23:52 +01:00
zmagod b036452d8c adds background worker to cucumber tests 2017-11-08 11:59:01 +01:00
Luka Murn ded8bd48c0 Merge branch 'Ducz0r-lm-add-flow-to-validation' into decoupling-settings-page 2017-11-08 09:33:47 +01:00
Luka Murn dfa1c83c9f Merge branch 'lm-add-flow-to-validation' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-add-flow-to-validation 
Conflicts:
	flow-typed/npm/lodash_v4.x.x.js
 2017-11-08 09:33:29 +01:00
Luka Murn f7f825b11f Move flow-typed & flow-bin back to devDependencies 2017-11-08 08:44:36 +01:00
Luka Murn 7cb159c1a3 Add updated flow-types 2017-11-07 17:31:12 +01:00
Luka Murn 0412c6f283 Update code per @ZmagoD's request 2017-11-07 17:30:15 +01:00
mlorb 157b1968cc implement login's feature integration tests 2017-11-07 17:18:41 +01:00
zmagod f43492adff trigger an alert to on canvas save if page reload [fixes SCI-1610] 2017-11-07 15:08:26 +01:00
mlorb 9a875070c7
Merge pull request #854 from mlorb/ml-sci-1573 
Implement single team feature Integration tests [SCI-1573]
 2017-11-07 13:33:43 +01:00
Luka Murn 09ac0febbb
Bump version to 1.12.6 2017-11-07 12:48:53 +01:00
mlorb 428fa7f811 follow @ZmagoD's remarks 2017-11-07 11:29:37 +01:00
mlorb df835fccb4 fix bug with import css styles 2017-11-07 11:09:30 +01:00
Zmago Devetak a9bba07c74
Merge pull request #847 from ZmagoD/zd_SCI_1683 
add whacamole configuration [fixes SCI-1683]
 2017-11-06 15:56:29 +01:00
zmagod 3255d5cf7c code cleanup 2017-11-06 15:37:09 +01:00