scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-09 00:49:07 +08:00
Code Issues Projects Releases Packages Wiki Activity
3332 commits 40 branches 184 tags 169 MiB
Commit graph

2631 commits

Author SHA1 Message Date
Zanz2
60aa1a0953 Authors are now displayed as actual authors, not the person that added the protocol, and the created at date from protocols io is in protocol info, like it was before 2018-02-07 15:12:03 +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
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
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
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
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
zmagod
25dcfe66ae Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1960 2018-02-01 16:04:05 +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
zmagod
34f5076b04 fixes failin specs [fixes SCI-2001] 2018-01-31 12:05:45 +01:00
mlorb
553039b7b4 fix type error at changing task at navigation bar after seting due date 2018-01-30 13:29:54 +01:00
Oleksii Kriuchykhin
7a769bbfde Update notification settings accessor names and update Rubocop config [SCI-1968] 2018-01-29 16:15:12 +01:00
mlorb
775b8b3201 fix bug with ajax error caused to the other user when deleting column in custom repository 2018-01-29 16:01:33 +01:00
zmagod
029d69b033 revert to old setting [fixes SCI-1967] 2018-01-29 15:42:22 +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