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

3344 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matej Zrimšek a21343a819 Fixing and refactoring project permissions in controllers. 2018-02-14 13:16:32 +01:00
Matej Zrimšek 279da20060 Fixed Hound warnings. 2018-02-14 13:16:32 +01:00
Matej Zrimšek d423700e84 Used permissions where they were missing. 2018-02-14 13:16:32 +01:00
Matej Zrimšek 321ddc2916 Grouped existing project permissions and used 'canaid' gem. 2018-02-14 13:09:45 +01:00
Zmago Devetak 027297d46a
Merge pull request #985 from ZmagoD/zd_SCI_2008 
fixes bug with assets upload on task result page,
 2018-02-12 11:40:44 +01:00
okriuchykhin e7fb1bc716
Merge pull request #967 from okriuchykhin/ok_SCI_1966 
Merge gilson-iot-rails4 to master [SCI-1966]
 2018-02-12 11:02:17 +01:00
okriuchykhin 5a94b40d9c
Merge pull request #978 from okriuchykhin/ok_SCI_2003 
Improve files handling in protocol cloning [SCI-2003]
 2018-02-12 11:01:59 +01:00
Zanz2 128f15f984
Merge pull request #990 from Zanz2/code_formatting_sci1822 
Commands in protocols io steps are now properly formatted like code [SCI-1822]
 2018-02-08 08:52:44 +01:00
Zanz2 a6356d2420 Fixed newline styling, now code is styled in newlines, and since \n doesnt work i change it to <br> with gsub and that allows code to be written into multiple lines 2018-02-07 14:46:25 +01:00
Zmago Devetak e400514020
Merge pull request #981 from ZmagoD/zd_SCI_2026 
fixes bug with step table update [fixes SCI-2026]
 2018-02-07 14:35:15 +01:00
Zmago Devetak b33d09536e
Merge pull request #987 from ZmagoD/zd_SCI_2033 
fixes user dropdown [fixes SCI-2033]
 2018-02-07 14:34:37 +01:00
Zanz2 efaf5ad721 Commands now get styled like code 2018-02-07 13:51:22 +01:00
Zanz2 ef0733b886
Merge pull request #988 from Zanz2/red_error_msg_sci1993 
Accidentally deleted this off master, identical to the branch before [SCI-1993]
 2018-02-07 13:08:45 +01:00
mlorb edbcdc6bf4
Merge pull request #986 from mlorb/ml-sci-2031 
Fix error on task activity [SCI-2031]
 2018-02-07 11:39:14 +01:00
Zanz2 367eff6401 re-pushing this, this got merged into master already but i accidentally deleted it when merging two branches 2018-02-07 11:17:53 +01:00
zmagod 695e9d90d2 fixes user dropdown [fixes SCI-2033] 2018-02-07 08:43:42 +01:00
Luka Murn 4389c110cf
Merge pull request #982 from biosistemika/lm-remove-component-loader 
Remove component loader (so builds pass)
 2018-02-06 17:02:08 +01:00
Luka Murn b5ac4494d5 Uncommit load_addons_specs.rb 2018-02-06 16:58:15 +01:00
mlorb e151c963e1 fix error on task activity 2018-02-06 16:34:16 +01:00
zmagod 2ad4eb3488 fix bug with checklists 2018-02-06 16:15:10 +01:00
zmagod 75cc9d11df fix error on checklists 2018-02-06 16:06:15 +01:00
Zmago Devetak 25a42658c8
Merge pull request #980 from ZmagoD/zd_SCI_2009 
adds nil check in step_table_element for table name [fixes SCI-2009]
 2018-02-06 15:44:56 +01:00
zmagod bd1345d560 fixes bug with assets upload on task result page, 
adds ctrl+v listener to upload images from clipboard, adds image preview modal
 2018-02-06 15:39:19 +01:00
