Commit graph

3325 commits

Author SHA1 Message Date
Zanz2 8d0d6f0502 refactored methods 2017-10-12 19:10:16 +02:00
okriuchykhin db9a031581 Merge pull request #813 from okriuchykhin/ok_SCI_1642
Refactor canvas [SCI-1642]
2017-10-12 17:45:34 +02:00
Zanz2 21036a1081 Deleted unnecesarry if's 2017-10-12 17:22:02 +02:00
Zanz2 414a15872c Made seperate method for steps mapping 2017-10-12 17:15:43 +02:00
zmagod bdc1051cbb cleanup 2017-10-12 17:05:04 +02:00
zmagod e5ebedb428 fix errors with polyfill 2017-10-12 16:49:33 +02:00
gazvoda 88f03a0706 Merge pull request #735 from gazvoda/lg-SCI-1249-v2
Truncate checklist items in activity modal [fixes SCI-1249]
2017-10-12 15:58:05 +02:00
mlorb f19c0defd6 remove focus from add team members button after the invite users modal closes 2017-10-12 15:28:00 +02:00
mlorb ed80d849aa remove double css file import and move data-tables style to the component 2017-10-12 14:54:40 +02:00
mlorb 6cc3c2df95 fixes time zone styling 2017-10-12 14:45:08 +02:00
Oleksii Kriuchykhin 56f52ebfa7 Optimize memory usage in samples/repositories import [SCI-1665] 2017-10-12 14:43:25 +02:00
zmagod dccf4e34ff fix cucumber settings 2017-10-12 13:50:48 +02:00
Zanz2 5d667f146e Moved .js form reset and made a standalone description method 2017-10-11 17:59:09 +02:00
Oleksii Kriuchykhin 9a8e33c6d7 Small fixes [SCI-1642] 2017-10-11 17:24:31 +02:00
zmagod 3740e89ca0 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1572 2017-10-11 15:20:09 +02:00
zmagod abe0b8adcc tweak tweak 2017-10-11 15:20:03 +02:00
Luka Murn fe89b942e7 Add Add-ons page to User -> Settings -> Account
Closes SCI-1675.
2017-10-11 14:15:37 +02:00
zmagod 9e2b589e4b fixes phantom.js parser error 2017-10-11 10:37:18 +02:00
zmagod f71ff8589d changes testing image 2017-10-11 09:51:20 +02:00
okriuchykhin 0d3cb3a129 Merge pull request #814 from okriuchykhin/ok_GIOT_55
Remove GIOT sign-in button [GIOT-55]
2017-10-10 17:04:34 +02:00
okriuchykhin 5364b7d659 Merge pull request #815 from okriuchykhin/ok_GIOT_44
Add editable field to task in tasks tree API call [GIOT-44]
2017-10-10 17:04:19 +02:00
mlorb 8bd698e5c3 Merge pull request #817 from mlorb/ml-sci-1632
Fixes buttons on my profile page [SCI-1632]
2017-10-10 16:30:50 +02:00
mlorb 7ca29b50a2 Merge pull request #816 from mlorb/ml-sci-1636
Fixes style errors on one team page [SCI-1636]
2017-10-10 16:23:50 +02:00
Zmago Devetak e99791bd29 Merge pull request #819 from ZmagoD/fix_webpacker_production_configuration
fixes webpack production build
2017-10-10 15:08:28 +02:00
zmagod f12a645fa3 fix hound 2017-10-10 15:01:25 +02:00
zmagod f00c36998d removes unneeded style component 2017-10-10 14:51:46 +02:00
zmagod a35ba0239a fixes flow types 2017-10-10 14:48:46 +02:00
Zmago Devetak d1c3d00c84 Merge pull request #807 from ZmagoD/zd_SCI_1629
adds bootstrap and font-awesome in webpacker build fixes the missing …
2017-10-10 14:09:52 +02:00
zmagod c014742a88 fixes webpack production build 2017-10-10 14:08:23 +02:00
Oleksii Kriuchykhin 58c2487eb6 Enable :preserve_files in paperclip config [SCI-1626] 2017-10-10 13:32:14 +02:00
mlorb fd859d7b7f fixes buttons on my profile page 2017-10-10 13:25:44 +02:00
mlorb 7dae772822 fixes style errors on one team page 2017-10-10 11:32:13 +02:00
zmagod 9e1622ccd2 adds profile steps 2017-10-10 09:17:55 +02:00
mlorb 25e6eb4511 Merge pull request #812 from mlorb/ml-sci-1634
Fix a few style error on All teams page [SCI-1634]
2017-10-09 14:59:57 +02:00
Oleksii Kriuchykhin f8334b3d5b Add editable field to task in tasks tree API call [GIOT-44] 2017-10-09 14:38:33 +02:00
mlorb 1049e0730e implements @ZmagoD comments 2017-10-09 13:59:32 +02:00
Oleksii Kriuchykhin bd26052110 Remove GIOT sign-in button [GIOT-55] 2017-10-09 11:56:46 +02:00
Zmago Devetak 35f467c5fd Merge pull request #809 from ZmagoD/zd_SCI_1628
Activities are not separated by date
2017-10-09 11:08:28 +02:00
zmagod fc585ebe11 refactor GlobalActivitiesModal constructor 2017-10-09 10:58:40 +02:00
zmagod 943339345a Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1628 2017-10-09 10:41:36 +02:00
zmagod 2d1c849106 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1629 2017-10-09 09:43:29 +02:00
zmagod bc2c9e24e2 set scss-lint to allow double quotes 2017-10-09 09:41:52 +02:00
Zmago Devetak 5ab5c7e898 Merge pull request #805 from ZmagoD/zd_SCI_1566
added notification alert [fixes SCI-1566]
2017-10-09 09:35:33 +02:00
zmagod d85233cb2c Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1566 2017-10-09 09:30:06 +02:00
zmagod f370d170df fix package.json 2017-10-09 09:27:25 +02:00
Zmago Devetak f2103dca6d Merge pull request #811 from ZmagoD/zd_SCI_1567
fixes sign out action on settings page, clean the redux store, handle…
2017-10-09 09:24:57 +02:00
zmagod 0a8ef8cd9d removed unneeded import 2017-10-09 09:23:25 +02:00
zmagod 2a64d23a6e Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1567 2017-10-09 09:14:58 +02:00
Zanz2 8720222ac2 Added sanitising for all input, this escapes javascript too as far as i know (sanitize_input function from sanitize helper) 2017-10-07 22:45:01 +02:00
Zanz2 183c93d21b Refactoring to git review specifications 2017-10-07 22:13:31 +02:00