scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-18 23:21:30 +08:00
Code Issues Projects Releases Packages Wiki Activity
12106 commits 31 branches 181 tags 166 MiB
Commit graph

306 commits

Author SHA1 Message Date
Urban Rotnik
0ae39678d4
Merge pull request #2832 from urbanrotnik/ur-sci-4982-lock-state 
Add error message for locked task, update some permission checks[SCI-4982]
 2020-09-09 14:04:08 +02:00
Urban Rotnik
aa88b6bdb4 Move redirect to controller 2020-09-09 11:26:43 +02:00
aignatov-bio
84682c6346
Merge pull request #2823 from mlorb/ml-sci-4575 
Replace old arrow with new one [SCI-4575]
 2020-09-09 09:05:39 +02:00
Urban Rotnik
d9b691103c Add permission error message 2020-09-08 15:42:30 +02:00
Oleksii Kriuchykhin
dea75553a3 Fix handling of duplicated step positions [SCI-4880] 2020-09-07 10:44:00 +02:00
Mojca Lorber
9dac4079f8 Replace old arrow with new one and remove redundant javascript for arrow collapsing 2020-09-04 14:43:30 +02:00
Mojca Lorber
24745203e1 Fix buttons visability on protocols page according to new styleguide 2020-09-03 17:05:25 +02:00
Urban Rotnik
4eebfa5461 Controller action for card inline preview 2020-08-28 11:05:52 +02:00
Oleksii Kriuchykhin
ed2eb81c68 Switch to position swapping when updating step position [SCI-4880] 2020-08-25 15:46:23 +02:00
Oleksii Kriuchykhin
a206890a8c Fix step position adjusting on move and destroy [SCI-4880] 2020-08-25 15:46:21 +02:00
aignatov-bio
19a0d05467 Fix for checklist ordering 2020-08-14 12:32:39 +02:00
Urban Rotnik
a2ade6e0ec Merge branch 'develop' into features/new-task-layout 2020-05-15 14:27:56 +02:00
aignatov-bio
c9545ddb19 Merge branch 'features/new-task-layout' into ai-sci-4509-add-recent-protocols-tab 2020-05-08 10:28:33 +02:00
Urban Rotnik
276351bbed Remove Tooltips JS code 2020-04-28 12:51:59 +02:00
aignatov-bio
4f941610b2 Small layout changes for protocol 2020-04-24 11:50:03 +02:00
aignatov-bio
b53ad2850a Remove old code 2020-04-09 17:31:28 +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
aignatov-bio
da4b55ceea Fix protocol and report create modals after dashboard redirect 2020-03-19 19:43:20 +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
Miha Mencin
26b687f2e6
Merge pull request #2460 from biosistemika/features/dashboard 
Features/dashboard
 2020-03-10 18:06:23 +01:00
Oleksii Kriuchykhin
11a5536af5 Improve file upload checks [SCI-4382] 2020-03-03 15:26:40 +01:00
aignatov-bio
95fca105eb Add quickstart layout and create task modal 2020-02-28 14:34:34 +01:00
aignatov-bio
26783e64da Fix protocols table CSS 2020-02-11 15:58:17 +01:00
aignatov-bio
e022f7a096 Fix small css issues 2020-01-20 15:48:51 +01:00
aignatov-bio
84a9d764e0 Add arrows controll for dropdown 2019-11-23 21:09:34 +01:00
aignatov-bio
56ae32323c Add autosave for protocol keywords and user preferences 2019-11-20 14:57:53 +01:00
Urban Rotnik
1d180f3688 Fix for step description overwriting 
[SCI-4067]
 2019-11-11 10:31:55 +01:00
Oleksii Kriuchykhin
4cba412e31 Fix protocols table select all checkbox [SCI-3999] 2019-10-17 17:05:01 +02:00
Anton Ignatov
33497d11a3 Merge branch 'activestorage_migration' 2019-10-01 10:36:05 +02:00
Jure Grabnar
070c307721 Implement style changes suggested by Anton 2019-09-30 14:27:00 +02:00
Jure Grabnar
289853e2e8 Do not remove draft on step cancel (temporary) 
Close SCI-3751
 2019-09-30 11:34:39 +02:00
aignatov-bio
c652bb0d44
Merge pull request #2066 from aignatov-bio/ai-sci-3878-fix-missing-expand-all-steps-button 
Fix missing expand all button [SCI-3878]
 2019-09-18 14:59:29 +02:00
