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
3304 commits 70 branches 179 tags 165 MiB
Commit graph

3304 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luka Murn 094841e03b
Merge pull request #926 from Ducz0r/lm-decoupling-metrics 
Add the decoupling metrics rake task
 2018-01-05 11:42:08 +01:00
mlorb 70ae14a9b8 refactor manage repository permissions again because of addons 2018-01-05 11:17:01 +01:00
Luka Murn 641afc4b8c Add the decoupling metrics rake task 
To get the metrics, run the following rake task:
`rake metrics:decoupling`
 2018-01-05 10:58:42 +01:00
mlorb ec851caa80 refactor manage repository column permissions again because of addons 2018-01-05 10:43:59 +01:00
zmagod be014000ab fixes flow-types 2018-01-05 09:59:08 +01:00
zmagod 862b73cae7 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1866 2018-01-05 09:13:43 +01:00
zmagod 0d72851bb5 fixes bug with displaying assign/unassign button [fixes SCI-1870] 2018-01-04 17:20:17 +01:00
okriuchykhin 4cdbecc3bc
Merge pull request #923 from okriuchykhin/ok_SCI_1869 
Add project/task path with tooltips to activities [SCI-1869]
 2018-01-04 16:44:35 +01:00
Oleksii Kriuchykhin 53f4db9352 Code refactoring [SCI-1869] 2018-01-04 14:56:16 +01:00
zmagod a87c43e999 nil image guard [fixes SCI-1907] 2018-01-04 14:49:52 +01:00
okriuchykhin b0f8c36677
Merge pull request #917 from okriuchykhin/ok_SCI_1870 
Fix adding users to a task [SCI-1870]
 2018-01-04 14:14:05 +01:00
okriuchykhin e49ffb61d4
Merge pull request #914 from okriuchykhin/ok_SCI_1873 
Fix repositories [SCI-1873]
 2018-01-04 13:33:30 +01:00
mlorb abced181d5 refactor manage repository rows permissions again because of addons 2018-01-04 11:53:58 +01:00
Oleksii Kriuchykhin 070711917e Code fixes [SCI-1873] 2018-01-04 11:25:34 +01:00
Luka Murn 7e2392f620
Update VERSION to 1.12.8 2018-01-04 08:33:33 +01:00
zmagod e0e3ef9359 fixes flow, and before_action in permissions_controller 2018-01-03 17:23:50 +01:00
okriuchykhin d149facd50
Merge pull request #922 from okriuchykhin/ok_SCI_1875 
Fix about modal [SCI-1875]
 2018-01-03 17:00:29 +01:00
mlorb 0c519b8f03 refactor manage sample elements permissions again because of addons 2018-01-03 16:37:02 +01:00
okriuchykhin 3d3b1d3a44
Merge pull request #921 from okriuchykhin/ok_SCI_1648 
Fix assign repository record button in tasks when one record is selected [SCI-1648]
 2018-01-03 16:28:34 +01:00
okriuchykhin ac7746ae91
Merge pull request #916 from okriuchykhin/ok_SCI_1871 
Fix canvas update [SCI-1871]
 2018-01-03 15:47:10 +01:00
okriuchykhin ff62a36788
Merge pull request #910 from okriuchykhin/ok_SCI_1838 
Change invite users to project link to new settings page [SCI-1838]
 2018-01-03 14:47:26 +01:00
okriuchykhin b8fa3c4d51
Merge pull request #905 from okriuchykhin/ok_SCI_1865 
Add icons for different notification types in recent notification dropdown [SCI-1865]
 2018-01-03 14:23:53 +01:00
