Zanz2
|
49a4d9cf23
|
Tables now no longer have huge whitespace below them, it is now fixed 300 pixels and when its too big the table gets a scrollbar
|
2018-02-07 15:50:42 +01:00 |
|
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 |
|
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 |
|
Zanz2
|
efaf5ad721
|
Commands now get styled like code
|
2018-02-07 13:51:22 +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 |
|
Zanz2
|
dac59cf4d0
|
Refactored to PR, deleted unrelated things
|
2018-02-06 09:06:33 +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
|
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
|
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
|
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 |
|
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 |
|
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 |
|
zmagod
|
f8a3fca2db
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling
|
2018-01-23 11:06:33 +01:00 |
|
Zanz2
|
b105920d4e
|
Merge pull request #901 from Zanz2/code_refactor
Protocols.io code beautification and refactoring [SCI-1929]
|
2018-01-12 12:34:00 +01:00 |
|
Zanz2
|
3c6d37ce64
|
Fixed according to PR review
|
2018-01-11 18:37:36 +01:00 |
|
mlorb
|
99185871c4
|
fix naming things
|
2018-01-05 15:15:50 +01:00 |
|
Zanz2
|
83e1b04c7a
|
Fixed pull request
|
2017-12-24 01:49:04 +01:00 |
|
Zanz2
|
53561ffd84
|
Refactored according to PR
|
2017-12-15 20:39:15 +01:00 |
|
mlorb
|
806fcbce36
|
refactor update protocol in repository permission
|
2017-12-14 14:18:16 +01:00 |
|
mlorb
|
e0d1ae174e
|
refactor read protocol in repository permission
|
2017-12-14 14:18:15 +01:00 |
|
mlorb
|
43c01b74b1
|
refactor create protocol permission
|
2017-12-14 14:18:14 +01:00 |
|
Zmago Devetak
|
00be4460cc
|
Merge pull request #806 from ZmagoD/disable_tiny_mce_asset_unless_step
Fixes bug with embedded images [SCI-1624]
|
2017-12-12 09:53:24 +01:00 |
|
Zanz2
|
11dc3be9d4
|
It is now possible to scroll down preview modal
|
2017-12-10 01:41:21 +01:00 |
|
Zanz2
|
d0a9198408
|
Fixed the styling
|
2017-12-10 01:20:08 +01:00 |
|
Zanz2
|
fcbd956d6e
|
Finished code beautification
|
2017-12-03 01:17:49 +01:00 |
|
Zanz2
|
835ac6910f
|
Code refactor part 1
|
2017-12-02 00:29:47 +01:00 |
|
zmagod
|
7442684846
|
fix protocol preview, remove unneeded functions, fix copy paste tokens
|
2017-11-28 14:16:20 +01:00 |
|
Zanz2
|
bb8aef3b73
|
Merge pull request #893 from Zanz2/step_desc_2small_SCI-1833
Fixed validations lengths and added workarounds for bugs [SCI-1833]
|
2017-11-24 17:55:20 +01:00 |
|
Zmago Devetak
|
027f4a5921
|
Merge pull request #890 from ZmagoD/zd_SCI_1651
export and import RTE images
|
2017-11-24 16:28:28 +01:00 |
|
zmagod
|
d200e355ed
|
follow @Ducz0r 's suggestions
|
2017-11-24 11:45:07 +01:00 |
|
Zanz2
|
dc5904aed9
|
Fixed this jira issue and added workarounds for bugs
|
2017-11-24 01:45:40 +01:00 |
|
Zanz2
|
764e5259d1
|
Fixed last review, and a bug i found
|
2017-11-22 23:38:22 +01:00 |
|
Zanz2
|
f577bf93b5
|
Fixed pull request review
|
2017-11-21 19:20:15 +01:00 |
|
Zanz2
|
d8c809ffd0
|
Reviewed pull request
|
2017-11-20 23:19:34 +01:00 |
|
Zanz2
|
cf66d94d45
|
Reworked functions into one function, defined all protocols.io attributes as dynamic constants, applied length checking to all protocols.io attribute fields
|
2017-11-20 00:59:32 +01:00 |
|
Zanz2
|
a6009806c4
|
Fixed some oversights
|
2017-11-17 02:56:16 +01:00 |
|
Zanz2
|
fa25a6785b
|
Made the propper files and functionality for the text truncation to function
|
2017-11-17 02:43:32 +01:00 |
|
Zanz2
|
c44465817d
|
Added the functions and put in limitations from my validations files, changed controller name, added some locals
|
2017-11-16 20:03:44 +01:00 |
|
Zanz2
|
c3f6c2b34a
|
Found a bug where i forot to include protocol description in preview modal and fixed it
|
2017-11-14 19:46:51 +01:00 |
|
Zanz2
|
bc00c4a28b
|
Merge pull request #874 from Zanz2/supported_file_1794
Made button green and added .json to supported file [SCI-1794]
|
2017-11-14 19:12:45 +01:00 |
|
Zanz2
|
6b9a10ffe4
|
Made validations for JSON format and .txt and .json files
|
2017-11-14 12:02:17 +01:00 |
|
Zanz2
|
7ec8d7c2b2
|
Made button green and added .json to supported file
|
2017-11-14 11:46:19 +01:00 |
|
mlorb
|
cd6799d571
|
Merge pull request #866 from biosistemika/protocols-io-import
Protocols io import
|
2017-11-13 11:53:28 +01:00 |
|
Zanz2
|
b265beb386
|
Merge pull request #864 from Zanz2/move_desc
Move protocol.io protocol description to step 1 of protocols [SCI-1695]
|
2017-11-13 10:07:01 +01:00 |
|
Zanz2
|
fa2c0fe556
|
merging
|
2017-11-09 18:55:17 +01:00 |
|
Zanz2
|
812fa3f1d5
|
Hopefully this will resolve my merge problems
|
2017-11-09 17:42:17 +01:00 |
|
Zanz2
|
a40a63ae50
|
Made code more aesthetic
|
2017-11-09 15:38:06 +01:00 |
|
Zanz2
|
518eb09110
|
Deleted un needed error flash
|
2017-11-09 10:49:44 +01:00 |
|
Zanz2
|
4b837dbe9d
|
Forgot flash fail messagges, now added them for file too big and general error
|
2017-11-09 10:49:44 +01:00 |
|
Zanz2
|
feb686b4ac
|
Fixed alignement
|
2017-11-09 10:49:44 +01:00 |
|
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 |
|
Zanz2
|
aa03a889c7
|
Fixed PR review
|
2017-11-03 16:28:15 +01:00 |
|
Zanz2
|
096ee00e07
|
removed unnecessary html
|
2017-11-03 01:28:20 +01:00 |
|
Zanz2
|
6a4c38bbee
|
Fixed table elements render bugs, now renders after shown event
|
2017-11-03 01:04:50 +01:00 |
|
Zanz2
|
6fc1afe4c1
|
Trying to fix this messy table preview
|
2017-10-30 01:57:42 +01:00 |
|
Zanz2
|
de9a3a1d0d
|
Preview tables are now functional but with inline javascript , ugly styling and a few major bugs (they dont display fully until you click on them, and i dug deep on the handson table wiki and hot table wiki for issues like this, and while they exist, idk how to implement the solutions because they use angular js mostly
|
2017-10-28 23:57:29 +02:00 |
|
Zanz2
|
a167db11da
|
Scinote table elements code
|
2017-10-28 20:20:19 +02:00 |
|
Zanz2
|
c291caaae3
|
Debbuging preive hot tables
|
2017-10-28 16:59:36 +02:00 |
|
Zanz2
|
2413dc251a
|
Added new preview tables code
|
2017-10-28 02:19:22 +02:00 |
|
Zanz2
|
a732c8afa7
|
Code for protocol repository scinote table elements view
|
2017-10-26 17:28:27 +02:00 |
|
Zanz2
|
a645bcb32d
|
fixed oversight;Changed double quote to single
|
2017-10-25 17:21:05 +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
|
6cf775a4b1
|
Refactored code, made html render on preview too
|
2017-10-17 19:27:20 +02:00 |
|
zmagod
|
30d091dc65
|
adds label under protocols keywords input [fixes SCI-1560]
|
2017-10-17 14:10:56 +02:00 |
|
Zanz2
|
5d667f146e
|
Moved .js form reset and made a standalone description method
|
2017-10-11 17:59:09 +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
|
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 |
|
Zanz2
|
c72cf6320a
|
Finished rubocop refactoring
|
2017-09-26 16:19:09 +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 |
|
Zanz2
|
ad1847256c
|
Rubocop beautified code
|
2017-09-26 13:20:55 +02:00 |
|
Zanz2
|
2bfe8f0b95
|
Testing why rubocop gives errors
|
2017-09-25 15:27:24 +02:00 |
|
Zanz2
|
79e065a811
|
Fixed a mistake in the fix that made it not render the preview
|
2017-09-25 14:39:43 +02:00 |
|
Zanz2
|
292c1e3c31
|
Fixed bug, seems like unconssistent indexes instead of hash values can also happen in steps that arent first
|
2017-09-25 14:14:27 +02:00 |
|
Zanz2
|
11b2ef3112
|
Made code nicer, hopefully not unintentionally breaking something
|
2017-09-25 13:53:32 +02:00 |
|
Zanz2
|
549346bb0a
|
Deleted a warning that was out of place
|
2017-09-22 16:13:06 +02:00 |
|
Zanz2
|
dd4d4072e8
|
Made code more aesthetic
|
2017-09-22 16:02:56 +02:00 |
|
Zanz2
|
6ebdea5dce
|
Fixed old workaround with inconsistent protocols.io json formatting and made the workaround nicer (now its only one if statement, instead of one whole block of duplicated code)
|
2017-09-22 15:12:29 +02:00 |
|
Zanz2
|
deef790951
|
added validations to controllers (file too big, names too big), some javascript error messagges, and fixed some nil exceptions in controllers appending nil strings to descriptions
|
2017-09-22 11:56:50 +02:00 |
|
Zanz2
|
1dbb03e22d
|
Added all the fields into description of protocol steps and protocol itself, need to make protocols description format nicer
|
2017-09-21 16:05:33 +02:00 |
|
Zanz2
|
df8cbc2741
|
vastly improved protocol preview styling to look more like documentation specifications
|
2017-09-21 13:46:52 +02:00 |
|
Zanz2
|
8da72eb64a
|
made code look nicer
|
2017-09-21 09:29:13 +02:00 |
|
Zanz2
|
f48833c47a
|
added format .js response which hides the preview modal and refreshes the page with protocolsDatatable.ajax.reload();
|
2017-09-21 08:40:05 +02:00 |
|
Zanz2
|
d59234a1e3
|
minor changes, working on refresh after submit
|
2017-09-20 16:04:52 +02:00 |
|
Zanz2
|
72c707ae88
|
protocol importing into database works, still need to decide how to add other fields from protocols.io to step description and protocol description, but that can be added easily, and need to make it refresh after submit
|
2017-09-20 15:31:10 +02:00 |
|
Zanz2
|
7b85d74a23
|
added jquery code to reset file selector selected file after it is canceled in the preview modal
|
2017-09-20 09:32:31 +02:00 |
|