Anton Ignatov
0adb016293 Fix missing expand all button 2019-09-18 12:33:48 +02:00
Anton Ignatov
146c725e89 Fix step table error 2019-09-18 11:47:33 +02:00
Oleksii Kriuchykhin
3509543e7b Merge branch 'master' into ok_SCI_3881 2019-09-16 11:56:49 +02:00
aignatov-bio
16ae00782a
Fix new step button on empty task [SCI-3826] (#2026) 
* Fix new step button on empty task

* Fix markup
 2019-09-09 10:43:38 +02:00
aignatov-bio
15dc25cee9
Fix handson table initialization [SCI-3749] (#2021) 
* Fix handson table initialization

* Fix markup
 2019-09-05 08:35:28 +02:00
aignatov-bio
e682a3e5d9
Fix steps description and table saving (#1984) 2019-08-21 11:05:49 +02:00
aignatov-bio
b57e79a557
Fix tables (#1963) 2019-08-09 09:41:32 +02:00
Oleksii Kriuchykhin
973efa55e1 Merge branch 'master' into ok_SCI_3678 2019-08-08 11:17:07 +02:00
Oleksii Kriuchykhin
eaf9d59819 Merge branch 'activestorage_migration' into ok_SCI_3679 2019-08-06 15:27:31 +02:00
Oleksii Kriuchykhin
423528933e Switch to global JS constants [SCI-3679] 2019-08-06 15:06:19 +02:00
Urban Rotnik
4699ba718a Fix showing errors 2019-07-26 11:32:51 +02:00
Oleksii Kriuchykhin
5e65b07bdc Implement DirectUpload for Steps, Results and Inventories [SCI-3679] 2019-07-25 18:00:24 +02:00
Anton Ignatov
3b7f715e0b Merge branch 'activestorage_migration' into features/marvinjs-integration 2019-07-22 13:09:17 +02:00
aignatov-bio
4fe0227d8c
Add metadata for .eln assets (#1942) 2019-07-19 10:53:33 +02:00
Anton Ignatov
1e8663548e Add MarvinJS assets to TinyMCE 2019-07-16 13:40:54 +02:00
Anton Ignatov
3339c1fbbf Add MarvinJS to Result and TinyMce MarvinJS refactor 2019-07-15 17:17:14 +02:00
Jure Grabnar
d210b0b152 Trigger loading of latest publications when page is loaded 
Closes SCI-3670
 2019-07-15 08:52:17 +02:00
mlorb
5bc8eb7392
Merge pull request #1921 from mlorb/ml-sci-3641 
Fix page redirect and add success flash msg after protocols.io import [SCI-3641]
 2019-07-12 15:52:40 +02:00
Anton Ignatov
ffd415d409 Inital refactor for Assets model 2019-07-12 15:02:06 +02:00
Anton Ignatov
57a273d5d0 Merge branch 'activestorage_migration' into features/marvinjs-integration 2019-07-12 11:34:41 +02:00
aignatov-bio
c6152ccddb
Fix big table issue in ProtocolIo preview (#1927) 2019-07-12 11:17:51 +02:00
Mojca Lorber
f8afc92606 Fix page redirect and add success flash msg after protocols.io import action 2019-07-11 09:50:39 +02:00
Jure Grabnar
5eb197127f Fix relative links in protocolsio iframe 
Closes SCI-3660
 2019-07-10 19:20:40 +02:00
aignatov-bio
7ac410e573
Fix visual bugs across ProtocolIo [SCI-3671] (#1914) 
* Fix visual bugs across ProtocolIo
 2019-07-10 13:00:32 +02:00
mlorb
23270393b0
Merge branch 'master' into ml-sci-3634 2019-07-09 14:38:00 +02:00
Mojca Lorber
7bb82e2fc2 Fix eternal protocols tab visuals 2019-07-09 14:35:40 +02:00
Jure Grabnar
ae7da78bff
Merge pull request #1897 from jbargu/jg_sci_3646 
[SCI-3646] Add paging functionality to external protocols
 2019-07-08 13:06:19 +02:00
aignatov-bio
99b1075c28
Fix protcol naming when load multiple protocols (#1904) 2019-07-08 12:51:47 +02:00
Jure Grabnar
0eb09407bc Always scroll to top when searching for new string 2019-07-04 15:38:15 +02:00
Jure Grabnar
dc7fee51fa Add Show more protocols functionality to external protocols 
Closes SCI-3646
 2019-07-04 15:35:18 +02:00
Jure Grabnar
20134c9f8a
Features/protocolsio integration (#1893) 
Features/protocolsio integration
 2019-07-03 17:32:20 +02:00
aignatov-bio
d2849c88fd
Remove draft after save step (#1878) 2019-07-03 09:18:52 +02:00
aignatov-bio
378e91b426
Fix links on search page (#1867) 2019-07-02 11:21:00 +02:00
Oleksii Kriuchykhin
4ea6b56582 Fix Step and Result file previews [SCI-3539] 2019-07-01 23:30:20 +02:00
aignatov-bio
a08d93376c
Add promo modal when MarvinJS disabled (#1872) 2019-07-01 11:51:13 +02:00
Oleksii Kriuchykhin
2f39b7f22b Fix TinyMCE editor initialization for step editing [SCI-3511] 2019-06-28 12:06:04 +02:00
Jure Grabnar
5430fb311d Hound fixes 2019-06-28 10:41:20 +02:00
Jure Grabnar
1a9fca87d2 Fix non-existent protocol-card in preview banner 2019-06-28 08:49:12 +02:00
Jure Grabnar
149f45f4fc Hound fixes 2019-06-28 02:31:25 +02:00
Jure Grabnar
7fb696cf48 Fix unclickable import modal 2019-06-28 02:00:05 +02:00
Jure Grabnar
03b81400a9 Add timeout to search 2019-06-28 01:50:52 +02:00
Jure Grabnar
1ccabf62b3 Add preview banner in external protocols 2019-06-28 01:38:33 +02:00
Jure Grabnar
d3afcbed50 Style card view on external protocols 
Closes SCI-3535
 2019-06-28 00:43:05 +02:00
Jure Grabnar
7fb650a125 Change click -> onchange event for sort_by buttons 2019-06-27 22:56:38 +02:00
Jure Grabnar
0a77cedaf8 Fix sorting of external protocols and start showing results 2019-06-27 22:48:56 +02:00
Jure Grabnar
7d71608166 Add spinner to external preview 2019-06-26 19:43:35 +02:00
Anton Ignatov
7e5c39d3e4 Merge branch 'master' into features/marvinjs-integration 2019-06-21 14:51:45 +02:00
Alex Kriuchykhin
db7c6435b3
Merge pull request #1851 from okriuchykhin/ok_SCI_3436 
Implement saving of attachments ordering on steps [SCI-3436]
 2019-06-20 11:31:15 +02:00
Jure Grabnar
b2b752fcf8 Fix hound complaints 2019-06-19 23:37:04 +02:00
Jure Grabnar
b3c3b68dc2 Add external preview to External Protocols tab 
Closes SCI-3563
 2019-06-19 22:54:20 +02:00
aignatov-bio
609c408c77 Fix error on new step saving command (#1845) 2019-06-19 14:06:25 +02:00
aignatov-bio
5734d0cdd7 Fix TinyMCE field selector for steps (#1844) 2019-06-19 14:06:16 +02:00
aignatov-bio
81d10c8ce4
Remove recent protocol button on new step (#1841) 2019-06-19 12:49:22 +02:00
Oleksii Kriuchykhin
a855eade4c Merge branch 'master' into ok_SCI_3461 2019-06-11 17:48:02 +02:00
Oleksii Kriuchykhin
6e1a7a3392 Implement saving of attachments ordering on steps [SCI-3436] 2019-06-11 10:08:33 +02:00
aignatov-bio
d207cf5dce
Refactored comments over SciNote [SCI-3505] (#1808) 
* Preparing helpers for comments

* Refactored comments over scinote

* Update events
 2019-06-04 14:40:21 +02:00
Anton Ignatov
c9a29b12ba Merge branch 'master' into features/marvinjs-integration 2019-05-31 10:27:14 +02:00
Alex Kriuchykhin
c49dbe5c44
Merge pull request #1810 from okriuchykhin/ok_SCI_3511 
Fix RTE editor initialization for new step in protocol [SCI-3511]
 2019-05-30 12:54:36 +02:00
Oleksii Kriuchykhin
d061aec5cd Fix RTE editor initialization for new step in protocol [SCI-3511] 2019-05-29 18:33:20 +02:00
Oleksii Kriuchykhin
2c9ced0c75 Fix step numbering update on reposition [SCI-3507] 2019-05-29 12:20:35 +02:00
aignatov-bio
fb30e6b6e5
Add check for refreshProtocolStatusBar function exist (#1794) 2019-05-22 10:31:29 +02:00
Oleksii Kriuchykhin
84a2ad4487 Refactor the async thumbnail reloading (spinner) [SCI-3461] 2019-05-21 17:29:33 +02:00
mlorb
be0393e642
Merge pull request #1785 from biosistemika/lm-ml-sci-3193 
Update protocol status bar upon protocol changing [SCI-3193]
 2019-05-21 15:28:58 +02:00
Mojca Lorber
b479a6a145 Cover all use cases for updating protocol status bar 2019-05-20 16:09:43 +02:00
aignatov-bio
20b626d791
Fix warning message issue in step description [SCI-3479] (#1778) 
* Fix warning message issue
 2019-05-20 11:19:53 +02:00
Anton Ignatov
259b75a6ba Merge branch 'master' into features/marvinjs-integration 2019-05-16 09:28:48 +02:00
aignatov-bio
3633274c8f
Fix import for eln (#1741) 2019-05-13 10:22:30 +02:00