Commit graph

2393 commits

Author SHA1 Message Date
zmagod
b90348eabf adds numeric.js to constants 2017-08-09 16:01:03 +02:00
zmagod
790ae9d685 moved files to app/ folder 2017-08-09 15:21:02 +02:00
zmagod
7630f6af3d styled notifications dorpdown 2017-08-09 14:49:29 +02:00
zmagod
007f50a158 adds main stylesheet for global styles 2017-08-09 12:46:04 +02:00
zmagod
bd352869a3 adds user account dropdown 2017-08-09 09:08:13 +02:00
zmagod
226458a3f0 adds recent notifications 2017-08-08 15:44:28 +02:00
zmagod
be42cd2204 refactor 2017-08-07 13:51:22 +02:00
zmagod
be29db2f78 changed folder name 2017-08-07 11:13:09 +02:00
zmagod
0a7c6300b0 fixes eslint 2017-08-07 09:31:24 +02:00
zmagod
d707057aa4 fix eslint to work with airbnb standard 2017-08-04 09:39:42 +02:00
zmagod
c314bae28d add team switch js/controller 2017-08-03 16:03:15 +02:00
zmagod
2e83322f76 fixes global activities 2017-08-03 11:17:09 +02:00
zmagod
6ef19725f1 adds redux 2017-08-02 17:27:05 +02:00
zmagod
caae1e2fe8 adds intl, router, bootstrap to npm modules 2017-07-31 10:42:40 +02:00
Toni Dezman
5a922b3f85 adds yarn.lock file 2017-07-28 14:15:15 +02:00
Toni Dezman
f76512f364 adds hound recomendations for react/settings_controller.rb 2017-07-28 12:53:15 +02:00
Toni Dezman
ffda8b259b adds Redux and changes to index.jsx page 2017-07-28 10:52:25 +02:00
Toni Dezman
1673d43993 adds react/settings controller and react/layout 2017-07-27 15:26:03 +02:00
Toni Dezman
d781ff9b2d removes unnecessary code from packs/settings/index.jsx 2017-07-27 14:22:28 +02:00
Toni Dezman
0f4286d5d1 adds Settings index react page 2017-07-27 14:21:27 +02:00
Toni Dezman
1ce787603e adds immutable.js 2017-07-27 14:06:09 +02:00
Toni Dezman
78f26525e9 Settings SPA works 2017-07-27 13:53:29 +02:00
Zmago Devetak
f43419d9a9 Merge pull request #733 from ZmagoD/zd_SCI_1400
setup testing tools [fixes SCI-1400]
2017-07-26 16:23:31 +02:00
zmagod
416ab8eee3 Merge branch 'rails-5.1' of https://github.com/biosistemika/scinote-web into zd_SCI_1400 2017-07-26 16:20:09 +02:00
zmagod
cd7ababab0 fix sample types 2017-07-26 16:16:08 +02:00
Zmago Devetak
a423315800 Merge pull request #729 from ZmagoD/zd_SCI_1418
fixes bug with devise_security_extension [fixes SCI-1418]
2017-07-25 14:36:05 +02:00
okriuchykhin
d671ad50b5 Merge pull request #740 from okriuchykhin/ok_SCI_1461
Add Webpacker and React [SCI-1461]
2017-07-13 14:32:34 +02:00
Oleksii Kriuchykhin
4e14a7a1cd Eslint config improvements [SCI-1461] 2017-07-13 14:30:12 +02:00
Oleksii Kriuchykhin
ba35717243 Fix babel and eslint config [SCI-1461] 2017-07-13 14:11:01 +02:00
Oleksii Kriuchykhin
b8e93ee883 Add Webpacker and React [SCI-1461] 2017-07-12 16:41:55 +02:00
zmagod
dfd488fa96 prevents cleaning data after rspec 2017-07-10 14:38:18 +02:00
Luka Murn
bc8d945101 Damn, I spent too much time on GeneIO. Fixing again >_< 2017-07-07 13:19:39 +02:00
Luka Murn
e9ef7b61ef Fix WickedPdf bug on production 2017-07-07 13:05:18 +02:00
zmagod
6636190442 removes unneeded gems, adds validation test to models 2017-07-06 17:37:29 +02:00
mz3944
f55861b373 Merge pull request #731 from mz3944/mz-SCI-1413
Fixed some RoR 5.1 default settings. [SCI-1413]
2017-07-06 17:17:27 +02:00
Luka Murn
4317da343b Don't use listen gem in development mode 2017-07-06 16:49:50 +02:00
Luka Murn
9f60ece25f Merge branch 'master' into rails-5.1
Conflicts:
	app/models/repository.rb
	app/models/repository_row.rb
	app/views/projects/index.html.erb
	app/views/shared/_secondary_navigation.html.erb
2017-07-06 15:12:15 +02:00
Matej Zrimšek
9d0fd4e76f Reverted settings for WebSockets, because we might use redis subscription adapter. [SCI-1413] 2017-07-06 12:55:58 +02:00
zmagod
234ca71f0a removes unneded gems, fixes hound 2017-07-06 09:45:59 +02:00
zmagod
34478b5ce5 restore rake tasks 2017-07-06 09:32:08 +02:00
zmagod
750c82a80f setup testing tools [fixes SCI-1400] 2017-07-06 09:07:05 +02:00
Luka Murn
738fc46080 Merge pull request #730 from Ducz0r/lm-sci-1427-fix
Fixes DEPRECATION WARNING-s for Rails 5.1.2 [SCI-1427]
2017-07-05 09:21:35 +02:00
Luka Murn
e3b9c1c644 Woops, almost forgot on this one 2017-07-04 15:00:14 +02:00
Luka Murn
8d68769d09 Hound is Love, Hound is Life 2017-07-04 14:47:58 +02:00
Matej Zrimšek
843116f645 Fixed some RoR 5.1 default settings. [SCI-1413] 2017-07-04 14:42:53 +02:00
Luka Murn
91cddce8a6 Fixes DEPRECATION WARNING-s for Rails 5.1.2
This just fixes the warning messages occured during click-through
of the application. I didn't systematically search code for all
potential problems (I couldn't find the list of all deprecations
anyway).

Closes SCI-1427.
2017-07-04 14:35:51 +02:00
Zmago Devetak
53a1dd14b7 Merge pull request #718 from ZmagoD/zd_SCI_1129_v3
Fixes error message [fixes SCI-1129]
2017-07-04 11:16:36 +02:00
Zmago Devetak
5f4006fe4a Merge pull request #723 from ZmagoD/zd_SCI_1408
Fixes bugs on canvas [fixes SCI-1408]
2017-07-04 11:16:04 +02:00
zmagod
de78a1681a fixes bug with devise_security_extension [fixes SCI-1418] 2017-07-04 11:14:25 +02:00
okriuchykhin
75c887ce7d Merge pull request #721 from okriuchykhin/ok_SCI_1412
Fix activities [SCI-1412]
2017-07-04 10:59:08 +02:00