zmagod
|
b9492daa69
|
fixes changeTeam method
|
2017-09-18 15:16:07 +02:00 |
|
zmagod
|
d1477179b2
|
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1499
|
2017-09-18 15:10:52 +02:00 |
|
Toni Dezman
|
39c9b708bd
|
Merge pull request #780 from programmertoni/td_SCI_1565
Td sci 1565
|
2017-09-18 11:37:19 +02:00 |
|
Toni Dezman
|
f144e057b7
|
Merge pull request #789 from programmertoni/td_SCI-1600_spinner
Global Spinner
|
2017-09-18 11:36:25 +02:00 |
|
zmagod
|
40359c5c73
|
fixed edit name modal
|
2017-09-15 16:34:05 +02:00 |
|
Zanz2
|
f861b1fc52
|
Configured the controller,the main task ahead is to figure out how to import all of the data i have available
|
2017-09-15 15:52:55 +02:00 |
|
zmagod
|
83647d81b4
|
adds edit team name modal
|
2017-09-15 14:00:48 +02:00 |
|
Zanz2
|
d85e02730d
|
Addes steps, basic functionality is working, still need to style and fix bugs and upload to database etc
|
2017-09-15 12:19:58 +02:00 |
|
Zanz2
|
175aa16a7d
|
Made submit form on preview, need to route it propperly, made text scroller for step importing that only works with my own sample protocol i created on protocols.io with every attribute set, trying to debug why it does this
|
2017-09-14 15:52:44 +02:00 |
|
Zanz2
|
5d6cc341ed
|
added first half of inputs, working on scroller next, page now refreshes after you cancel out of import window, to update the data, will look for alternate way after im done
|
2017-09-14 14:42:04 +02:00 |
|
zmagod
|
1a00b53034
|
adds user_team tests
|
2017-09-14 13:11:19 +02:00 |
|
Toni Dezman
|
d38f4343f2
|
Decupling redux part 1
|
2017-09-14 11:46:49 +02:00 |
|
Zanz2
|
d6d1f9d490
|
changed second modal preview styling to fit its specifications
|
2017-09-14 11:46:41 +02:00 |
|
Zanz2
|
29b9d50363
|
Modals now popup correctly trough ajax, added js file for this functionality, and two partials which are reused from existing importer
|
2017-09-14 11:30:53 +02:00 |
|
zmagod
|
705d07f60e
|
adds remove team action
|
2017-09-13 17:11:51 +02:00 |
|
Zanz2
|
9fc91aac32
|
added protocols io upload preview modal
|
2017-09-13 16:04:16 +02:00 |
|
Zanz2
|
b7432b336a
|
added file upload popup modal, rails routes and controller functions, deleted old standalone model and controller
|
2017-09-13 15:15:08 +02:00 |
|
zmagod
|
1b3b3dfea9
|
adds team members update role functionality
|
2017-09-12 17:30:13 +02:00 |
|
Žan Žagar
|
706031dacb
|
added model and controler, model should go to services while the controller should go to protocols controller
|
2017-09-12 15:25:22 +02:00 |
|
Toni Dezman
|
2bc84b6c19
|
Merge branch 'decoupling-settings-page' into td_SCI_1565
|
2017-09-12 10:44:49 +02:00 |
|
Žan Žagar
|
fdbae19156
|
changed .json to .txt for clarity
|
2017-09-12 09:33:18 +02:00 |
|
Žan Žagar
|
2a7a2b8fa1
|
Changed some minor button text and fixed a local error
|
2017-09-12 09:26:22 +02:00 |
|
Žan Žagar
|
62350d0d42
|
Changed the styling so first option isnt outlined like button, but now mouse cursor wont change to hand when hovering over; will leave this small bug for fixing later
|
2017-09-11 16:03:33 +02:00 |
|
Žan Žagar
|
9b640c5df8
|
Dropdown menu works, need to add backend code for the second button
|
2017-09-11 15:28:48 +02:00 |
|
Žan Žagar
|
0f4dadefa9
|
prvi (star gumb) v dropdownu sedaj deluje
|
2017-09-11 15:23:09 +02:00 |
|
Žan Žagar
|
f668f60237
|
dodav moj stil gumba, ki ga opredeli kot link (padding 0, border 0), za dropdown meni
|
2017-09-11 15:22:22 +02:00 |
|
Žan Žagar
|
2c0a458aaf
|
dodav moj alternativni text za importanje (text na gumbu), za rails translate (t)
|
2017-09-11 15:21:35 +02:00 |
|
Žan Žagar
|
31e8c107fd
|
dodav na pravi branch te file
|
2017-09-11 14:35:00 +02:00 |
|
Toni Dezman
|
1cd9cd92fc
|
adds global spinner
|
2017-09-11 14:30:49 +02:00 |
|
Jure Grabnar
|
b4a13dffe3
|
init commit, dodav na protocols index gumb z dropdown
|
2017-09-11 13:07:22 +02:00 |
|
mlorb
|
03743a21f6
|
Merge pull request #786 from mlorb/ml-sci-1587
Fix bugs with importing samples [SCI-1587]
|
2017-09-08 09:19:35 +02:00 |
|
Mojca Lorber
|
a0f7030a70
|
fix bug with tinyMCE text validaton
|
2017-09-07 14:54:12 +02:00 |
|
Toni Dezman
|
67d617deb5
|
adds hound_bot's and zmagos suggestions
|
2017-09-07 13:40:53 +02:00 |
|
Mojca Lorber
|
0e14420193
|
fix bugs with importing samples
|
2017-09-06 14:41:14 +02:00 |
|
Toni Dezman
|
b7bed5b5fe
|
changes double quotes with single quotes
|
2017-09-05 14:47:05 +02:00 |
|
Toni Dezman
|
b2e969459c
|
adds controller unit tests
|
2017-09-05 14:43:35 +02:00 |
|
Toni Dezman
|
ef023c5ca6
|
Merge pull request #783 from programmertoni/td_SCI-1571
Adds .feature files for Cucumber specifications
|
2017-09-05 09:50:26 +02:00 |
|
Toni Dezman
|
df1fb6286b
|
renames rspec file to _spec.rb
|
2017-09-04 15:13:55 +02:00 |
|
Toni Dezman
|
185039bc99
|
adds suggestions from code review
|
2017-09-04 15:00:26 +02:00 |
|
Toni Dezman
|
6a4c43b9c0
|
moves .feature files to features folder
|
2017-09-04 11:57:35 +02:00 |
|
zmagod
|
9c01ab414c
|
refactor leave team
|
2017-09-01 17:10:43 +02:00 |
|
Luka Murn
|
c44c5b37bb
|
Merge pull request #785 from okriuchykhin/ok_GIOT_29
Add validation for uid uniqness [GIOT-29]
|
2017-09-01 17:04:38 +02:00 |
|
Oleksii Kriuchykhin
|
fc0e2d2172
|
Add validation for uid uniqness [GIOT-29]
|
2017-09-01 17:00:13 +02:00 |
|
okriuchykhin
|
91233a97c4
|
Merge pull request #784 from okriuchykhin/ok_GIOT_31
Improve error logging [GIOT-31]
|
2017-09-01 16:42:23 +02:00 |
|
Oleksii Kriuchykhin
|
a927c2832d
|
Improve error logging [GIOT-31]
|
2017-09-01 16:36:45 +02:00 |
|
Luka Murn
|
8463c89386
|
Update Gemfile
|
2017-09-01 09:36:40 +02:00 |
|
Toni Dezman
|
f7f653ffd1
|
Adds .feature files for Cucumber specifications
|
2017-09-01 09:24:36 +02:00 |
|
Luka Murn
|
e5bfb3c42d
|
Rollback migration version
|
2017-09-01 09:06:25 +02:00 |
|
zmagod
|
91d2d8a935
|
adds team details view
|
2017-08-31 15:56:55 +02:00 |
|
Toni Dezman
|
c3f46d4877
|
adds hounds suggestions on improving the code
|
2017-08-31 13:24:57 +02:00 |
|