scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-06 15:05:26 +08:00
Code Issues Projects Releases Packages Wiki Activity
3304 commits 43 branches 185 tags 169 MiB
Commit graph

3304 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zanz2
7fe1c20ebe Finished the protocol reorder functions and implemented them 2018-01-24 09:31:43 +01:00
Zanz2
96253c1089 Made some functions to help solve reordering of the protocols io steps 2018-01-23 18:40:23 +01:00
zmagod
c6f44e799c fixes JWT dependency issues 2018-01-23 16:25:59 +01:00
Mojca Lorber
ac8b1769be add notification for previous task has been completed 2018-01-23 15:53:33 +01:00
zmagod
88d7429041 1. fixes failing unit and integration tests 
2. fixes gem dependencies issues
3. fixes failing migrations
4. updates depricated factory_girl => factory_bot and fixes related issues

Signed-off-by: zmagod <zmago_devetak@yahoo.com>
 2018-01-23 14:54:15 +01:00
okriuchykhin
a2896031ab
Merge pull request #951 from okriuchykhin/ok_SCI_1949 
Allow first user seeding from env variables [SCI-1949]
 2018-01-23 14:02:54 +01:00
zmagod
f8a3fca2db Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling 2018-01-23 11:06:33 +01:00
zmagod
259880c441 add permission helpers for view project and experiment 2018-01-23 08:52:10 +01:00
Oleksii Kriuchykhin
28be7c4fc4 Add health check endpoint to API controller [SCI-1970] 2018-01-22 16:52:48 +01:00
zmagod
ee7c646b1d update user settings controllers to new permission system [fixes SCI-1960] 2018-01-22 16:42:26 +01:00
okriuchykhin
73b56beae9
Merge pull request #950 from okriuchykhin/ok_SCI_1329 
Clear selected rows when changing pages on samples table[SCI-1329]
 2018-01-22 15:07:38 +01:00
Zmago Devetak
d796e5e64d
Merge pull request #952 from ZmagoD/zd_SCI_1948 
adds Delayed::Worker initializer [fixes SCI_1948]
 2018-01-22 14:42:08 +01:00
zmagod
246146c71e adds Delayed::Worker initializer [fixes SCI_1948] 2018-01-19 16:30:29 +01:00
okriuchykhin
37e4a26271
Merge pull request #949 from okriuchykhin/ok_SCI_1951 
Fix fetching protocol name in protocol import [SCI-1951]
 2018-01-19 14:05:35 +01:00
Oleksii Kriuchykhin
959eddacda Clear selected rows when changing pages on samples table[SCI-1329] 2018-01-18 17:41:35 +01:00
Oleksii Kriuchykhin
df28503ec1 Fix fetching protocol name in protocol import [SCI-1951] 2018-01-18 17:25:20 +01:00
Oleksii Kriuchykhin
d1a515da90 Allow first user seeding from env variables [SCI-1949] 2018-01-18 16:23:33 +01:00
Adrian Oprea
cb7f00c9ad
Merge pull request #948 from ZmagoD/zd_SCI_1950 
fixes bug with navbar[SCI-1950]
 2018-01-18 14:45:22 +02:00
zmagod
2857857c24 fixes bug with navbar[SCI-1950] 2018-01-18 13:29:47 +01:00
Zmago Devetak
7b28bfa6d4
Merge pull request #937 from ZmagoD/feat/external-components-loader 
Enable loading of external React components
 2018-01-18 11:13:40 +01:00
okriuchykhin
aef80f86b5
Merge pull request #934 from okriuchykhin/ok_SCI_1931 
Fix protocol import button [SCI-1931]
 2018-01-18 10:30:19 +01:00
Adrian Oprea
f2f624cfa6 Merge branch 'decoupling' of github.com:biosistemika/scinote-web into feat/external-components-loader 
* 'decoupling' of github.com:biosistemika/scinote-web:
  fix(AboutScinoteModal): Enable react optimizations
  Fix addons display in info modal [SCI-1875]
  Set strict version for rubocop gem, because the new one is not compatible with the previously used one. Also updated it to the newest version.
 2018-01-18 10:24:36 +02:00
Adrian Oprea
9fd1f81f20
Merge pull request #946 from okriuchykhin/ok_SCI_1875_v3 
Fix addons display in info modal [SCI-1875]
 2018-01-18 10:19:44 +02:00
Adrian Oprea
12fd630d0c fix(AboutScinoteModal): Enable react optimizations 
Children generated within a loop or by an iterator need to be passed
a unique `key` property so React can properly watch their updates and
perform the necessary actions.

Signed-off-by: Adrian Oprea <adrian@oprea.rocks>
 2018-01-18 09:59:37 +02:00
mz3944
d4bf933983
Merge pull request #939 from mz3944/mz-rubocop-update 
rubocop gem update
 2018-01-17 18:54:43 +01:00
