aignatov-bio
|
10bd1d425d
|
Fix placeholder for tinymce description fields
|
2020-03-30 13:22:34 +02:00 |
|
Mojca Lorber
|
7006036626
|
Add new task general layout and add notes section
|
2020-03-30 12:51:35 +02:00 |
|
Alex Kriuchykhin
|
4fe3d9f3a7
|
Merge pull request #2414 from aignatov-bio/ai-sci-4134-auto-open-tiny-mce-if-unsaved-data
Open unsaved TinyMce editor [SCI-4134]
|
2020-03-30 09:50:32 +02:00 |
|
Miha Mencin
|
be8e18110d
|
Merge pull request #2481 from mlorb/ml-sci-4344
Fix tooltips appear wrongly [SCI-4344]
|
2020-03-24 19:43:34 +01:00 |
|
Oleksii Kriuchykhin
|
f9a7d58157
|
Fix due dates on task cards in the canvas [SCI-4487]
|
2020-03-24 10:30:29 +01:00 |
|
Mojca Lorber
|
9045d1a8de
|
Fix tooltips appear wrongly
|
2020-03-22 17:47:13 +01:00 |
|
aignatov-bio
|
b188b0511b
|
Refactor TinyMCE autosave check
|
2020-03-19 15:45:14 +01:00 |
|
Oleksii Kriuchykhin
|
a518bfe023
|
Enable time fraction for task due date [SCI-4408]
|
2020-03-16 17:55:35 +01:00 |
|
Mojca Lorber
|
9068c20588
|
Redesign clear buttons on global activities page
|
2020-02-07 11:33:25 +01:00 |
|
Mojca Lorber
|
e70bc67146
|
Implement missing style guide changes
|
2020-01-31 14:11:37 +01:00 |
|
aignatov-bio
|
79d71f1e9b
|
Merge pull request #2346 from aignatov-bio/ai-sci-4268-new-emoji-picker
Add new emoji picker [SCI-4268]
|
2020-01-21 16:33:05 +01:00 |
|
Mojca Lorber
|
981f8678df
|
Fix alerts style
|
2020-01-21 15:21:40 +01:00 |
|
Urban Rotnik
|
1ecea5216e
|
Add webpack libs for emojis and assets
|
2020-01-21 11:43:04 +01:00 |
|
mlorb
|
9747a72567
|
Merge pull request #2338 from mlorb/ml-sci-4132-v2
Change html structure for flash msg, change columns buttons [SCI-4132]
|
2020-01-20 14:36:33 +01:00 |
|
Mojca Lorber
|
772118d246
|
change html structure for flash msg, change columns buttons
|
2020-01-20 14:02:42 +01:00 |
|
Urban Rotnik
|
fc29641c2b
|
Hide manage column action buttons on Task page
|
2020-01-17 17:29:26 +01:00 |
|
aignatov-bio
|
b116c3720c
|
Fix general css issue for repositories
|
2020-01-15 16:46:01 +01:00 |
|
Mojca Lorber
|
9176301b7b
|
Refactor manage repository columns, move it from page into modal
|
2020-01-14 11:13:19 +01:00 |
|
aignatov-bio
|
68646276f5
|
Replace bootstrap styles for button
|
2020-01-07 16:13:34 +01:00 |
|
aignatov-bio
|
464d03558a
|
Fix markup, replace buttons and add new logo
|
2020-01-06 10:40:20 +01:00 |
|
aignatov-bio
|
a281f09e7f
|
Add reports and missed modals
|
2020-01-06 10:40:20 +01:00 |
|
aignatov-bio
|
ef3814ccec
|
Add new buttons to protocols, tasks, experiments, projects
|
2020-01-06 10:40:20 +01:00 |
|
aignatov-bio
|
010a44650c
|
Fix task activity page
|
2019-12-02 16:04:50 +01:00 |
|
aignatov-bio
|
75f29d7b04
|
Fix tag edit mode
|
2019-11-27 12:34:54 +01:00 |
|
aignatov-bio
|
e76b4ca26f
|
Fix permission check and due date clear
|
2019-11-24 21:06:34 +01:00 |
|
aignatov-bio
|
96523ae131
|
Update CSS for team preferences and enable autosave
|
2019-11-22 10:46:44 +01:00 |
|
aignatov-bio
|
c712e4e48c
|
Fix due date moda
|
2019-11-21 13:05:36 +01:00 |
|
aignatov-bio
|
f2ed3198d5
|
Add due date autosave field
|
2019-11-21 12:14:43 +01:00 |
|
aignatov-bio
|
264493a322
|
Finish removing Select2 library
|
2019-11-18 13:59:55 +01:00 |
|
aignatov-bio
|
e7ad7ae969
|
New tags drop down
|
2019-11-18 13:59:55 +01:00 |
|
Anton Ignatov
|
7117b767f4
|
Fix commnets to PR
|
2019-11-18 13:59:54 +01:00 |
|
Anton Ignatov
|
17e457c686
|
Finished global activities refactoring
|
2019-11-18 13:59:54 +01:00 |
|
Anton Ignatov
|
fc70ce24f8
|
Refactor side filters for global activities
|
2019-11-18 13:59:54 +01:00 |
|
aignatov-bio
|
3eb6f5695b
|
Merge pull request #2207 from aignatov-bio/mlorb-ml-sci-4004
Add auto-save feature to text fields [SCI-4004]
|
2019-11-18 09:11:10 +01:00 |
|
aignatov-bio
|
19f5f9de67
|
Disable autocomplete for textarea field
|
2019-11-12 14:44:33 +01:00 |
|
aignatov-bio
|
a9690482d1
|
Add autosave feature to text fields
|
2019-11-12 11:26:18 +01:00 |
|
Anton Ignatov
|
33497d11a3
|
Merge branch 'activestorage_migration'
|
2019-10-01 10:36:05 +02:00 |
|
Urban Rotnik
|
dfafd4767c
|
Fix Protocol buttons group
[SCI-3929]
|
2019-09-30 11:51:37 +02:00 |
|
Jure Grabnar
|
b3cafcec7c
|
Add restore draft notification to all models
Close SCI-3751
|
2019-09-30 11:34:39 +02:00 |
|
Jure Grabnar
|
6e33baa995
|
Add skeleton restore-draft notification for module description
|
2019-09-30 11:32:38 +02:00 |
|
Anton Ignatov
|
93363da4e5
|
Fix preview for result
|
2019-09-26 16:49:56 +02:00 |
|
Oleksii Kriuchykhin
|
3509543e7b
|
Merge branch 'master' into ok_SCI_3881
|
2019-09-16 11:56:49 +02:00 |
|
aignatov-bio
|
07b9091e23
|
Fix html escape in unshared warning (#2048)
|
2019-09-11 16:33:31 +02:00 |
|
aignatov-bio
|
27104a495c
|
Fix styling for unshared warning message (#2044)
|
2019-09-11 11:50:02 +02:00 |
|
aignatov-bio
|
1f12a63a25
|
Fix counter on task inventory and failing test (#2043)
|
2019-09-10 13:51:37 +02:00 |
|
Miha Mencin
|
01628e1efc
|
adding missing file
|
2019-09-09 16:46:51 +02:00 |
|
Miha Mencin
|
7fc5035d2d
|
PR fixes, codestyle fixes
|
2019-09-06 13:47:06 +02:00 |
|
Miha Mencin
|
2486bd0077
|
SCI3818-unshared-inventory-screen
|
2019-09-05 14:03:08 +02:00 |
|
mlorb
|
ba5bebedb2
|
change inlane editing css, add shared inventory subtitle and add tooltips to shared inventories icons (#2022)
|
2019-09-02 10:30:29 +02:00 |
|
Miha Mencin
|
b850efbceb
|
Code review remarks, added tooltip for unshared inventory
|
2019-08-26 10:45:40 +02:00 |
|
Miha Mencin
|
9e9e698778
|
SCI-3806 Add an icon indicating shared status to dropdown
|
2019-08-26 09:14:37 +02:00 |
|
aignatov-bio
|
f94b8165dc
|
Fix marvinjs edit button and icon (#1985)
|
2019-08-21 11:15:57 +02:00 |
|
aignatov-bio
|
e2ad383c69
|
Fix UX for task inventory dropdown and big task title [SCI-3791] (#1998)
* Fix ux for task inventory dropdown and big task title
* Fix markup
|
2019-08-21 10:39:37 +02:00 |
|
aignatov-bio
|
b6661682ad
|
Fix shared inventory in task dropdown (#1993)
|
2019-08-19 13:56:02 +02:00 |
|
Oleksii Kriuchykhin
|
973efa55e1
|
Merge branch 'master' into ok_SCI_3678
|
2019-08-08 11:17:07 +02:00 |
|
Oleksii Kriuchykhin
|
b4f632dba8
|
Remove dowload endpoint from assets controller [SCI-3680]
|
2019-08-07 15:21:41 +02:00 |
|
Urban Rotnik
|
88fbd6c0af
|
Fix for archived results in row
|
2019-07-26 11:16:53 +02:00 |
|
Anton Ignatov
|
3339c1fbbf
|
Add MarvinJS to Result and TinyMce MarvinJS refactor
|
2019-07-15 17:17:14 +02:00 |
|
aignatov-bio
|
fc78d8f401
|
Fix tooltip position (#1909)
|
2019-07-09 14:00:53 +02:00 |
|
Anton Ignatov
|
390002f40f
|
Merge branch 'ok_SCI_3539' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_3539
|
2019-07-01 10:12:26 +02:00 |
|
Oleksii Kriuchykhin
|
5acb16d43e
|
Update Asset helper methods [SCI-3539]
|
2019-06-28 08:17:09 +02:00 |
|
aignatov-bio
|
4ddcbe5d75
|
Fix user permission for recent protocols (#1843)
|
2019-06-19 14:06:02 +02:00 |
|
aignatov-bio
|
52a2f5cd0e
|
Add recent protocols dropdown to task page [SCI-3417] (#1800)
* Add recent protocols dropdown to task page
|
2019-06-13 15:47:29 +02:00 |
|
aignatov-bio
|
d97e803d01
|
Adding placeholder to TinyMCE editor (#1788)
|
2019-05-21 15:53:47 +02:00 |
|
Oleksii Kriuchykhin
|
1128fedc51
|
Refactor title inline editing permission checking [SCI-3471]
|
2019-05-20 13:13:31 +02:00 |
|
Alex Kriuchykhin
|
bcbaf73669
|
Merge pull request #1773 from okriuchykhin/ok_SCI_3468
Add permission checking to inline editor fields [SCI-3468]
|
2019-05-15 17:49:15 +02:00 |
|
Oleksii Kriuchykhin
|
2ef926e795
|
Add permission checking to inline editor fields [SCI-3468]
|
2019-05-15 17:47:09 +02:00 |
|
Alex Kriuchykhin
|
607356ce1b
|
Merge pull request #1771 from okriuchykhin/ok_SCI_3466
Show task due date in UTC [SCI-3466]
|
2019-05-15 15:30:17 +02:00 |
|
Oleksii Kriuchykhin
|
71a4a1348a
|
Show task due date in UTC [SCI-3466]
|
2019-05-15 15:17:44 +02:00 |
|
aignatov-bio
|
f970eea525
|
Some gui fixes (#1757)
|
2019-05-14 09:43:02 +02:00 |
|
Miha Mencin
|
765c6ebd6a
|
Merge pull request #1747 from biosistemika/lm-sci-3438-fix
Fix TinyMCE images in task description and task protocol description view [SCI-3438]
|
2019-05-13 10:56:30 +02:00 |
|
aignatov-bio
|
71b3228310
|
Update protocol preview style [SCI-3416] (#1729)
* Update protocol appearance
|
2019-05-13 10:45:12 +02:00 |
|
aignatov-bio
|
634b58bd6a
|
Various UX improvements for note section [SCI-3444] (#1742)
* Various UX improvments for note section
|
2019-05-11 16:04:28 +02:00 |
|
Luka Murn
|
059ebf6f27
|
Fix task and protocol description (TinyMCE) rendering on task page
Closes SCI-3438.
|
2019-05-10 20:39:26 +02:00 |
|
Miha Mencin
|
7c088c8432
|
Merge pull request #1725 from aignatov-bio/ai-sci-3411-due-date-in-one-line
Fix due date position [SCI-3411]
|
2019-05-07 16:34:23 +02:00 |
|
Anton Ignatov
|
0e1e7c3d82
|
Fix button icon for uncomplete task
|
2019-05-06 16:35:46 +02:00 |
|
Anton Ignatov
|
2a294c408f
|
Fix due date alignment and chage header structure from bootstrap to flexbox
|
2019-05-06 16:20:00 +02:00 |
|
Mojca Lorber
|
7be151bd2d
|
Visual fixes for edit/add step on protocol
|
2019-04-30 14:57:50 +02:00 |
|
Anton Ignatov
|
7c55fcf0cf
|
Merge branch 'master' into master-with-note-section
|
2019-04-30 12:07:59 +02:00 |
|
Miha Mencin
|
970a9b42ed
|
Update hilightjs github theme path
|
2019-04-26 17:29:14 +02:00 |
|
Urban Rotnik
|
c94d3ce950
|
Remove duplicated button
|
2019-04-26 07:57:46 +02:00 |
|
Oleksii Kriuchykhin
|
66631ba26c
|
Fix loading more activities on task page [SCI-3390]
|
2019-04-25 23:50:00 +02:00 |
|
aignatov-bio
|
84993ea3ef
|
Update protocol repository for new description format [SCI-3371] (#1689)
* Update protocol repository for new description format
* move image clone method to concerns
|
2019-04-24 13:34:56 +02:00 |
|
Oleksii Kriuchykhin
|
88123f5ecd
|
Fix paths for highlightjs-github-theme [SCI-3377]
|
2019-04-24 12:35:01 +02:00 |
|
Urban Rotnik
|
11a7a975af
|
Merge branch 'features/scinote-improvements' into master-with-note-section
|
2019-04-23 14:50:03 +02:00 |
|
Anton Ignatov
|
aa2dab2014
|
Merge branch 'features/note-section' into master-with-note-section
|
2019-04-23 10:31:37 +02:00 |
|
Oleksii Kriuchykhin
|
231106e131
|
Switch to kaminari pagination in global activities [SCI-3292]
|
2019-04-12 15:37:45 +02:00 |
|
aignatov-bio
|
7ef7e2397f
|
Change activity filter order and reduce custom date label size [SCI-3301] (#1651)
* Change activity filter order and reduce custom date label size
* Fix hound
|
2019-04-09 14:18:22 +02:00 |
|
aignatov-bio
|
e2e299b424
|
Add dynamic generating filters for global activities [SCI-3228] (#1644)
* Add dynamic generating filters
* Add url methods
|
2019-04-09 09:08:27 +02:00 |
|
Jure Grabnar
|
b12916b828
|
Add main functionality
|
2019-04-04 17:05:25 +02:00 |
|
Jure Grabnar
|
613843d095
|
Temp commit
|
2019-04-04 16:58:55 +02:00 |
|
Oleksii Kriuchykhin
|
ffa7c5ecb2
|
Fix permition checks for file editing and make protocol preview files read only [SCI-3281]
|
2019-04-02 16:38:53 +02:00 |
|
Jure Grabnar
|
ac1b43165d
|
Merge pull request #1625 from jbargu/jg_sci_3257
Remove html_safe on activities [SCI-3257]
|
2019-04-02 12:04:01 +02:00 |
|
aignatov-bio
|
e6102c72c7
|
Adding missed activities [SCI-3253] (#1614)
* Adding missed activties
* Adding test for activities
|
2019-04-02 11:50:37 +02:00 |
|
Jure Grabnar
|
5dd0cf091f
|
Remove html_safe from activites head title
|
2019-04-02 11:16:08 +02:00 |
|
aignatov-bio
|
daaa6a367b
|
Adding custom scrollbar to global activities [SCI-3206] (#1623)
* Adding custom scrollbar to global activities
|
2019-04-02 09:56:50 +02:00 |
|
Oleksii Kriuchykhin
|
98e58ff7eb
|
Add global activities to reports [SCI-3255]
|
2019-04-01 11:26:51 +02:00 |
|
aignatov-bio
|
08263ab64e
|
adding filters for task activities [SCI-3076] (#1553)
* update task activity screen
|
2019-03-28 10:55:48 +01:00 |
|
Anton Ignatov
|
4ec0a3c871
|
Update TinyMCE image loader for new fields
|
2019-03-22 10:52:26 +01:00 |
|
aignatov-bio
|
e8827b0d74
|
Update tags in task info [SCI-3093] (#1575)
* Adding inline tags selection
|
2019-03-21 10:13:07 +01:00 |
|
Oleksii Kriuchykhin
|
0c2b7959b6
|
Fix smart annotations in RTE [SCI-3111]
|
2019-03-20 11:41:36 +01:00 |
|
Oleksii Kriuchykhin
|
b46f3566ef
|
Fix rendering of HTML in RTE fields [SCI-3111]
|
2019-03-19 23:32:24 +01:00 |
|
Alex Kriuchykhin
|
7db53fad7c
|
Merge pull request #1566 from okriuchykhin/ok_SCI_3062
Add rich text editor to task and protocol description [SCI-3062][SCI-3071]
|
2019-03-19 13:28:05 +01:00 |
|
Oleksii Kriuchykhin
|
5bc41c1f06
|
Fix task tags field after merging latest master to feature branch
|
2019-03-15 14:21:34 +01:00 |
|
Oleksii Kriuchykhin
|
a822227383
|
Add rich text editor to task and protocol description [SCI-3062][SCI-3071]
|
2019-03-14 16:27:33 +01:00 |
|
Oleksii Kriuchykhin
|
645930b8d7
|
Merge branch 'master' into features/note-section
|
2019-03-14 16:25:51 +01:00 |
|
aignatov-bio
|
125d2a3b9b
|
New inline tags editing in task [SCI 3093] (#1529)
* Adding inline tags selection
|
2019-03-06 09:18:45 +01:00 |
|
aignatov-bio
|
b1df8c9aa7
|
Adding inline editing to experiment title, project title and task title [SCI-3059] (#1524)
* Adding inline editing to experiment title, project title and task title
|
2019-03-06 09:17:34 +01:00 |
|
Miha Mencin
|
a372ebf07d
|
Revert "Task info section improvements [SCI - 3058]"
|
2019-02-27 21:00:11 +01:00 |
|
Anton Ignatov
|
a4cabb203b
|
Task info section improvements
|
2019-02-25 16:55:09 +01:00 |
|
Oleksii Kriuchykhin
|
e62e1873b0
|
Fix issue with caching in inventories dropdown [SCI-2776]
|
2019-01-17 15:04:20 +01:00 |
|
Oleksii Kriuchykhin
|
132f46b136
|
Improve error handling in task inventories dropdown [SCI-2776]
|
2019-01-10 21:11:20 +01:00 |
|
Oleksii Kriuchykhin
|
534866467b
|
Add counters to task inventories dropdown [SCI-2776]
|
2019-01-03 14:11:00 +01:00 |
|
mlorb
|
b7efce579b
|
fix tooltip style
|
2018-12-13 12:43:12 +01:00 |
|
Oleksii Kriuchykhin
|
60a19734b2
|
Enable caching for navigation sidebar [SCI-2757]
|
2018-11-29 11:28:36 +01:00 |
|
Alex Kriuchykhin
|
20e2cbf0ca
|
Merge pull request #1391 from okriuchykhin/ok_SCI_2880
Fix smart annotations rendering issues [SCI-2880]
|
2018-11-28 09:47:20 +01:00 |
|
Oleksii Kriuchykhin
|
2e00f1546a
|
Fix handsontable initialization [SCI-2882]
|
2018-11-26 14:11:46 +01:00 |
|
Oleksii Kriuchykhin
|
b926cadba4
|
Fix smartannotations rendering issues [SCI-2880]
|
2018-11-23 15:07:08 +01:00 |
|
mz3944
|
4d460d14ea
|
Merge pull request #1378 from mz3944/mz-SCI-2861
All users in smart annotation have removed in brackets [SCI-2861]
|
2018-11-20 21:22:23 +01:00 |
|
Matej Zrimšek
|
c144d599fc
|
Fix user smart annotation showing as if the user is removed from team [SCI-2861]
|
2018-11-19 08:02:25 +01:00 |
|
Oleksii Kriuchykhin
|
380a96dcce
|
Add caching for step and result fragments [SCI-2830]
|
2018-11-14 11:57:53 +01:00 |
|
Oleksii Kriuchykhin
|
fb309a12b9
|
Refactor result and step comments initialization [SCI-2830]
|
2018-11-13 16:57:42 +01:00 |
|
Luka Murn
|
63b4f7d909
|
Merge pull request #1274 from Zanz2/zz_in_app_tooltips_help_sci2662
Added Tooltips (bootstrap popovers) for various elements in scinote [SCI-2662]
|
2018-09-24 16:23:53 +02:00 |
|
Zanz2
|
22a565a684
|
Made fixes according to review
|
2018-09-14 13:07:09 +02:00 |
|
Zanz2
|
15c124f3fd
|
replaced image icon with paperclip, to represent files, removed all image icons
|
2018-08-27 13:07:18 +02:00 |
|
Zanz2
|
2d1d4c78bc
|
Merge branch 'master' into zz_in_app_tooltips_help_sci2662
|
2018-08-21 11:27:01 +02:00 |
|
Zanz2
|
1159a32ce2
|
Implemented all except 2 tooltips, debbugging why they dont work now
|
2018-08-20 13:03:30 +02:00 |
|
Zanz2
|
8c492e1491
|
started implementing tooltips, and upgraded behaviour, also trying to fix some bugs with data content attribute
|
2018-08-17 16:03:49 +02:00 |
|
Zanz2
|
dfcaa40f1a
|
Merge branch 'master' into zz_refactor_icons_sci_2445_v2
|
2018-08-14 13:33:43 +02:00 |
|
Zanz2
|
45a4c1c598
|
changed the icons as per last comment in jira issue
|
2018-08-14 13:26:48 +02:00 |
|
Oleksii Kriuchykhin
|
38c36ab798
|
Fix modals handling with Turbolinks [SCI-2253]
|
2018-08-02 11:25:14 +02:00 |
|
Oleksii Kriuchykhin
|
b2bd1cb849
|
Upgrade to Turbolinks 5 [SCI-2253]
|
2018-07-27 17:26:46 +02:00 |
|
Oleksii Kriuchykhin
|
6669beaf0e
|
Change icons throughout the rest of application [SCI-2445]
|
2018-07-27 15:27:08 +02:00 |
|
Luka Murn
|
9a4fdd166e
|
Merge branch 'lm-sci-2431-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-2431-fix
Conflicts:
app/views/projects/index.html.erb
|
2018-06-12 17:44:42 +02:00 |
|
okriuchykhin
|
acd6efae57
|
Merge pull request #1200 from okriuchykhin/ok_SCI_2212
Add result content hook [SCI-2212]
|
2018-06-11 09:28:30 +02:00 |
|
Oleksii Kriuchykhin
|
87925271e8
|
Add result content hook [SCI-2212]
|
2018-06-08 14:22:03 +02:00 |
|
zmagod
|
86c4093bf2
|
adds data-hook to copy_to_protocol_repository button [fixes SCI-2439]
|
2018-06-08 09:41:04 +02:00 |
|
Luka Murn
|
b324a2dab3
|
Restyle activities page
|
2018-06-07 09:29:47 +02:00 |
|
mlorb
|
3368e3b963
|
Merge branch 'ux-release-1' into ml-sci-2271
|
2018-05-23 14:06:54 +02:00 |
|
mlorb
|
5e689f6b4d
|
fix toggle button on inventory page
|
2018-05-23 11:20:42 +02:00 |
|
mlorb
|
c4ecfc4d38
|
Change icons throughout sciNote - navigation, project, task cards
|
2018-05-22 16:55:58 +02:00 |
|
mlorb
|
c2cf52bb34
|
add another toggle button
|
2018-05-18 16:34:01 +02:00 |
|
mlorb
|
81392362ac
|
Final button colour changes
|
2018-05-18 16:24:24 +02:00 |
|
mlorb
|
ed27a7a62a
|
some extra restyling/unifying off app
|
2018-05-11 18:02:17 +02:00 |
|
mlorb
|
b5649f0574
|
Merge branch 'ux-release-1' into ml-sci-2336-v1
|
2018-05-10 13:59:57 +02:00 |
|
Zmago Devetak
|
0a4deeaa35
|
Merge pull request #1112 from ZmagoD/zd_SCI_2261
propagate assigned repository items in workflow [fixes SCI-2261]
|
2018-05-10 09:57:49 +02:00 |
|
mlorb
|
7df40e56c7
|
UI/UX restyle - fixes throughout application part one
|
2018-05-08 16:33:42 +02:00 |
|
mlorb
|
d2c0ae241e
|
Merge pull request #1121 from mlorb/ml-sci-2244
Update buttons positions and wording throughout app [SCI-2244]
|
2018-05-03 11:05:15 +02:00 |
|
mlorb
|
f97477f3f0
|
some extra button styling
|
2018-04-26 15:19:05 +02:00 |
|
zmagod
|
24acd5c779
|
fixes per @duco 's request
|
2018-04-26 14:13:46 +02:00 |
|
mlorb
|
9e11f3b220
|
update buttons positions and wording throughout app
|
2018-04-25 13:57:12 +02:00 |
|
zmagod
|
503ad1ba20
|
removes samples from views [fixes SCI-2304]
|
2018-04-24 08:26:55 +02:00 |
|
zmagod
|
824962c084
|
propagate assigned repository items in workflow [fixes SCI-2261]
|
2018-04-23 11:33:16 +02:00 |
|
zmagod
|
66cc76f640
|
add view label in locales
|
2018-04-19 12:49:32 +02:00 |
|
zmagod
|
9812a9f160
|
adds correct preview images to files [fixes SCI-2254]
|
2018-04-13 09:43:14 +02:00 |
|
Luka Murn
|
fa603b54b8
|
Merge pull request #930 from okriuchykhin/ok_SCI_1860
Remove tutorial [SCI-1860]
|
2018-04-12 14:46:20 +02:00 |
|
zmagod
|
b4deb232c0
|
rename variable: not_in_repository => display_image_tag
|
2018-04-12 13:40:17 +02:00 |
|
Luka Murn
|
9bf8b5d864
|
Merge branch 'ok_SCI_1860' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_1860
Conflicts:
Makefile
app/assets/javascripts/projects/index.js.erb
app/assets/stylesheets/themes/scinote.scss
config/locales/en.yml
|
2018-04-12 13:16:46 +02:00 |
|
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 |
|
Oleksii Kriuchykhin
|
36302ad6e8
|
Refactor existing columns management to control only Column visibility and order [SCI-2220]
|
2018-03-21 16:56:36 +01:00 |
|
Oleksii Kriuchykhin
|
a105e61d48
|
Remove tutorial [SCI-1860]
|
2018-03-18 13:18:05 +01:00 |
|
Oleksii Kriuchykhin
|
186780e68f
|
Fix invite users link on task card [SCI-2055]
|
2018-03-06 17:56:01 +01:00 |
|
Matej Zrimšek
|
b8b9707c06
|
Fixed protocol and archive permission calls, fixed result permissions; module group managing is now also allowed on newly created groups; other permission call fixes and some refactoring.
|
2018-02-19 14:51:14 +01:00 |
|
Matej Zrimšek
|
6ba226d514
|
Added missing '?' to the canaid permission calls that were missing it.
|
2018-02-16 11:12:30 +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 |
|
Matej Zrimšek
|
4fe669ca9a
|
Removed permissions helper and updated the remaining calls to its methods with the new canaid gem permissions.
|
2018-02-16 10:53:22 +01:00 |
|
Matej Zrimšek
|
6b1fee4d30
|
Added/joined repository record assignment to task with sample assignmment to task.
|
2018-02-14 14:39:10 +01:00 |
|
Matej Zrimšek
|
8ef6c8f91f
|
Refactored remaining experiment level permissions (and everything below it).
|
2018-02-14 14:39:07 +01:00 |
|
Matej Zrimšek
|
0706d16020
|
Readded module level archive, move, clone and manag permissions. Corrected their usage and add the permissions check in some additional places.
|
2018-02-14 14:19:22 +01:00 |
|
Matej Zrimšek
|
7938c2e036
|
Minor code style changes.
|
2018-02-14 14:19:22 +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 |
|
Matej Zrimšek
|
854333b0e6
|
Grouped permissions for experiment with canaid gem (WIP).
|
2018-02-14 14:19:00 +01:00 |
|
Matej Zrimšek
|
e36ec69ca9
|
Project level permissions refactoring (mostly names).
|
2018-02-14 13:16:32 +01:00 |
|
Matej Zrimšek
|
d423700e84
|
Used permissions where they were missing.
|
2018-02-14 13:16:32 +01:00 |
|
Oleksii Kriuchykhin
|
deabd39a98
|
Fix protocol import button [SCI-1931]
|
2018-01-15 13:43:09 +01:00 |
|
Oleksii Kriuchykhin
|
49ae9bcd55
|
Fix adding users to a task [SCI-1870]
|
2017-12-20 13:44:21 +01:00 |
|
zmagod
|
a2b7bcda4c
|
refactor repositories js files [fixes SCI-1485]
|
2017-07-17 15:05:28 +02:00 |
|
Luka Murn
|
e26337d5ee
|
Merge pull request #671 from biosistemika/custom-repositories
Merge custom-repositories into master
|
2017-06-09 18:46:47 +02:00 |
|
Matej Zrimšek
|
77a225ec31
|
Added toggle between assigned and all repository records. [SCI-1276]
|
2017-06-07 18:13:25 +02:00 |
|
Oleksii Kriuchykhin
|
8b1190060e
|
Add custom repository table [SCI-1274]
|
2017-06-07 15:23:25 +02:00 |
|
zmagod
|
c6bb20039b
|
adds drag'n drop feature in task results [fixes SCI-1011], [fixes SCI-1310] and [fixes SCI-285]
|
2017-06-07 13:29:39 +02:00 |
|
zmagod
|
ab4961ddb1
|
adds overlay partial
|
2017-06-05 11:31:05 +02:00 |
|
zmagod
|
67d902db52
|
refactor
|
2017-06-05 10:43:58 +02:00 |
|
zmagod
|
1c021b11db
|
adds drag and drop files upload to steps [fixes SCI-1310]
|
2017-06-02 16:34:09 +02:00 |
|
Luka Murn
|
fcc3995049
|
Merge pull request #647 from biosistemika/master
Bring latest master changes into custom-repositories
|
2017-05-30 14:18:14 +02:00 |
|
Oleksii Kriuchykhin
|
e99e3edb7b
|
Add repositories dropdown to task navigation [SCI-1273]
|
2017-05-18 14:21:00 +02:00 |
|
zmagod
|
d34b2520b5
|
refactor results javascript, fixes bug with results archive [fixes SCI-1262] prevents duplicate request [fixes SCI-1248]
|
2017-05-12 15:59:58 +02:00 |
|
zmagod
|
070a829c49
|
change new results hendlers
|
2017-05-12 10:02:33 +02:00 |
|
zmagod
|
acc5594f1b
|
add popup for approval to complete the Task [fixes SCI-1200]
|
2017-05-04 12:41:22 +02:00 |
|
Matej Zrimšek
|
a5cffd06f3
|
Removed all tutorial data from ERB, so that all tutorial code is in JS. [needed for fixing SCI-719]
|
2017-04-25 16:03:50 +02:00 |
|
zmagod
|
0c2523beca
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration
|
2017-03-10 16:21:43 +01:00 |
|
Luka Murn
|
0e8f5f8e99
|
Merge branch 'lm-sci-1091-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-1091-fix
Conflicts:
app/views/my_modules/_state_buttons.html.erb
|
2017-03-09 08:44:09 +01:00 |
|
Luka Murn
|
800df7a26b
|
Also make button icons work when rendering them via JS
Closes SCI-1073.
|
2017-03-08 13:55:10 +01:00 |
|
Luka Murn
|
7c9aa2e476
|
Hide complete&uncomplete task buttons if user cannot do it
Closes SCI-1091.
|
2017-03-06 16:01:04 +01:00 |
|
Luka Murn
|
4ddb139911
|
Fix padding of state buttons
Closes SCI-1073.
|
2017-03-03 16:36:52 +01:00 |
|
Luka Murn
|
3d7f09bde6
|
Fix protocol state buttons a bit
Closes SCI-1073.
|
2017-02-28 14:35:12 +01:00 |
|
Luka Murn
|
fecfc9e41d
|
Merge pull request #498 from biosistemika/release-1.8.1
Release 1.8.1
|
2017-02-23 14:57:30 +01:00 |
|
Luka Murn
|
dc89c160be
|
Fix a bug with team page not working from user task modal
|
2017-02-23 14:45:00 +01:00 |
|
zmagod
|
151dc79a81
|
adds hook for lock task action
|
2017-02-21 16:25:50 +01:00 |
|
Oleksii Kriuchykhin
|
218e96b1f0
|
Code style fixes [SCI-999]
|
2017-02-16 11:45:07 +01:00 |
|
Oleksii Kriuchykhin
|
cf8566df33
|
Add task complete/uncomplete functionality [SCI-999]
|
2017-02-10 14:27:20 +01:00 |
|
zmagod
|
e59b2e039a
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_939
|
2017-01-27 11:15:31 +01:00 |
|
Oleksii Kriuchykhin
|
310d8c1920
|
Refactor smart annotation/auto_link/simple_format rendering [SCI-940]
|
2017-01-25 17:18:19 +01:00 |
|
zmagod
|
72e13beee3
|
renamed organizations in views
|
2017-01-25 12:01:23 +01:00 |
|
Luka Murn
|
53699193a2
|
Merge branch 'smart-annotations'
Conflicts:
app/assets/javascripts/comments.js.erb
app/assets/javascripts/protocols/index.js
app/assets/javascripts/protocols/steps.js.erb
app/assets/javascripts/samples/sample_datatable.js.erb
app/controllers/my_module_comments_controller.rb
app/controllers/project_comments_controller.rb
app/controllers/result_comments_controller.rb
app/controllers/step_comments_controller.rb
app/datatables/sample_datatable.rb
app/views/my_module_comments/_comment.html.erb
app/views/project_comments/_comment.html.erb
app/views/projects/show/_experiment.html.erb
app/views/reports/elements/_experiment_element.html.erb
app/views/reports/elements/_result_comments_element.html.erb
app/views/reports/elements/_result_text_element.html.erb
app/views/reports/elements/_step_checklist_element.html.erb
app/views/reports/elements/_step_comments_element.html.erb
app/views/reports/elements/_step_element.html.erb
app/views/result_comments/_comment.html.erb
app/views/results/_result_text.html.erb
app/views/step_comments/_comment.html.erb
app/views/steps/_step.html.erb
db/schema.rb
|
2017-01-24 14:33:23 +01:00 |
|
Oleksii Kriuchykhin
|
d555ba7905
|
Add export to protocol management page and code style improvements [SCI-742]
|
2017-01-23 17:43:48 +01:00 |
|
Oleksii Kriuchykhin
|
14a6705b55
|
Implemented protocol export through Zip::OutputStream [SCI-742]
|
2017-01-23 17:43:48 +01:00 |
|
Luka Murn
|
cf72da5635
|
Merge branch 'improved-files-handling' into 'master'
Conflicts:
app/assets/javascripts/protocols/steps.js.erb
app/helpers/assets_helper.rb
db/schema.rb
|
2017-01-18 11:29:40 +01:00 |
|
Oleksii Kriuchykhin
|
75031e17b9
|
Remove double sanitization from views [SCI-102]
|
2017-01-12 16:54:15 +01:00 |
|
Oleksii Kriuchykhin
|
0350f2f792
|
Add html escaping to name filelds in the views [SCI-102]
|
2017-01-12 11:03:14 +01:00 |
|
Oleksii Kriuchykhin
|
d05c16b0ba
|
Added auto_link wrapper with custom sanitization [SCI-102]
|
2017-01-11 17:02:17 +01:00 |
|
Oleksii Kriuchykhin
|
0546716a0b
|
Improve user input sanitization, fix bugs [SCI-102]
|
2017-01-11 15:50:11 +01:00 |
|
zmagod
|
89e8946a47
|
expand smart annotation
|
2017-01-10 14:14:21 +01:00 |
|
Oleksii Kriuchykhin
|
9c4191a1e0
|
Initial code commit [SCI-102]
|
2017-01-05 13:04:19 +01:00 |
|
zmagod
|
a434649f42
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration
|
2017-01-03 16:35:25 +01:00 |
|
Oleksii Kriuchykhin
|
d2b76d8385
|
Improved image preview modal [SCI-694]
|
2016-12-19 17:36:18 +01:00 |
|
Oleksii Kriuchykhin
|
8738b3e09d
|
Added image preview to Results [SCI-694]
|
2016-12-16 15:55:46 +01:00 |
|
Oleksii Kriuchykhin
|
0541253ffa
|
Added modal for images preview [SCI-694]
|
2016-12-16 15:53:16 +01:00 |
|
zmagod
|
40fdfef67f
|
setup delayed_paperclip gem
|
2016-12-08 15:24:14 +01:00 |
|
zmagod
|
ac52e643be
|
cleanup direct upload
|
2016-12-08 11:26:13 +01:00 |
|
Zmago Devetak
|
91f29745c4
|
Merge pull request #314 from ZmagoD/zd_SCI_643
adds autolink
|
2016-12-05 10:47:23 +01:00 |
|
zmagod
|
fafecce264
|
adds autolink to comments, tast desc., step desc., experiment desc., samples table 'only custom fields', checklists [fixes SCI-643]
|
2016-11-23 14:18:50 +01:00 |
|
Luka Murn
|
595b213b1a
|
Changes up to samples in views folder
|
2016-11-19 16:51:40 +01:00 |
|
Luka Murn
|
26d04b1f3c
|
Merge branch 'rich-text-formatting' into 'master'
Conflicts:
Gemfile.lock
app/assets/stylesheets/themes/scinote.scss
|
2016-11-17 16:39:33 +01:00 |
|
Luka Murn
|
d1701bd7ae
|
Merge pull request #276 from Ducz0r/lm-sci-637
Automatically resize textarea elements [SCI-637]
|
2016-11-17 09:58:36 +01:00 |
|
Luka Murn
|
a3bbf94643
|
Add a smart_text_area tag & implement it throughout application
This fixes the mentioned issues @mlorb mentioned.
Closes SCI-637.
|
2016-11-16 17:57:01 +01:00 |
|
Oleksii Kriuchykhin
|
d2491a18a4
|
Tutorial Save Protocol step added [SCI-571]
|
2016-11-11 10:06:18 +01:00 |
|
Mojca Lorber
|
3e162b3a93
|
remove redcarpet gem - markdown
|
2016-11-10 14:11:32 +01:00 |
|
Matej Zrimšek
|
a3dfb59558
|
Added remaining constants.
|
2016-10-17 11:30:05 +02:00 |
|
mlorb
|
00b0f6ab07
|
Merge pull request #184 from mlorb/ml_sci_472
Protocol steps/results - change title for comment section, remove info tab [SCI-472]
|
2016-10-03 17:20:45 +02:00 |
|
Jure Grabnar
|
03567d6208
|
Prevent archive of locked result asset
|
2016-10-03 17:07:57 +02:00 |
|
Mojca Lorber
|
35477b1005
|
Remove Info tab and change comment title on results view
|
2016-09-29 16:43:19 +02:00 |
|
zmagod
|
1eb9f772f4
|
refactor sciNote comments js and unified all comments behavior [fixes SCI-474]
|
2016-09-27 10:30:48 +02:00 |
|
zmagod
|
02bfa1949e
|
fixed project comments
|
2016-09-27 09:00:02 +02:00 |
|
Oleksii Kriuchykhin
|
e8ac754829
|
Fix issue with long tags in dropdown list [fixes SCI-470]
|
2016-09-23 11:05:17 +02:00 |
|
zmagod
|
06b1992e94
|
Merge branch 'zd_SCI_436' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_436
|
2016-09-21 19:20:55 +02:00 |
|
zmagod
|
9f56df02d2
|
removes comment tab and add comment in the info tab [fixes SCI-436]
|
2016-09-20 18:53:51 +02:00 |
|
zmagod
|
42bbc47f5f
|
first working version
|
2016-09-20 17:06:07 +02:00 |
|
zmagod
|
b9b466cd8e
|
Merge branch 'jg_sci_350_formulas' of https://github.com/jbargu/scinote-web into jbargu-jg_sci_350_formulas
|
2016-09-16 09:28:19 +02:00 |
|
zmagod
|
e3ae22763e
|
removed comments tab in protocol step
|
2016-09-15 08:46:14 +02:00 |
|
Mojca Lorber
|
a9029e0928
|
fixes responsiveness on mobile phone for sample view
|
2016-09-14 11:08:40 +02:00 |
|
zmagod
|
691ae94d2c
|
enabled to delete results in task archive [fixes SCI-370]
|
2016-09-13 13:26:04 +02:00 |
|
Jure Grabnar
|
6519e8dbb1
|
Add e-notation preprocessing to formulas
SCI-350 #close
|
2016-09-13 09:46:22 +02:00 |
|
Jure Grabnar
|
e096f936f9
|
Add formulas to results
|
2016-09-13 09:44:17 +02:00 |
|
Mojca Lorber
|
302a777615
|
fixes button collision
|
2016-09-08 12:37:06 +02:00 |
|
zmagod
|
2bbb439745
|
fixes cloned experiment protocol [fixes SCI-376]
|
2016-08-23 16:15:45 +02:00 |
|
Zmago Devetak
|
da735a51f4
|
Merge pull request #62 from ZmagoD/zd_SCI_318
Zd sci 318
|
2016-08-17 10:01:10 +02:00 |
|
zmagod
|
852fe499fb
|
clean up linked protocol
|
2016-08-12 16:31:40 +02:00 |
|
Jure Grabnar
|
6e8e9ecf21
|
Fix activities and the dreaded no project for modules error
|
2016-08-11 16:57:29 +02:00 |
|
Jure Grabnar
|
2bd74866e0
|
Fix my_modules archive page
|
2016-08-08 15:04:02 +02:00 |
|
Luka Murn
|
b64e200b91
|
Refactor canvas a lot.
Also refactor localization files concerning canvas.
|
2016-07-28 16:41:10 +02:00 |
|
Jure Grabnar
|
6d26203796
|
Add missing target var to result searches
|
2016-07-26 12:26:48 +02:00 |
|
Luka Murn
|
076b67620f
|
Migration GitLab -> GitHub
|
2016-07-21 13:11:15 +02:00 |
|
Luka Murn
|
055298fee8
|
Initial commit.
|
2016-02-12 16:52:43 +01:00 |
|