scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-06 15:05:26 +08:00
Code Issues Projects Releases Packages Wiki Activity
5486 commits 43 branches 185 tags 169 MiB
Commit graph

1643 commits

Author SHA1 Message Date
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
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
aignatov-bio
57b80280dc
Update attachemnts css (#1700) 2019-04-26 15:20:39 +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
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
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
Anton Ignatov
0779ed598b Reuse inline editing logic 2019-04-25 11:14:55 +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
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
774521df7a Changes to comments section in Task Steps 2019-04-23 15:02:58 +02:00
Urban Rotnik
11a7a975af Merge branch 'features/scinote-improvements' into master-with-note-section 2019-04-23 14:50:03 +02:00
Urban Rotnik
7a2bfc12ce Remove form_asset partial 2019-04-23 13:50:48 +02:00
Urban Rotnik
b1dabaca15 New helper for file thumbnails 2019-04-23 13:50:48 +02:00
Urban Rotnik
ea0368aa11 Attachments update for edit page 2019-04-23 13:50:47 +02:00
Anton Ignatov
7d60eb5572 Fix migration issues 2019-04-23 11:11:22 +02:00
Anton Ignatov
aa2dab2014 Merge branch 'features/note-section' into master-with-note-section 2019-04-23 10:31:37 +02:00
aignatov-bio
6b45dcd475
Update eln export for new tinyMCE image format (#1680) 2019-04-19 14:44:40 +02:00
Jure Grabnar
1295c0583a Archived results are now separated in exported project 
Closes SCI-3179
 2019-04-17 16:37:21 +02:00
mlorb
1e3d0e901a
Merge pull request #1667 from mlorb/ml-sci-3304 
Fix links in activity message for protocols in repository [SCI-3304]
 2019-04-15 11:55:08 +02:00
Anton Ignatov
dd8b3caf65 Fix duplicate activtiy issue and fix link to inventory 2019-04-15 11:35:30 +02:00
Alex Kriuchykhin
3250ab70f4
Merge pull request #1668 from okriuchykhin/ok_SCI_3292_v2 
Switch to kaminari pagination in global activities [SCI-3292]
 2019-04-12 16:04:48 +02:00
Oleksii Kriuchykhin
231106e131 Switch to kaminari pagination in global activities [SCI-3292] 2019-04-12 15:37:45 +02:00
Mojca Lorber
252fdaf9a8 Fix links in activity message for protocols in repository 2019-04-12 15:14:41 +02:00
Mojca Lorber
bf2e9e8194 Rename button load more system notification to fix the bug 2019-04-12 11:58:47 +02:00
aignatov-bio
8ba0555922
Add check for tasks complete in project notifications (#1657) 2019-04-12 09:17:34 +02:00
aignatov-bio
ffb0db06b9
Add scroll to team selector (#1659) 2019-04-12 09:17:14 +02:00
Alex Kriuchykhin
7f20b7fa20
Merge pull request #1661 from okriuchykhin/ok_SCI_3292 
Improve global activities pagination and fetching [SCI-3292]
 2019-04-11 16:23:37 +02:00
Oleksii Kriuchykhin
d378e33038 Improve global activities pagination and fetching [SCI-3292] 2019-04-10 15:45:17 +02:00
aignatov-bio
f47d0e2932
Merge pull request #1561 from aignatov-bio/ai-sci-3131-improve-image-file-upload 
Improve the image file upload into RTE input fields [SCI-3131]
 2019-04-10 14:04:06 +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
Urban Rotnik
ee3dc571e1 Update attachments view, add ordering on FE 2019-04-09 14:17:40 +02:00
Urban Rotnik
a3932cc67f New asset box style update 2019-04-09 14:17:40 +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
Urban Rotnik
26cf8271a1 Change step header, remove vertical line 2019-04-05 10:57:38 +02:00
Jure Grabnar
7ac88ee84b Change icons to be relative 2019-04-04 17:05:25 +02:00
Jure Grabnar
cbf109f884 Fix create WOPI file button 
Closes SCI-3137
 2019-04-04 17:05:25 +02:00
Jure Grabnar
fddff9c627 Perform styling on the WOPI modal 2019-04-04 17:05:25 +02:00
Jure Grabnar
38e47b93ab Update labels 2019-04-04 17:05:25 +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
Jure Grabnar
9a4cd4fda2 Add file_present true 2019-04-04 16:57:36 +02:00
Jure Grabnar
3b8e6fa47c Test office online 2019-04-04 16:57:36 +02:00
Oleksii Kriuchykhin
d6bd703ec8 Fix activity genereation with discarded inventories [SCI-3290] 2019-04-03 21:18:48 +02:00
Jure Grabnar
26848ecaef Refactor step position + 1 into a method 2019-04-03 13:07:30 +02:00
Oleksii Kriuchykhin
c47d243b1f Disable WOPI edit button in read only mode [SCI-3281] 2019-04-02 17:45:26 +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