Oleksii Kriuchykhin
91468faaf9 Fix addons display in info modal [SCI-1875] 2018-01-17 18:30:55 +01:00
Adrian Oprea
6d84790bdb Merge branch 'decoupling' of github.com:biosistemika/scinote-web into feat/external-components-loader 
* 'decoupling' of github.com:biosistemika/scinote-web: (21 commits)
  fixes bug in the invitation_controller with full_name sanitization [fixes SCI-1944]
  Remove Addons info test from core [SCI-1875]
  Remove skip_on_import from repository_cell [SCI-1939]
  fixes bug with comment actions dropdown [fixes SCI-1938]
  fixes first element in global activities logs[fixes SCI-1866]
  Fix task repository row selector [SCI-1940]
  Fix repository item export [SCI-1945]
  Fix samples import [SCI-1946]
  adds first date to _list.html.erb view
  Remove Addons caption if no addons in info modal and fix linter packages [SCI-1875]
  Fix repository records import [SCI-1939]
  Fix export samples button [SCI-1936]
  refactor
  adds additional tests for permissions controller
  fix HOC to recive objects
  fixes flow, and before_action in permissions_controller
  fixes per @duco 's request
  remove unneeded import
  add permissions endpoint on the API
  fix request
  ...
 2018-01-17 18:14:41 +02:00
Zmago Devetak
b4b6fddca3
Merge pull request #945 from ZmagoD/zd_SCI_1944 
fixes bug in the invitation_controller with full_name sanitization [f…
 2018-01-17 17:02:34 +01:00
Adrian Oprea
157969aa5e HACK: Comment out code which returns invalid data 
It seems like the backend is returning a weird response when queried for
addons. Once the backend issue is identified and fixed this should be
uncommented.

Signed-off-by: Adrian Oprea <adrian@oprea.rocks>
 2018-01-17 17:54:35 +02:00
Adrian Oprea
cade0ae686 chore: Use latest version of react-hijack 
The render hijacking library wash updated to use our own version of
react-traversal. The original library did not provide ES5 build so the
overall app build was failing.

Signed-off-by: Adrian Oprea <adrian@oprea.rocks>
 2018-01-17 17:21:46 +02:00
okriuchykhin
8394055fba
Merge pull request #938 from okriuchykhin/ok_SCI_1875_v2 
Remove Addons caption if no addons in info modal and fix linter packages
 2018-01-17 15:33:43 +01:00
zmagod
488dba378e fixes bug in the invitation_controller with full_name sanitization [fixes SCI-1944] 2018-01-17 15:06:43 +01:00
Oleksii Kriuchykhin
30c05a06b9 Remove Addons info test from core [SCI-1875] 2018-01-17 14:20:11 +01:00
Zmago Devetak
26f7a94392
Merge pull request #943 from ZmagoD/zd_SCI_1866_v2 
fixes first element both in Rails part an React part off the application
 2018-01-17 14:12:52 +01:00
Zmago Devetak
b9e56c49ef
Merge pull request #944 from ZmagoD/zd_SCI_1938 
fixes bug with comment actions dropdown [fixes SCI-1938]
 2018-01-17 13:42:36 +01:00
Adrian Oprea
a0cb6c6bec chore: Update react-hijack to 2.0.0 
Signed-off-by: Adrian Oprea <adrian@oprea.rocks>
 2018-01-17 14:41:10 +02:00
Adrian Oprea
b559f3cbd4 refactor(Navigation): Use identifier instead of screenName 
Signed-off-by: Adrian Oprea <adrian@oprea.rocks>
 2018-01-17 14:40:33 +02:00
Adrian Oprea
4b9013bcab refactor(massageConfiguration): Create response only when we have addons 
Signed-off-by: Adrian Oprea <adrian@oprea.rocks>
 2018-01-17 14:39:42 +02:00
okriuchykhin
38aaaa011c
Merge pull request #936 from okriuchykhin/ok_SCI_1939 
Fix repository records import [SCI-1939]
 2018-01-17 12:55:11 +01:00
Oleksii Kriuchykhin
819febb05b Remove skip_on_import from repository_cell [SCI-1939] 2018-01-17 12:54:32 +01:00
zmagod
5371f5a139 fixes bug with comment actions dropdown [fixes SCI-1938] 2018-01-17 12:54:21 +01:00
okriuchykhin
8ccb361525
Merge pull request #940 from okriuchykhin/ok_SCI_1946 
Fix samples import [SCI-1946]
 2018-01-17 12:51:35 +01:00
okriuchykhin
1692bdade7
Merge pull request #941 from okriuchykhin/ok_SCI_1945 
Fix repository item export [SCI-1945]
 2018-01-17 12:50:22 +01:00
okriuchykhin
2c2914f691
Merge pull request #942 from okriuchykhin/ok_SCI_1940 
Fix task repository row selector [SCI-1940]
 2018-01-17 12:50:11 +01:00
zmagod
0922ee21a7 fixes first element in global activities logs[fixes SCI-1866] 2018-01-17 12:01:58 +01:00
Oleksii Kriuchykhin
74a62c41eb Fix task repository row selector [SCI-1940] 2018-01-17 11:21:41 +01:00
okriuchykhin
016ead607e
Merge pull request #935 from okriuchykhin/ok_SCI_1936 
Fix export samples button [SCI-1936]
 2018-01-17 10:43:09 +01:00
Oleksii Kriuchykhin
86853e8fc1 Fix repository item export [SCI-1945] 2018-01-17 10:39:01 +01:00
Oleksii Kriuchykhin
3c8d8e2fbb Fix samples import [SCI-1946] 2018-01-16 17:50:33 +01:00
Matej Zrimšek
9ef04a6a2b Set strict version for rubocop gem, because the new one is not compatible with the previously used one. Also updated it to the newest version. 2018-01-16 17:01:44 +01:00