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

3279 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zanz2 dac59cf4d0 Refactored to PR, deleted unrelated things 2018-02-06 09:06:33 +01:00
Zanz2 0607579d06 Fixes the database error i was having on home machine too, wasnt exclusive to me 2018-01-27 14:57:07 +01:00
Zanz2 70a972c264 Fixed pr and small oversight 2018-01-27 14:33:01 +01:00
Zanz2 2a287193b7 Merge branch 'images_not_imported_SCI1807' of https://github.com/Zanz2/scinote-web into images_fix 2018-01-27 13:50:35 +01:00
Zanz2 e8f6dc0d24
Merge pull request #962 from Zanz2/missing_error_SCI1993 
A red error messagge is now displayed when not selecting protocol [SCI-1993]
 2018-01-26 16:00:15 +01:00
Zanz2 1d4ce42f23 fixed according to PR 2018-01-26 15:29:13 +01:00
Zanz2 98b3ddbdb0
Merge branch 'master' into images_not_imported_SCI1807 2018-01-26 15:13:40 +01:00
Zanz2 a15e624b06
Merge pull request #965 from Zanz2/sub_prot_2short_SCI1995 
Changed sub protocol name length limit to limit of protocol titles on scinote [SCI-1995]
 2018-01-26 15:08:03 +01:00
Zanz2 e041426a09
Merge pull request #964 from Zanz2/steps_order_SCI1816 
Steps order fix [SCI-1816]
 2018-01-26 11:32:28 +01:00
Zanz2 48b48c945c Refactored hound errors, now that rubocop works 2018-01-26 11:17:49 +01:00
okriuchykhin 94f604ae17
Merge pull request #961 from okriuchykhin/ok_SCI_1994 
Actually return 404 when requested asset doesn't exist [SCI-1994]
 2018-01-26 11:14:59 +01:00
Zanz2 020e9ddc16 Merge branch 'images_not_imported_SCI1807' of https://github.com/Zanz2/scinote-web into images_not_imported_SCI1807 2018-01-26 11:08:47 +01:00
Zanz2 a48fc168a9 deleted un needed function 2018-01-26 11:05:19 +01:00
Zanz2 6f56f829da Now protocols name from attached protocol is shortened based on title limit length (255 characters),also has same limitations as scinote title 2018-01-26 10:49:38 +01:00
Zanz2 4ee51959eb fixed hound 2018-01-26 09:56:59 +01:00
Zanz2 4ed1555ebb small fix, ordering 2018-01-26 09:45:41 +01:00
Zanz2 346f9feaef Refactored pull request, but also just did a quick fix on a bug where special characters in titles of steps (% & #) got escaped by sanitize helper, now the string gets sanitized first, then the special characters get unescaped by CGI. unescape html 2018-01-26 09:34:58 +01:00
Zanz2 24e772d7e5 Merge branch 'steps_order_SCI1816' of https://github.com/Zanz2/scinote-web into steps_order_SCI1816 2018-01-26 08:26:38 +01:00
Zanz2 e484f0569b
Merge pull request #960 from Zanz2/fixed_styling_after_merge 
Fixed some styling bugs that happened after the merge
 2018-01-26 08:19:29 +01:00
Zanz2 fc541147c8 A red error messagge is now displayed when selecting no protocol and pressing upload on protocols io import, and after the modal is closed the messagge is gone 2018-01-25 15:54:38 +01:00
okriuchykhin 0b1f43c1c5
Merge pull request #954 from okriuchykhin/ok_SCI_1970 
Add health check endpoint to API controller [SCI-1970]
 2018-01-25 14:33:37 +01:00
Oleksii Kriuchykhin 7dd9121072 Actually return 404 when requested asset doesn't exist [SCI-1994] 2018-01-25 14:30:04 +01:00
zanzdebian 8bd8c34c4d Fixed some styling bugs that happened after the merge, its using new function now, with old style, ( the old style turns the mouse cursor into a hand when it hovers over button) 2018-01-25 13:45:35 +01:00
mlorb ab2955c9bb
Merge pull request #956 from mlorb/ml-sci-1491 
Add notification for previous task has been completed [SCI-1491]
 2018-01-25 11:35:19 +01:00
Zmago Devetak 4716fc7752
Merge pull request #955 from biosistemika/decoupling 
Decoupling
 2018-01-25 11:33:06 +01:00
Zmago Devetak 1e407bd9c5
removes unneeded classes 2018-01-25 11:00:48 +01:00
Zanz2 00ac774fde Made images now display in protocol description, before_start, warning,guidelines, manuscript_citation, and also in Step description and step expected result 2018-01-24 13:40:13 +01:00
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
Oleksii Kriuchykhin 28be7c4fc4 Add health check endpoint to API controller [SCI-1970] 2018-01-22 16:52:48 +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