aignatov-bio
d147e8260d
Fix issue with moving protocol in repository ( #1887 )
2019-07-03 15:35:37 +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
Anton Ignatov
995408e7fc
Fix protocol update error, rollback bootstrap gems and fix step name
2019-05-08 17:18:19 +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
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
Oleksii Kriuchykhin
7c91b4a255
Merge remote-tracking branch 'scinote/master-with-note-section' into ok_SCI_3266
2019-04-23 17:01:13 +02:00
Oleksii Kriuchykhin
c7a707f9db
Fix task clonning with TinyMCE images [SCI-3266]
2019-04-23 15:16:40 +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
e034a0c055
Fix bug with update protocol from repository and modal disable button [SCI-3284] ( #1631 )
...
* Fix bug with update protocol from repository and modal disable button
2019-04-03 09:18:18 +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
Anton Ignatov
4ec0a3c871
Update TinyMCE image loader for new fields
2019-03-22 10:52:26 +01:00
Anton Ignatov
07c2819163
refactoring tinymce image uploading
2019-03-20 14:46:54 +01:00
Mojca Lorber
4f9814b884
Merge branch 'features/global-activities' of github.com:biosistemika/scinote-web into ml-sci-3021
2019-03-20 11:03:00 +01:00
Mojca Lorber
42ff1c0a68
fix bug in revert protocol method
2019-03-20 09:43:38 +01:00
Urban Rotnik
fe35c805b7
Add model breadcrumbs, update activities_helper
2019-03-19 14:01:06 +01:00
Urban Rotnik
b33e95e18a
New Protocols actions logging
2019-03-12 09:14:53 +01:00
Oleksii Kriuchykhin
61147b480c
Add main global activities bussiness logic [SCI-3014]
2019-02-26 11:01:15 +01:00
Zanz2
8e42dba7de
Found the fix
2018-07-03 08:20:56 +02:00
zmagod
024032faff
refactor update protocol keywords action [fixes SCI-2257]
2018-04-06 15:41:50 +02:00
Oleksii Kriuchykhin
16e1d072b9
Improve files handling in protocol clonning [SCI-2003]
2018-02-01 15:44:08 +01:00
zmagod
f8a3fca2db
Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling
2018-01-23 11:06:33 +01:00
Mojca Lorber
fe5828fa97
add copying of TinyMce assets when cloning the protocol
2017-11-22 16:47:21 +01:00
Luka Murn
8d68769d09
Hound is Love, Hound is Life
2017-07-04 14:47:58 +02:00
Luka Murn
91cddce8a6
Fixes DEPRECATION WARNING-s for Rails 5.1.2
...
This just fixes the warning messages occured during click-through
of the application. I didn't systematically search code for all
potential problems (I couldn't find the list of all deprecations
anyway).
Closes SCI-1427.
2017-07-04 14:35:51 +02:00
zmagod
525c9770ac
fixes experiment page [fixes SCI-1395]
2017-06-28 15:21:32 +02:00
zmagod
819f47b450
setup sciNote for Rails 5.1
2017-06-23 15:19:08 +02:00
Oleksii Kriuchykhin
5d55720aad
Fix steps ordering in reports [SCI-1008]
2017-05-11 15:56:33 +02:00
zmagod
2081e0a94b
Merge branch 'master' of https://github.com/biosistemika/scinote-web into release-1.10.1
2017-05-10 15:14:17 +02:00
Oleksii Kriuchykhin
0ee7e11620
Add advanced search options [SCI-1158]
2017-05-05 16:41:23 +02:00
zmagod
8d0c22327b
adds asc order to checklists [fixes SCI-1228]
2017-05-04 15:17:34 +02:00
Luka Murn
9479b65140
Hopefully fixes the encoding issues with audit trails
...
Closes SCI-1175.
2017-04-19 08:35:04 +02:00
Luka Murn
6a7e383316
Please the Hound
2017-04-18 15:38:11 +02:00
Luka Murn
9c28608fbf
Fix encoding when cloning tables
...
Closes SCI-1175.
2017-04-13 17:00:27 +02:00
Oleksii Kriuchykhin
07d658ab82
Improve speed of search [SCI-1157]
2017-04-11 14:55:44 +02:00
Oleksii Kriuchykhin
2edebb282a
Add team_id field to assets and tables [SCI-1046]
2017-03-23 10:36:55 +01:00
zmagod
0c2523beca
Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration
2017-03-10 16:21:43 +01:00
Zmago Devetak
5c9954bb89
Merge pull request #450 from ZmagoD/zd_SCI_939
...
Refactor "organizations" to "teams"
2017-02-01 13:12:02 +01:00
zmagod
be5faad97c
fixes hound
2017-01-31 13:33:55 +01:00
Oleksii Kriuchykhin
08aa882155
Fix generation of image previews after protocol loading from repo [SCI-951]
2017-01-26 13:19:59 +01:00
zmagod
9d90b9b42a
rename Organization to Team in models
2017-01-24 17:08:48 +01:00
zmagod
a193850ae6
rename models where org/organization
2017-01-24 16:34:21 +01:00
Mojca Lorber
dde9854bf1
update protocol import/export and clone
2017-01-18 14:22: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
zmagod
de3099e4d1
removes asset_helper, fixes loading of processed thumbnails in results and steps and when loading protocols from repository
2016-12-09 13:59:49 +01:00
Matej Zrimšek
0780bd2416
Ruby constants are now automatically available in JS. Refactoring was needed.
2016-10-17 11:57:37 +02:00
Matej Zrimšek
a3dfb59558
Added remaining constants.
2016-10-17 11:30:05 +02:00
Jure Grabnar
1f67aec258
Prevent destroying protocols when file is edited
...
SCI-552 #close
2016-10-06 16:13:42 +02:00
okriuchykhin
a7f3f793c8
Merge pull request #161 from okriuchykhin/ok_SCI-380
...
Fixes issue with reordering of checklist items [fixes SCI-380]
2016-09-23 10:37:56 +02:00
Oleksii Kriuchykhin
841e495234
Fix brace position [fixes SCI-380]
2016-09-22 16:48:15 +02:00