Zanz2 a2df9777f6
Merge pull request #983 from Zanz2/gen_rep_empty_sci-2000 
fixed empty table name unable to generate reports bug [SCI-2000]
 2018-02-06 14:34:31 +01:00
Zanz2 83e9550feb
Merge pull request #966 from Zanz2/images_not_imported_SCI1807 
Images not imported [SCI-1807]
 2018-02-06 14:33:35 +01:00
Zanz2 748af2cbf7 Fixed the issue, table name defaults to empty string space now 2018-02-06 10:29:49 +01:00
Zanz2 dac59cf4d0 Refactored to PR, deleted unrelated things 2018-02-06 09:06:33 +01:00
Luka Murn b877c9da59 Completely remove react-hijack from package.json 2018-02-06 08:54:12 +01:00
Luka Murn 5281d0792e Comment load_addons_specs.rb out 2018-02-06 08:48:33 +01:00
Luka Murn 4ddc7dfa85 Comment react-hijack code 2018-02-06 08:00:29 +01:00
zmagod b48fa3f231 fixes bug with step table update [fixes SCI-2026] 2018-02-05 17:32:38 +01:00
zmagod ad742ac2d1 adds nil check in ste_table_element for table name [fixes SCI-2009] 2018-02-05 16:27:04 +01:00
Zmago Devetak f67f633562
Merge pull request #953 from ZmagoD/zd_SCI_1960 
update user settings controllers to new permission system [fixes SCI-…
 2018-02-01 16:18:54 +01:00
Zmago Devetak 82c651b3cb
Merge pull request #976 from ZmagoD/zd_SCI_1998 
adds spec/features loader [fixes SCI-1998]
 2018-02-01 16:11:48 +01:00
zmagod 25dcfe66ae Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1960 2018-02-01 16:04:05 +01:00
Oleksii Kriuchykhin 16e1d072b9 Improve files handling in protocol clonning [SCI-2003] 2018-02-01 15:44:08 +01:00
zmagod 2684d2b515 fix typo 2018-02-01 15:34:40 +01:00
zmagod 60d1fb5e66 fixes gitignore 2018-02-01 15:31:36 +01:00
Luka Murn 54c744948f
Merge pull request #977 from biosistemika/release-1.12.10 
Merge release-1.12.10 into master
 2018-02-01 14:35:56 +01:00
zmagod 952173fbd6 escape if no feature folder present 2018-02-01 14:03:36 +01:00
zmagod c6d585bc57 adds spec/features loader [fixes SCI-1998] 2018-02-01 13:37:52 +01:00
Luka Murn e7f7fe9ff7 Bump version to 1.12.10 2018-02-01 13:18:34 +01:00
okriuchykhin def08a3faa
Merge pull request #971 from okriuchykhin/ok_SCI_1968 
Update notification settings accessor names and update Rubocop config [SCI-1968]
 2018-01-31 15:40:09 +01:00
zmagod 366b67ca1c fixes per @mojca 's request 2018-01-31 15:18:18 +01:00
mlorb 39fc52ddf4
Merge pull request #972 from mlorb/ml-sci-1997 
Fix type error at changing task at navigation bar after setting due date [SCI-1997]
 2018-01-31 15:13:28 +01:00
Zmago Devetak ccab688728
Merge pull request #975 from ZmagoD/zd_SCI_2001 
Zd sci 2001
 2018-01-31 14:42:41 +01:00
zmagod b1684dbd5b removed unneeded hook 2018-01-31 14:40:19 +01:00
okriuchykhin ae1dcc3871
Merge pull request #974 from okriuchykhin/ruby-2.4.3 
Update Ruby version to 2.4.3
 2018-01-31 14:19:28 +01:00
okriuchykhin df66a3b410
Merge pull request #973 from okriuchykhin/ok_SCI_1975 
Allow optional tagging for logs [SCI-1975]
 2018-01-31 13:31:01 +01:00
zmagod 34f5076b04 fixes failin specs [fixes SCI-2001] 2018-01-31 12:05:45 +01:00