Commit graph

197 commits

Author SHA1 Message Date
aignatov-bio
fc78d8f401
Fix tooltip position (#1909) 2019-07-09 14:00:53 +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