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

4926 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Miha Mencin 2271e453df SCI-2936 minor refactor and code styling 2019-01-18 09:25:32 +01:00
Miha Mencin f6230b2c9a SCI-2936 added down method, make code more readable 2019-01-17 18:10:45 +01:00
Miha Mencin 4a6459000f SCI-2936 added migration 2019-01-17 17:54:15 +01:00
Alex Kriuchykhin f765bd5d91
Merge pull request #1454 from okriuchykhin/ok_SCI_2965 
Improve export all modal messages in case of unlimited exports [SCI-2965]
 2019-01-17 17:29:37 +01:00
Oleksii Kriuchykhin 1861f86b2c Improve export all modal messages in case of unlimited exports [SCI-2965] 2019-01-17 17:27:32 +01:00
Alex Kriuchykhin 966c729a9c
Merge pull request #1453 from okriuchykhin/ok_SCI_2776_v2 
Fix issue with caching in inventories dropdown [SCI-2776]
 2019-01-17 15:14:28 +01:00
Oleksii Kriuchykhin e62e1873b0 Fix issue with caching in inventories dropdown [SCI-2776] 2019-01-17 15:04:20 +01:00
Alex Kriuchykhin 88cea198f0
Merge pull request #1452 from okriuchykhin/ok_SCI_2950 
Fix binary files in Export All archive [SCI-2950]
 2019-01-16 17:29:48 +01:00
Oleksii Kriuchykhin 4f9eb7e165 Fix binary files in Export All archive [SCI2950] 2019-01-16 17:07:05 +01:00
Miha Mencin 0766ee96a7
Merge pull request #1447 from okriuchykhin/ok_SCI_2875_v2 
Fix task tags update on canvas cards [SCI-2875]
 2019-01-16 12:44:50 +01:00
Alex Kriuchykhin c771db246b
Merge pull request #1449 from okriuchykhin/ruby_245_update 
Update Ruby to 2.4.5 and add jemalloc package
 2019-01-16 10:32:37 +01:00
Oleksii Kriuchykhin 1d4fc7172d Update Ruby to 2.4.5 and add jemalloc package 2019-01-15 17:10:10 +01:00
Oleksii Kriuchykhin 3a4b992f4e Code style fixies []SCI-2875] 2019-01-14 16:31:23 +01:00
Matej Zrimšek a5c1cf4450 Switch user's team if he's no longer a member of the currently selected one 2019-01-12 23:39:31 +01:00
Matej Zrimšek 838455af0d Fix protocols.io Date handling at import 2019-01-12 19:28:45 +01:00
Oleksii Kriuchykhin 89240659a7 Fix task tags update on canvas cards [SCI-2875] 2019-01-11 17:20:39 +01:00
Alex Kriuchykhin b530cea771
Merge pull request #1438 from okriuchykhin/ok_SCI_2776 
Add counters to task inventories dropdown [SCI-2776]
 2019-01-11 16:27:22 +01:00
Alex Kriuchykhin be514fd62d
Merge pull request #1445 from okriuchykhin/ok_SCI_2931 
Fix image URLs in export all document [SCI-2931]
 2019-01-11 12:03:06 +01:00
Luka Murn a096175d0c Remove test folder (apart from mailer) & update addon generator 2019-01-11 11:27:31 +01:00
Oleksii Kriuchykhin 132f46b136 Improve error handling in task inventories dropdown [SCI-2776] 2019-01-10 21:11:20 +01:00
Oleksii Kriuchykhin ec28db6f4f Fix image URLs in export all document [SCI-2931] 2019-01-10 14:19:40 +01:00
Alex Kriuchykhin c2b38af91e
Merge pull request #1439 from okriuchykhin/ok_SCI_2888 
Rename CORE_API_V1_PREVIEW env. variable to CORE_API_V1_ENABLED [SCI-2888]
 2019-01-10 11:05:07 +01:00
Alex Kriuchykhin 8ea37c541b
Merge pull request #1436 from okriuchykhin/ok_SCI_2904 
Disable edit button for unsupported WOPI formats [SCI-2904]
 2019-01-10 11:04:26 +01:00
Jure Grabnar dc79a6dc9e
Merge pull request #1442 from jbargu/jg_edit_step_help_2891 
After edit step in app help does not appear any more
 2019-01-09 17:19:33 +01:00
