scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-01 13:13:22 +08:00
Code Issues Projects Releases Packages Wiki Activity
3567 commits 39 branches 184 tags 168 MiB
Commit graph

3567 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
mlorb
7b83fd8807
Merge pull request #970 from mlorb/ml-sci-1614 
Fix bug with ajax error caused to the other user when deleting column…
 2018-01-31 10:40:13 +01:00
Oleksii Kriuchykhin
b8b13b2086 Update Ruby version to 2.4.3 2018-01-31 10:02:45 +01:00
Luka Murn
989182348a
Merge pull request #968 from Ducz0r/lm-fix-canaid-initializer 
Fix canaid initializer so it only uses required Gems' permissions
 2018-01-31 08:34:00 +01:00
Luka Murn
d4183aa253 Fix a typo 2018-01-31 08:20:42 +01:00
Oleksii Kriuchykhin
bdc60b9d53 Allow optional tagging for logs [SCI-1975] 2018-01-30 18:24:01 +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
Luka Murn
f752f82658 Fix canaid initializer so it only uses required Gems' permissions 
This should make sure that other addons that are located in
/addons folder, but not actually required by the core,
do not cause trouble.
 2018-01-26 16:24:28 +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
Oleksii Kriuchykhin
7c14800570 Change base class for API controller [SCI-1966] 2018-01-26 13:34:38 +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