Commit graph

2468 commits

Author SHA1 Message Date
Zanz2
8b247770ef Added the success flash alert 2017-11-09 10:49:44 +01:00
Zanz2
9086cd8b6b Jira branch code 2017-11-09 10:49:44 +01:00
mlorb
126f278308
Merge pull request #853 from Zanz2/ZZ_import_protocolsio_json
Scinote protocols IO base branch
2017-11-06 14:53:01 +01:00
Zanz2
04c6f0c20d schema missing space 2017-11-03 21:50:06 +01:00
Zanz2
0dc0109d91 reverted schema 2017-11-03 21:47:52 +01:00
Zanz2
4354363215 rubocop refactor css 2017-11-03 16:46:03 +01:00
Zanz2
ac26b17ddf Rubocop refactor 2017-11-03 16:45:15 +01:00
Zanz2
aa03a889c7 Fixed PR review 2017-11-03 16:28:15 +01:00
Zanz2
79e0a11054 Fixed before start and link not displaying in protocol description 2017-10-25 17:39:01 +02:00
Zanz2
a645bcb32d fixed oversight;Changed double quote to single 2017-10-25 17:21:05 +02:00
Zanz2
19b9da2e83 deleted comment 2017-10-24 19:44:34 +02:00
Zanz2
49501b3d3d Finished review refactor 2017-10-24 19:24:53 +02:00
Zanz2
03e40017e4 Updated local 2017-10-19 19:58:18 +02:00
Zanz2
ae9ac46472 Put the two blocks of code into seperate partials 2017-10-19 00:13:35 +02:00
Zanz2
67b09adaeb Fixed last few rubocop errors 2017-10-17 19:43:46 +02:00
Zanz2
6cf775a4b1 Refactored code, made html render on preview too 2017-10-17 19:27:20 +02:00
Zanz2
e72c1bebcb deleted comments 2017-10-12 19:18:22 +02:00
Zanz2
8d0d6f0502 refactored methods 2017-10-12 19:10:16 +02:00
okriuchykhin
db9a031581 Merge pull request #813 from okriuchykhin/ok_SCI_1642
Refactor canvas [SCI-1642]
2017-10-12 17:45:34 +02:00
Zanz2
21036a1081 Deleted unnecesarry if's 2017-10-12 17:22:02 +02:00
Zanz2
414a15872c Made seperate method for steps mapping 2017-10-12 17:15:43 +02:00
gazvoda
88f03a0706 Merge pull request #735 from gazvoda/lg-SCI-1249-v2
Truncate checklist items in activity modal [fixes SCI-1249]
2017-10-12 15:58:05 +02:00
Zanz2
5d667f146e Moved .js form reset and made a standalone description method 2017-10-11 17:59:09 +02:00
Oleksii Kriuchykhin
9a8e33c6d7 Small fixes [SCI-1642] 2017-10-11 17:24:31 +02:00
Zanz2
8720222ac2 Added sanitising for all input, this escapes javascript too as far as i know (sanitize_input function from sanitize helper) 2017-10-07 22:45:01 +02:00
Zanz2
183c93d21b Refactoring to git review specifications 2017-10-07 22:13:31 +02:00
Zanz2
9655c98566 Github review refactor 2017-10-07 20:47:05 +02:00
Zanz2
3a8092b663 Refactor and threw out useless comments 2017-10-07 18:05:09 +02:00
Zanz2
d52400f741 Refactored code according to review 2017-10-07 17:58:23 +02:00
Zanz2
2b9563ec6d Added preview text to en.yml 2017-10-07 17:45:23 +02:00
Zanz2
f5b2ad0d34 Refactor github code review 2017-10-07 16:07:04 +02:00
Zanz2
66e5004e60 Changed import text to be inside en.yml, as said in the code review, deleted some blank lines 2017-10-07 15:56:43 +02:00
lenart
de3c18509f Variable name changes, added comments to code [fixes SCI-1249] 2017-10-06 17:12:15 +02:00
Oleksii Kriuchykhin
6820511ea0 Further canvas optimizations [SCI-1642] 2017-10-06 12:43:27 +02:00
Zanz2
48f03d6dfb hound blank line fix 2017-10-05 18:41:58 +02:00
Zanz2
fc1cd73e1d fixed hound blank line 2017-10-05 18:38:44 +02:00
Zanz2
9fd67019e0 Deleted unused file 2017-10-05 18:09:07 +02:00
Zanz2
64b72f4ad4 Fixed a bug, where if the url get query is nil (if you go directly to /protocols, it doesnt get the public type from url, now when it is nil it just defaults to public 2017-10-05 17:31:49 +02:00
Oleksii Kriuchykhin
b26b963e54 Optimize update canvas SQL and remove module group name [SCI-1642] 2017-10-05 16:19:25 +02:00
mlorb
91e2a6bab2 Merge pull request #787 from mlorb/ml-sci-1561
Fix bug with tinyMCE text validaton [SCI-1561]
2017-10-05 08:39:22 +02:00
okriuchykhin
2c5d913048 Merge pull request #804 from okriuchykhin/ok_SCI_1482
Improve memory utilization in PDF report generator [SCI-1482]
2017-10-04 17:51:28 +02:00
Oleksii Kriuchykhin
6824f9a8bc Improve memory utulization in PDF report generator [SCI-1482] 2017-10-02 11:29:22 +02:00
Luka Murn
7cc2136c74 Bump VERSION to 1.12.4 2017-09-29 13:32:31 +02:00
Zanz2
b23ca33e73 Deleted todo-list comments :D 2017-09-26 16:46:17 +02:00
Zanz2
9bf69276ae deleted unused files 2017-09-26 16:39:19 +02:00
Zanz2
c72cf6320a Finished rubocop refactoring 2017-09-26 16:19:09 +02:00
okriuchykhin
34d1735cf5 Merge pull request #800 from okriuchykhin/ok_SCI_1623_v2
Update AWS SDK v2 [SCI-1623]
2017-09-26 14:46:02 +02:00
Oleksii Kriuchykhin
faaa016267 Update AWS SDK v2 [SCI-1623] 2017-09-26 13:41:53 +02:00
Zanz2
3074acbc0d Made javascript code nicer 2017-09-26 13:31:24 +02:00
Zanz2
055746bfd9 Rubocop beautified code v2 2017-09-26 13:21:48 +02:00