scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-29 19:51:01 +08:00
Code Issues Projects Releases Packages Wiki Activity
5556 commits 39 branches 184 tags 168 MiB
Commit graph

150 commits

Author SHA1 Message Date
aignatov-bio
3633274c8f
Fix import for eln (#1741) 2019-05-13 10:22:30 +02:00
Anton Ignatov
7c55fcf0cf Merge branch 'master' into master-with-note-section 2019-04-30 12:07:59 +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
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
Mojca Lorber
b00cf07684 Add activity for importing inventory items 2019-04-18 15:18:10 +02:00
Oleksii Kriuchykhin
f9832013b0 Improve experiment preview image generation [SCI-3177] 2019-04-17 12:06:46 +02:00
Oleksii Kriuchykhin
e7151e6e6b Disable inventory import activity logging [SCI-3290] 2019-04-03 22:42:33 +02:00
Alex Kriuchykhin
d8ce4d4a91
Merge pull request #1640 from okriuchykhin/ok_SCI_3281_v2 
Fix activity creation for editing wopi file in protocol repository [SCI-3281]
 2019-04-03 21:14:36 +02:00
Oleksii Kriuchykhin
14978f7c1f Fix activity creation for editing wopi file in protocol repository [SCI-3281] 2019-04-03 19:51:54 +02:00
Jure Grabnar
f00f4d39af Refactor step activities using position_plus_one 
Closes SCI-3273
 2019-04-03 13:10:45 +02:00
Jure Grabnar
a2623b5124 Fix non-existant current_team in WOPI create_activity 
Closes SCI-3279
 2019-04-02 14:20:01 +02:00
mlorb
b24a07f1c8
Merge pull request #1616 from mlorb/ml-sci-3237 
Change activities for task protocols [SCI-3237]
 2019-04-01 14:32:16 +02:00
Jure Grabnar
6533368763 Add activity for importing inv items 2019-03-29 15:41:34 +01:00
Mojca Lorber
3c69225d6b Change activities for task protocols 2019-03-29 15:09:20 +01:00
Miha Mencin
4c3c0ef908 removing activity creation from demo project 2019-03-25 15:45:10 +01:00
Miha Mencin
4a87216a3d
Merge branch 'master' into features/global-activities 2019-03-25 14:35:24 +01:00
Mojca Lorber
e34ddeaefd Remove activities from demo project 2019-03-20 13:25:59 +01:00
Mojca Lorber
cd7a87348f Protocol activities refactoring, without tests 2019-03-19 16:12:07 +01:00
Miha Mencin
6deaff6382 fixing hound errors 2019-03-04 18:36:32 +01:00
Miha Mencin
fa7bba9de7 scheduling creation of demo project at the sign in time 
remove wrong schema, fix comment, add migration
 2019-03-04 18:26:15 +01:00
Miha Mencin
4f9daa9590 SCI-3112 Change the the comments in demo project generator 2019-02-28 11:39:44 +01:00
Miha Mencin
088a860683
Merge pull request #1539 from biosistemika/features/templates 
Features/templates
 2019-02-28 10:23:13 +01:00
Miha Mencin
d03ef2cd2a
Merge branch 'master' into features/templates 2019-02-28 09:41:20 +01:00
Jure Grabnar
93490a1f47 Add missing created_at and fix typo 
Closes SCI-3100, SCI-3098
 2019-02-28 07:29:25 +01:00
Jure Grabnar
0fbbe8b5de Add result comments to demo project 
Closes [SCI-3100].
 2019-02-27 20:32:28 +01:00
Jure Grabnar
0699204d3b Add changes for parallel exec discussed with Miha 2019-02-27 15:22:19 +01:00
Jure Grabnar
30bc536d07 Fix smart annotations in demo project 
Closes SCI-3097, SCI-3102.
 2019-02-26 14:36:48 +01:00
Jure Grabnar
2464a45f83 Fix ordering for another step in demo project 
Closes SCI-3098.
 2019-02-26 08:34:50 +01:00
Jure Grabnar
c409c39e60 Fix demo project's checklist item ordering 
Closes SCI-3099.
 2019-02-26 08:26:02 +01:00
Jure Grabnar
b6dd783114 Improve generation of a demo project 
Closes SCI-3096
 2019-02-26 08:06:07 +01:00
Urban Rotnik
c8ab9f8ff8 Fix tests 2019-02-26 08:04:05 +01:00
Jure Grabnar
d7e91676c3 Rename initial experiment back to the old one 2019-02-24 08:13:57 +01:00
Jure Grabnar
f98d6fbd4d Remove archived task in Demo project 
Closes SCI-3082.
 2019-02-22 11:58:32 +01:00
Jure Grabnar
ffe0493013 Rename Demo project and create rake task to create it on existing users 
Closes SCI-3080.
 2019-02-21 23:31:55 +01:00
Mojca Lorber
16f99afbc0 Minor fixes 2019-02-13 12:20:14 +01:00
Mojca Lorber
227aeb284c change mydemo projects data 2019-02-05 11:15:16 +01:00
Mojca Lorber
fa1dff6352 refactor Demo project generation 2019-01-24 13:40:53 +01:00
Oleksii Kriuchykhin
c86063f79e Fix failing tests [SCI-2688] 2018-08-24 15:48:49 +02:00
zmagod
e654725d9e fixes smart annotation serch queries/dropdown item picker [fixes SCI-2511] 2018-07-06 14:26:20 +02:00
mlorb
f972676f8d
Merge pull request #1158 from Ducz0r/lm-sci-2416-fix 
Update software with new logo & new brand [SCI-2416]
 2018-05-23 15:47:17 +02:00
Oleksii Kriuchykhin
5c41527b92 Enable editing office online files in inventories [SCI-2342] 2018-05-21 15:48:48 +02:00
Luka Murn
69d1f0511f Rename sciNote -> SciNote (app/ folder) 2018-05-21 15:19:11 +02:00
Oleksii Kriuchykhin
39d594b0da Disable some validations in repository import to improve speed [SCI-2404] 2018-05-15 11:14:43 +02:00
Luka Murn
5e2622ecfc Change default repository state to Ruby representation 
Also remove some dead code from repositories datatables
 2018-04-20 12:31:22 +02:00
Zmago Devetak
93fc1af12d
Merge pull request #1083 from ZmagoD/zd_SCI_2259 
set limit on maximum number of dropdown list items [fixes SCI-2259]
 2018-04-19 17:17:54 +02:00
Luka Murn
09c60d2468 Fixes per @Ducz0r's request 2018-04-12 14:38:22 +02:00
Luka Murn
9bf8b5d864 Merge branch 'ok_SCI_1860' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_1860 
Conflicts:
	Makefile
	app/assets/javascripts/projects/index.js.erb
	app/assets/stylesheets/themes/scinote.scss
	config/locales/en.yml
 2018-04-12 13:16:46 +02:00