scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
4226 commits 70 branches 179 tags 165 MiB
Commit graph

122 commits

Author SHA1 Message Date
Jure Grabnar a3d7d37081 Format according to Hound bot #2 2018-09-23 11:30:20 +02:00
Jure Grabnar 64a6ed7ffe Format according to houndbot 2018-09-23 11:14:59 +02:00
Jure Grabnar d783c34d33 Clean some minor artefacts 2018-09-16 23:52:36 +02:00
Jure Grabnar f8b1db7f72 Fix repository export and relative hyperlinks 2018-09-16 23:01:44 +02:00
Jure Grabnar 449aa12070 Refactor TeamZipExport code (move it into special file) 2018-09-16 20:28:26 +02:00
Jure Grabnar 295c6a9432 Add export all functionality (basic skeleton) 2018-08-21 21:07:45 +02:00
Alex Kriuchykhin 6004f8411b
Merge pull request #1260 from okriuchykhin/ok_SCI_2611 
Add GET teams and team API endpoints [SCI-2611][SCI-2612]
 2018-08-08 16:59:42 +02:00
Oleksii Kriuchykhin 298b866df4 Fix failing tests [SCI-2611][SCI-2612] 2018-08-07 14:58:02 +02:00
okriuchykhin dd9090efef
Merge pull request #1253 from okriuchykhin/ok_SCI_2608 
Adds API authentication with Azure AD [SCI-2608]
 2018-08-02 11:28:18 +02:00
Oleksii Kriuchykhin 0e372af729 Adds API authentication with Azure AD [SCI-2608] 2018-07-24 14:21:33 +02:00
Oleksii Kriuchykhin 3e7fc6720c Fix team import service 2018-07-20 16:10:45 +02:00
Luka Murn f67b8d05c7
Merge pull request #1225 from okriuchykhin/ok_SCI_2534 
Fix rendering permissions of inventory annotations [SCI-2534]
 2018-07-13 15:18:59 +02:00
Zmago Devetak 00ed339520
Merge pull request #1233 from ZmagoD/zd_SCI_2589 
fixes bug with xslx files with numeric values [fixes SCI-2589]
 2018-07-06 11:08:27 +02:00
zmagod c0d276ebee fixes bug with xslx files with numeric values [fixes SCI-2589] 2018-07-05 14:08:03 +02:00
Oleksii Kriuchykhin 42ce72170c Fix inventory cell copy with file attached [SCI-2585] 2018-07-02 12:58:49 +02:00
Oleksii Kriuchykhin 6660b240c8 Fix rendering permissions of inventory annotations [SCI-2534] 2018-06-28 15:30:32 +02:00
Zmago Devetak 54a17e0574
Merge pull request #1209 from ZmagoD/zd_SCI_2165 
Update team migration script to support "list of values" and "file" repository columns/cells [fixes SCI-2165]
 2018-06-27 15:31:27 +02:00
Zmago Devetak 29c379dbae
add rep_item to update_annotation function 2018-06-27 15:17:02 +02:00
zmagod db1944cc90 move maximum file size limit to an ENV variable [fixes SCI-2415] 2018-06-19 14:15:14 +02:00
zmagod d68ae63c40 adds repository_items to smart annotation import 2018-06-19 11:58:22 +02:00
zmagod fbcc788597 fixes per @duczOr request 2018-06-18 14:00:49 +02:00
zmagod 3d7591100a adds repository row assets to team import/export [fixes SCI-2165] 2018-06-14 15:20:57 +02:00
zmagod 4a82d1e7ac fixes repository items import 2018-06-14 14:40:43 +02:00
zmagod f2c0b3aa92 removes samples, adds list_items 2018-06-13 12:45:48 +02:00
zmagod 9abf50e7c5 Limits the max. amount of rows when importing into inventories [fixes SCI-2468] 2018-05-31 10:45:31 +02:00
zmagod c683cfdbd7 triggers the delayed job in the controller action, fixes smart annotations 2018-05-25 11:41:43 +02:00
zmagod e019767e90 refactor save_pdf_to_inventory_item service 2018-05-17 13:17:19 +02:00
zmagod b125863baf Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2371 2018-05-17 11:25:33 +02:00
zmagod ca0c8cbb71 fixes typos, fixes pdf rendering 2018-05-17 11:21:34 +02:00
Zmago Devetak 8a92f1a499
Merge pull request #1127 from ZmagoD/zd_SCI_2307_v3 
Adds custom method that generates smart annotations name for repository
 2018-05-16 13:23:25 +02:00
zmagod 4573655ec8 adds save PDF report to inventory feature [fixes SCI-2371] 2018-05-16 09:31:19 +02:00
Luka Murn 63b7b937bb Fix a bug with table order not updating properly with col deletion 2018-05-15 20:44:15 +02:00
zmagod 3e10ff7fc5 add custom method that generates smart annotations name from repository name [fixes SCI-2307] 2018-05-04 10:44:23 +02:00
Zmago Devetak 9ce071693d
Merge pull request #1116 from ZmagoD/zd_SCI_2310 
parse smart annotations in repository export [fixes SCI-2310]
 2018-05-03 14:34:29 +02:00
Zmago Devetak 4fe4fea4fc
Merge pull request #1122 from ZmagoD/zd_SCI_2339 
repository when sorting/searching bug fix [SCI-2339]
 2018-05-03 12:05:39 +02:00
Luka Murn cb6fe50832 Merge branch 'master' into ux-release-1 
Conflicts:
	app/assets/javascripts/repositories/index.js
 2018-04-26 11:38:54 +02:00
zmagod 23f8f35a2c a shotgun surgery that fixes searching/filtering of repository_rows [fixes SCI-2339] 2018-04-26 11:05:02 +02:00
Luka Murn cd04596c62
Merge pull request #1111 from Ducz0r/lm-sci-2276-fix 
Update the code for repository table states so it (hopefully) causes less errors [SCI-2276]
 2018-04-25 12:37:27 +02:00
zmagod 7d26ce561c parse smart annotations in repository export [fixes SCI-2310] 2018-04-24 14:53:49 +02:00
zmagod efd1e470f6 rename smart annotations icons [fixes SCI-2307] 2018-04-23 12:38:54 +02:00
Luka Murn c0da83c5de Add some additional nil guards 2018-04-20 12:31:22 +02:00
Luka Murn d023db16af Update the destroy_column action so it properly updates all states 2018-04-20 12:31:22 +02:00
Luka Murn 21e7e7057e Refactor all the methods into two new services 2018-04-20 12:31:22 +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 6b4d786acc
Merge pull request #1105 from ZmagoD/zd_SCI_2307 
change repository icon
 2018-04-19 17:58:48 +02:00
zmagod bb3e1b4dcf change repository icon 2018-04-19 15:39:24 +02:00
zmagod f3af8f4524 switch current_team to repository.team 2018-04-19 13:04:16 +02:00
zmagod 9baaad25b6 add current_user to cloned created_by, last_modified_by field 2018-04-16 12:38:25 +02:00
zmagod 4f21833373 changes per @duco 's request 2018-04-13 11:47:33 +02:00
zmagod 6291857bbf enables copying of repository items [fixes SCI-2207] 2018-04-11 17:17:19 +02:00