Alex Kriuchykhin aef96f81ce
Merge pull request #1441 from okriuchykhin/ok_SCI_2868 
Update rack version to 2.0.6 [SCI-2868]
 2019-01-09 11:29:57 +01:00
mlorb 06b1e5cf20 Allow org. administrators to invite them onto all projects 2019-01-08 16:30:52 +01:00
Jure Grabnar fe46f9c9fe Reinit tooltips after cancel/save step 
Closes SCI-2891.
 2019-01-08 15:36:44 +01:00
Matej Zrimšek 8070b7f8b5 Fix Date and Time display formats on JS side 2019-01-08 08:07:24 +01:00
Matej Zrimšek b64df7d8cc Fix additional Date and Time display formats 2019-01-08 06:29:37 +01:00
Oleksii Kriuchykhin 7ccb42f493 Update rack version to 2.0.6 [SCI-2868] 2019-01-07 11:38:33 +01:00
Luka Murn 00a3b8b94e
Merge pull request #1440 from biosistemika/release-1.15.2 
Merge release-1.15.2 into master
 2019-01-07 11:12:38 +01:00
Luka Murn dcba2e74f5 Update VERSION to 1.15.2 2019-01-07 10:54:28 +01:00
Oleksii Kriuchykhin 6a64b23f90 Rename CORE_API_V1_PREVIEW env. variable to CORE_API_V1_ENABLED [SCI-2888] 2019-01-04 10:44:38 +01:00
Alex Kriuchykhin 8ffe5dafee
Merge pull request #1437 from okriuchykhin/ok_SCI_2907 
Change sample date in date format settings [SCI-2907]
 2019-01-03 16:10:19 +01:00
Oleksii Kriuchykhin 5ea5b76d39 Change sample date in date format settings [SCI-2907] 2019-01-03 14:15:41 +01:00
Oleksii Kriuchykhin 534866467b Add counters to task inventories dropdown [SCI-2776] 2019-01-03 14:11:00 +01:00
Oleksii Kriuchykhin 2769add4d9 Disable edit button for unsupported WOPI formats [SCI-2904] 2018-12-31 18:10:12 +01:00
Matej Zrimšek c84457e1ed Prevent archiving of experiments with at least one locked task 2018-12-23 21:17:51 +01:00
Matej Zrimšek b74105abc2 Fix Date and Time display formats 2018-12-23 20:30:09 +01:00
Luka Murn 1c8407e4f4
Merge pull request #1433 from okriuchykhin/ok_SCI_2864 
Additional fix for export all S3 path [SCI-2864]
 2018-12-20 13:27:50 +01:00
Oleksii Kriuchykhin 2fa4f42883 Additional fix for export all S3 path [SCI-2864] 2018-12-20 13:22:56 +01:00
Luka Murn faf6601962
Merge pull request #1432 from okriuchykhin/ok_SCI_2864 
Fix S3 zip exports path [SCI-2864]
 2018-12-20 11:08:48 +01:00
Oleksii Kriuchykhin c880f3fd84 Fix S3 zip exports path [SCI-2864] 2018-12-20 11:07:19 +01:00
Alex Kriuchykhin aac5c101a5
Merge pull request #1431 from okriuchykhin/ok_SCI_2864 
Improve user's variables migration [SCI-2864]
 2018-12-19 19:19:23 +01:00
Oleksii Kriuchykhin 90b46c665d Refresh user's model in variables migration [SCI-2864] 2018-12-19 19:03:10 +01:00
Oleksii Kriuchykhin 70cc3742ad Improve user's variables migration [SCI-2864] 2018-12-19 18:30:27 +01:00
Luka Murn 2a7eda5db7
Merge pull request #1430 from Ducz0r/lm-sci-2902-fix-3 
Add force_encoding to export all report view template [SCI-2902]
 2018-12-18 22:29:27 +01:00
Luka Murn ac5c809d20 Add force_encoding to export all report view template 2018-12-18 21:03:10 +01:00
Luka Murn cb1cfe2ef3
Merge pull request #1429 from Ducz0r/lm-sci-2902-fix-2 
Fix assets include in export all report to work on production env [SCI-2902]
 2018-12-18 09:14:44 +01:00
Luka Murn 5304fabed2
Merge pull request #1428 from okriuchykhin/ok_SCI_2916 
Fix ajax calls duplication [SCI-2916]
 2018-12-18 09:14:22 +01:00