zmagod
|
233e73c709
|
adds asset preview link to repository row modal and to table row item [fixes SCI-2110]
|
2018-04-10 17:06:53 +02:00 |
|
Oleksii Kriuchykhin
|
3b7977ee3b
|
Merge latest changes from ux-release-1 [SCI-2217]
|
2018-04-04 14:20:34 +02:00 |
|
Oleksii Kriuchykhin
|
cc5d8550b1
|
Refactor file preview modal [SCI-2217]
|
2018-03-30 11:50:28 +02:00 |
|
mlorb
|
4bf9369bc5
|
refactor buttons
|
2018-03-29 13:58:14 +02:00 |
|
mz3944
|
bb21f6543c
|
Merge pull request #1004 from mz3944/mz-SCI-2011
Wrapping up the permissions [SCI-2011]
|
2018-03-06 07:10:40 +01:00 |
|
Zanz2
|
c5728c4018
|
Merge branch 'master' into null_step_crash_sci2043
|
2018-03-05 16:37:24 +01:00 |
|
Zanz2
|
5c93bd9676
|
Tables now have fixed 200 px height, which solves various issues and the scrollbar clipping to the bottom
|
2018-02-16 14:14:51 +01:00 |
|
Zanz2
|
673901fb01
|
Merge pull request #984 from Zanz2/yellow_flashv3_SCI1834
Fixed tables getting cut when certain attributes are at max length [SCI-1834]
|
2018-02-16 12:52:51 +01:00 |
|
Matej Zrimšek
|
5bda53eebf
|
Overall refactoring of all canaid permissions and code related to their calls.
|
2018-02-16 10:54:06 +01:00 |
|
Zanz2
|
b9db39f87d
|
removing last commit
|
2018-02-16 00:00:53 +01:00 |
|
Zanz2
|
95501eb046
|
saving work for later
|
2018-02-15 20:01:36 +01:00 |
|
Zanz2
|
ad8f93b57f
|
Merge pull request #991 from Zanz2/missplaced_authors_sci1808
protocols io authors are now real authors, not user that added the protocol [SCI-1808]
|
2018-02-15 16:53:39 +01:00 |
|
Matej Zrimšek
|
d6e7ef465c
|
Grouped remaining permissions for experiment, protocol, task, and partially step levels. [SCI-1964]
|
2018-02-14 14:19:22 +01:00 |
|
Zanz2
|
128f15f984
|
Merge pull request #990 from Zanz2/code_formatting_sci1822
Commands in protocols io steps are now properly formatted like code [SCI-1822]
|
2018-02-08 08:52:44 +01:00 |
|
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 |
|