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

2785 commits

Author SHA1 Message Date
Zanz2 cff2f933a0 removed byebug :D 2018-04-04 15:19:00 +02:00
Zanz2 ec743a7420 fixed the issue 2018-04-04 15:16:31 +02:00
Zanz2 4259fa44f9
Merge pull request #1069 from Zanz2/remotipart_workaround 
Remotipart workaround [SCI-2270]
 2018-04-04 11:27:30 +02:00
Zanz2 7f36ab3e5e deleted require and gemfile entry for remotipart 2018-04-04 11:12:39 +02:00
Oleksii Kriuchykhin d8d2d75631 Fix repository rows permissions [SCI-2265] 2018-04-02 20:48:44 +02:00
Zanz2 2fab3e4caa
Overlooked a small change #2 2018-04-02 20:05:06 +02:00
Zanz2 25619e5e01
Overlooked a small change 2018-04-02 20:02:59 +02:00
Zanz2 1606982966 found a hackish fix by doing a manual ajax call and some other things with jquery 2018-04-02 19:56:25 +02:00
okriuchykhin 31c68ab4bc
Merge pull request #1062 from okriuchykhin/ok_SCI_2201 
Rescale Linkedin buttons [SCI-2201]
 2018-03-28 15:23:05 +02:00
Luka Murn c07dc98cc8 Fix Office Online editing of files [SCI-2264] 
Office Online files could not be edited. I believe the reason
was that in Rails 5.1, `render nothing: true` was removed. So
I replaced this in `wopi_controller` with `render body: nil`.
Hopefully this will do the trick.

Closes SCI-2264.
 2018-03-28 13:22:30 +02:00
okriuchykhin 13fed0411b
Merge pull request #1063 from biosistemika/release-1.12.11 
merge release 1.12.11 branch to master
 2018-03-27 16:19:57 +02:00
Oleksii Kriuchykhin 1ed0b16d12 Rescale Linkedin buttons [SCI-2201] 2018-03-27 15:00:28 +02:00
Oleksii Kriuchykhin 31aed55ffc Disable turbolinks on tasks navigation [SCI-2251] 2018-03-26 17:55:51 +02:00
okriuchykhin 145f49de2d
Revert "Update turbolinks and fix repository table init [SCI-2251]" 2018-03-26 17:38:48 +02:00
okriuchykhin 784a4723cc
Merge pull request #1056 from okriuchykhin/ok_SCI_2251 
Update turbolinks and fix repository table init [SCI-2251]
 2018-03-26 14:23:30 +02:00
okriuchykhin fc06f8c60b
Merge pull request #1055 from okriuchykhin/ok_SCI_2250 
Skip asset if file is missing in protocol export [SCI-2250]
 2018-03-26 14:19:49 +02:00
Oleksii Kriuchykhin 5dc01a3d42 Fix code style [SCI-2251] 2018-03-26 13:59:45 +02:00
Oleksii Kriuchykhin 07070df1b4 Fix users profile edit form [SCI-2251] 2018-03-26 13:47:12 +02:00
okriuchykhin b1fcdb7474
Merge pull request #1057 from okriuchykhin/ok_SCI_2249 
Fix sample assign permissions [SCI-2249]
 2018-03-26 13:24:38 +02:00
Zmago Devetak 2310439088
Merge pull request #1045 from ZmagoD/zd_SCI_2197 
fixes import protocol bug for guest user [fixes SCI-2197]
 2018-03-26 13:08:01 +02:00
zmagod c61efb0624 rename before_acton hook 2018-03-26 13:07:00 +02:00
Oleksii Kriuchykhin aa69624f9f Fix sample assign permissions [SCI-2249] 2018-03-25 20:10:32 +02:00
Oleksii Kriuchykhin 83c7539156 Update turbolinks and fix repository table init [SCI-2251] 2018-03-25 19:44:58 +02:00
Oleksii Kriuchykhin ecd3c73772 Skip asset if file is missing in protocol export [SCI-2250] 2018-03-25 13:36:24 +02:00
mlorb 5589b27883 improve message for deleting sample/report items 2018-03-23 14:39:09 +01:00
okriuchykhin 2356b78044
Merge pull request #1042 from okriuchykhin/ok_SCI_2201 
Use larger LinkedIn sign-in button [SCI-2201]
 2018-03-19 16:23:22 +01:00