zmagod 1d3881b649 fixes bug with duplicated activities and wrong date separators [fixes SCI-1866] 2018-01-03 13:48:59 +01:00
mlorb dc68b3068b fix Rails 5.1 bug with params 2018-01-03 13:19:56 +01:00
Oleksii Kriuchykhin 2e275d6d67 Add project/task path with tooltips to activities [SCI-1869] 2017-12-28 15:13:39 +01:00
Zanz2 7bad722553 Made small oversight and fixed it 2017-12-24 02:06:14 +01:00
Zanz2 83e1b04c7a Fixed pull request 2017-12-24 01:49:04 +01:00
Oleksii Kriuchykhin 89230bd730 Fix about modal [SCI-1875] 2017-12-22 18:27:20 +01:00
Oleksii Kriuchykhin 27008be50e Fix assign repository record button in tasks when one record is selected [SCI-1648] 2017-12-22 18:05:22 +01:00
okriuchykhin 0a6d0d1a47
Merge pull request #918 from okriuchykhin/ok_SCI_1893 
Fix invite users dropdown [SCI-1893]
 2017-12-22 16:58:49 +01:00
okriuchykhin 6fe7598b90
Merge pull request #919 from okriuchykhin/ok_SCI_1895 
Fix bootstrap select dropdown [SCI-1895][SCI-1896]
 2017-12-22 16:58:38 +01:00
okriuchykhin a31d616cf8
Merge pull request #920 from okriuchykhin/ok_SCI_1872 
Fix experiment workflow image update indicator [SCI-1872]
 2017-12-22 16:58:26 +01:00
Oleksii Kriuchykhin 917c2cf28e Fix experiment workflow image update indicator [SCI-1872] 2017-12-22 13:12:52 +01:00
Oleksii Kriuchykhin b98241ef61 Fix bootstrap select dropdown [SCI-1895][SCI-1896] 2017-12-22 09:52:00 +01:00
Oleksii Kriuchykhin afb579bef1 Fix invite users dropdown [SCI-1893] 2017-12-21 16:49:10 +01:00
mlorb 0774b6f7e6 refactor manage samples permissions again, so that addons permissions can be added 2017-12-20 16:05:05 +01:00
Oleksii Kriuchykhin 49ae9bcd55 Fix adding users to a task [SCI-1870] 2017-12-20 13:44:21 +01:00
Oleksii Kriuchykhin 66869fe4cf Fix canvas update [SCI-1871] 2017-12-20 11:44:11 +01:00
Luka Murn 44f0336a96
Merge pull request #915 from biosistemika/lm-fix-wicked-pdf-version 
Fix Wicked PDF version
 2017-12-20 11:08:03 +01:00
Luka Murn 704bd31fef Set wicked_pdf version to ~> 1.0.6 2017-12-20 10:53:53 +01:00
Oleksii Kriuchykhin 512ee07bde Fix repositories [SCI-1873] 2017-12-19 17:53:45 +01:00
okriuchykhin ee973bb3c1
Merge pull request #913 from okriuchykhin/ok_SCI_1891 
Remove Creek XLSX parser gem as it causes conflicts [SCI-1891]
 2017-12-19 16:34:53 +01:00
Oleksii Kriuchykhin 1a81a99ff0 Remove Creek XLSX parser gem as it causes conflicts [SCI-1891] 2017-12-19 16:17:11 +01:00
okriuchykhin 565fd07d05
Merge pull request #912 from okriuchykhin/ok_SCI_1891 
Fix gem dependencies [SCI-1891]
 2017-12-19 14:21:45 +01:00
Oleksii Kriuchykhin 99de5550b0 Fix gem dependencies [SCI-1891] 2017-12-19 14:18:29 +01:00
Luka Murn 49f9981a39 Remove uneccesary submodule include 2017-12-19 12:05:28 +01:00
Luka Murn cf291bf887 Merge branch 'gilson-iot-rails4' 
Conflicts:
	Gemfile.lock
 2017-12-19 10:56:39 +01:00
Zanz2 53561ffd84 Refactored according to PR 2017-12-15 20:39:15 +01:00
Adrian Oprea 7358022fa5
Merge pull request #909 from biosistemika/chore/add-EditorConfig 
chore: Add EditorConfig preference file
 2017-12-14 15:42:31 +02:00
mlorb bd7eda1506 fix failing tests 2017-12-14 14:18:18 +01:00