aignatov-bio
|
cc8a152278
|
Fix step attachments sorting (#1718)
|
2019-05-06 09:56:26 +02:00 |
|
Oleksii Kriuchykhin
|
4522e6bf06
|
Update Ruby to 2.5.5, Rails to 5.1.7 and Devise to 4.6.2 [SCI-3401]
|
2019-04-30 17:04:48 +02:00 |
|
Jure Grabnar
|
de6509cc97
|
Add distinct to #visible_to in project.rb
Closes SCI-3375
|
2019-04-30 16:40:12 +02:00 |
|
Mojca Lorber
|
7be151bd2d
|
Visual fixes for edit/add step on protocol
|
2019-04-30 14:57:50 +02:00 |
|
aignatov-bio
|
60296419e8
|
Update project card due date dropdown (#1716)
|
2019-04-30 13:30:09 +02:00 |
|
Anton Ignatov
|
7c55fcf0cf
|
Merge branch 'master' into master-with-note-section
|
2019-04-30 12:07:59 +02:00 |
|
mlorb
|
9f0983de77
|
Merge pull request #1706 from mlorb/ml-sci-3350
Change ownership of inventory items, when a user leaves a team [SCI-3350]
|
2019-04-30 10:39:14 +02:00 |
|
aignatov-bio
|
26dc1a0a4a
|
Note section css issues [SCI-3378] (#1715)
* Fix step name width bug
|
2019-04-30 10:23:44 +02:00 |
|
aignatov-bio
|
687b53feb1
|
Add new tag activtiies [SCI-3341] (#1712)
* Add new tag activtiies
|
2019-04-30 10:23:09 +02:00 |
|
Jure Grabnar
|
b37349624a
|
Merge pull request #1714 from biosistemika/jg_sci_3380
Add editnew action for editing new office files [SCI-3380]
|
2019-04-30 09:57:07 +02:00 |
|
Jure Grabnar
|
ed003aca13
|
Add editnew action for editing new office files
Closes SCI-3380
|
2019-04-30 08:19:52 +02:00 |
|
Oleksii Kriuchykhin
|
1b792e2b7e
|
Improve clean up of Export All files [SCI-3368]
|
2019-04-30 00:43:34 +02:00 |
|
aignatov-bio
|
7d197a6f02
|
Remove gray step headers (#1713)
|
2019-04-29 14:06:55 +02:00 |
|
Mojca Lorber
|
5fd4c47388
|
Move change owner functionality to RepositoryRow
|
2019-04-29 14:02:02 +02:00 |
|
Miha Mencin
|
a16b2cdf03
|
Merge pull request #1704 from urbanrotnik/ur-sci-3388-icon-for-deleting-is-visible
Hide icon for deleting [SCI-3388]
|
2019-04-29 10:15:18 +02:00 |
|
Oleksii Kriuchykhin
|
077ad52d4b
|
Fix TinyMCE for results [SCI-3398]
|
2019-04-26 17:37:01 +02:00 |
|
Miha Mencin
|
970a9b42ed
|
Update hilightjs github theme path
|
2019-04-26 17:29:14 +02:00 |
|
Urban Rotnik
|
dba1ccfc34
|
Merge pull request #1705 from urbanrotnik/ur-sci-3387-office-files-icons
Show icons for office files [SCI-3387]
|
2019-04-26 15:53:53 +02:00 |
|
Urban Rotnik
|
3b063348ce
|
Hide remove icon and show only on attachment hover
|
2019-04-26 15:51:35 +02:00 |
|
Urban Rotnik
|
090df87f48
|
Merge pull request #1703 from urbanrotnik/ur-sci-3382-duplicated-complete-button
Remove duplicated button [SCI-3382]
|
2019-04-26 15:46:57 +02:00 |
|
Urban Rotnik
|
88050b9b93
|
Merge pull request #1707 from urbanrotnik/ur-sci-3383-task-name-not-editable
Fix for inline editing on Firefox [SCI-3383]
|
2019-04-26 15:46:37 +02:00 |
|
Alex Kriuchykhin
|
c735607930
|
Merge pull request #1701 from okriuchykhin/ok_SCI_3391
Fix sorting by user name with search parameter in inventories [SCI-3391]
|
2019-04-26 15:39:48 +02:00 |
|
Alex Kriuchykhin
|
5d85ac0a95
|
Merge pull request #1702 from okriuchykhin/ok_SCI_3390
Fix loading more activities on task page [SCI-3390]
|
2019-04-26 15:39:31 +02:00 |
|
aignatov-bio
|
dc7fddc60a
|
Improve task tags (#1708)
|
2019-04-26 15:38:33 +02:00 |
|
aignatov-bio
|
9fbfa9215e
|
Add zoom to image annotation [SCI-3374] (#1694)
* Add zoom to image annotation
|
2019-04-26 15:21:01 +02:00 |
|
mlorb
|
12564bd070
|
Merge pull request #1686 from mlorb/ml-sci-3324
Add activity for importing inventory items [SCI-3324]
|
2019-04-26 15:20:40 +02:00 |
|
aignatov-bio
|
57b80280dc
|
Update attachemnts css (#1700)
|
2019-04-26 15:20:39 +02:00 |
|
Urban Rotnik
|
8413ed5ab0
|
Fix for inline editing on Firefox
|
2019-04-26 14:22:18 +02:00 |
|
Mojca Lorber
|
9e04eb8ea1
|
Fixes upon Urbans request
|
2019-04-26 11:34:53 +02:00 |
|
Mojca Lorber
|
eac90109f7
|
Change ownership of inventory items, when a user leaves a team
|
2019-04-26 10:47:08 +02:00 |
|
Urban Rotnik
|
c41413234c
|
Use MS office icons for MS files
|
2019-04-26 09:29:39 +02:00 |
|
Urban Rotnik
|
c94d3ce950
|
Remove duplicated button
|
2019-04-26 07:57:46 +02:00 |
|
Alex Kriuchykhin
|
6bb19ed0be
|
Merge pull request #1697 from okriuchykhin/ok_SCI_3264
Update limits for new rich text enabled fileds [SCI-3264]
|
2019-04-25 23:54:05 +02:00 |
|
Oleksii Kriuchykhin
|
66631ba26c
|
Fix loading more activities on task page [SCI-3390]
|
2019-04-25 23:50:00 +02:00 |
|
Oleksii Kriuchykhin
|
3c1774d330
|
Fix sorting by user name with search parameter in inventories [SCI-3391]
|
2019-04-25 16:29:41 +02:00 |
|
aignatov-bio
|
1a860037f7
|
Update reports for new RTE [SCI-3263] (#1691)
* Update reports for new RTE
|
2019-04-25 16:16:43 +02:00 |
|
Urban Rotnik
|
09d1946b19
|
Merge pull request #1655 from urbanrotnik/ur-overcommit-config-update
Enable ScssLint
|
2019-04-25 14:56:56 +02:00 |
|
Urban Rotnik
|
0cf688be39
|
Merge pull request #1692 from urbanrotnik/ur-sci-3135-comments-section-changes
Comments section changes [SCI-3135]
|
2019-04-25 14:18:05 +02:00 |
|
aignatov-bio
|
7ec6faddc7
|
Merge pull request #1 from urbanrotnik/urbanrotnik-ur-sci-3135-comments-section-changes
Urbanrotnik ur sci 3135 comments section changes
|
2019-04-25 11:25:30 +02:00 |
|
Anton Ignatov
|
0779ed598b
|
Reuse inline editing logic
|
2019-04-25 11:14:55 +02:00 |
|
Oleksii Kriuchykhin
|
8bec85c7b9
|
Switch to memory_store for caching in production [SCI-3182]
|
2019-04-24 19:17:31 +02:00 |
|
Oleksii Kriuchykhin
|
260782e233
|
Update tests for new rich text enabled fileds [SCI-3264]
|
2019-04-24 13:45:29 +02:00 |
|
Anton Ignatov
|
e52b985e7b
|
xMerge branch 'ur-sci-3135-comments-section-changes' of https://github.com/urbanrotnik/scinote-web into urbanrotnik-ur-sci-3135-comments-section-changes
|
2019-04-24 13:40:41 +02:00 |
|
Oleksii Kriuchykhin
|
a3f5974dbd
|
Update limits for new rich text enabled fileds [SCI-3264]
|
2019-04-24 13:37:22 +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 |
|
Alex Kriuchykhin
|
43d8413496
|
Merge pull request #1696 from okriuchykhin/ok_SCI_3377
Fix paths for highlightjs-github-theme [SCI-3377]
|
2019-04-24 12:51:52 +02:00 |
|
Oleksii Kriuchykhin
|
88123f5ecd
|
Fix paths for highlightjs-github-theme [SCI-3377]
|
2019-04-24 12:35:01 +02:00 |
|
Alex Kriuchykhin
|
d5ad16b501
|
Merge pull request #1695 from okriuchykhin/ok_SCI_3377
Fix build of JS packages [SCI-3377]
|
2019-04-24 11:34:40 +02:00 |
|
Oleksii Kriuchykhin
|
d1e869a4c5
|
Fix build of JS packages [SCI-3377]
|
2019-04-24 11:26:03 +02:00 |
|
Alex Kriuchykhin
|
48bdc880f5
|
Merge pull request #1693 from okriuchykhin/ok_SCI_3266
Fix task clonning with TinyMCE images [SCI-3266]
|
2019-04-23 17:02:52 +02:00 |
|