zmagod c46da5cc67 fixes import protocol bug for guest user [fixes SCI-2197] 2018-03-19 16:10:28 +01:00
Oleksii Kriuchykhin 37f675b32a Use larger LinkedIn sign-in button [SCI-2201] 2018-03-18 12:18:33 +01:00
zmagod 3131ed0948 adds permission check to archived project actions dropdown [fixes SCI-2194] 2018-03-16 17:30:49 +01:00
Oleksii Kriuchykhin 27a605d974 Fix failing test [SCI-2148][SCI-2149] 2018-03-16 11:05:38 +01:00
Oleksii Kriuchykhin f3385adb06 Merge branch 'master' into ok_SCI_2148 2018-03-16 10:21:02 +01:00
Zanz2 bf34d82791 refactored to PR 2018-03-13 17:42:26 +01:00
Oleksii Kriuchykhin 269f7d74fa Add explicit ordering to samples_tables [SCI-2148][SCI-2149] 2018-03-13 13:16:34 +01:00
Oleksii Kriuchykhin f5ecbecaf3 Fix bugs [SCI-1849] 2018-03-12 17:00:44 +01:00
Oleksii Kriuchykhin 60e3a836be Fix typo in regex [SCI-1849] 2018-03-11 22:11:12 +01:00
Zanz2 97c01c386b pushing fix 2018-03-10 22:48:25 +01:00
okriuchykhin e0834a57cf
Merge pull request #1027 from okriuchykhin/ok_SCI_2163 
Hide delete button for guest users in repository [SCI-2163]
 2018-03-09 17:16:58 +01:00
okriuchykhin 707d2a048f
Merge pull request #1024 from okriuchykhin/ok_SCI_2145 
Fix sample record creation [SCI-2145]
 2018-03-09 16:52:38 +01:00
okriuchykhin 7cbfa5936a
Merge pull request #1026 from okriuchykhin/ok_SCI_2148 
Add uniqueness validation for SamplesTable [SCI-2148][SCI-2149]
 2018-03-09 16:42:33 +01:00
Oleksii Kriuchykhin 853e1f7657 Fix nil case [SCI-2145] 2018-03-09 16:41:23 +01:00
Oleksii Kriuchykhin cd9260f439 Hide delete button for guest users in repository [SCI-2163] 2018-03-09 16:19:36 +01:00
Oleksii Kriuchykhin e4d974aa58 Add uniqueness validation for SamplesTable [SCI-2148][SCI-2149] 2018-03-09 15:34:06 +01:00
Oleksii Kriuchykhin 940469e41b Fix user management on project [SCI-2146] 2018-03-09 12:08:34 +01:00
Oleksii Kriuchykhin 804d313f90 Fix sample record creation [SCI-2145] 2018-03-09 11:52:28 +01:00
okriuchykhin 160935cde0
Merge pull request #1022 from okriuchykhin/ok_SCI_2136 
Fix manage repository permissions [SCI-2136]
 2018-03-09 10:15:24 +01:00
okriuchykhin d0d5481a29
Merge pull request #1021 from okriuchykhin/ok_SCI_2131 
Fix notification for user removal from a team [SCI-2131]
 2018-03-09 10:15:09 +01:00
okriuchykhin a306e65093
Merge pull request #1016 from okriuchykhin/ok_SCI_2130 
Fix edit project's users modal [SCI-2130]
 2018-03-07 14:04:26 +01:00
Oleksii Kriuchykhin bd9f5c1cda Fix manage repository permissions [SCI-2136] 2018-03-07 13:41:57 +01:00
Oleksii Kriuchykhin 1082f7f93c Fix notification for user removal from a team [SCI-2131] 2018-03-07 13:20:17 +01:00
okriuchykhin cae726f5c3
Merge pull request #1020 from okriuchykhin/ok_SCI_2055 
Fix invite users link on task card [SCI-2055]
 2018-03-07 09:41:23 +01:00