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

4121 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Zmago Devetak 7fd3eec195
Merge pull request #1219 from ZmagoD/zd_SCI_2415 
move maximum file size limit to an ENV variable [fixes SCI-2415]
 2018-06-26 18:43:16 +02:00
Luka Murn 9637af51e6
Merge pull request #1207 from Ducz0r/lm-fix-sign-in-halt-layout 
Fix the sign in halt layout
 2018-06-26 17:51:18 +02:00
okriuchykhin d73b6146e8
Merge pull request #1221 from okriuchykhin/rails_update 
Upgrade Rails to version 5.1.6, Sprockets to 3.7.2
 2018-06-20 13:59:59 +02:00
Oleksii Kriuchykhin 78f44c48f8 Update bullet to version 5.7.5 2018-06-20 13:29:46 +02:00
Oleksii Kriuchykhin fb52236c14 Update Rubocop config file 2018-06-20 10:51:31 +02:00
Oleksii Kriuchykhin 6c914d2a73 Upgrade Rails to version 5.1.6, Sprockets to 3.7.2 2018-06-20 10:46:41 +02:00
mlorb 52f7d4075d
Merge pull request #1218 from mlorb/ml-sci-2406 
Fix firefox bug with browse buttons position [SCI-2406]
 2018-06-19 14:58:46 +02:00
okriuchykhin c9d32def4b
Merge pull request #1217 from okriuchykhin/ok_SCI_2505 
Add report elements to samples migration [SCI-2505]
 2018-06-19 14:42:37 +02:00
okriuchykhin c70b06cc52
Merge pull request #1220 from okriuchykhin/ok_SCI_2377 
Add extend for task child elements in reports [SCI-2377]
 2018-06-19 14:41:48 +02:00
Oleksii Kriuchykhin c0232d9eb2 Add extend for task child elements in reports [SCI-2377] 2018-06-19 14:34:36 +02:00
zmagod db1944cc90 move maximum file size limit to an ENV variable [fixes SCI-2415] 2018-06-19 14:15:14 +02:00
mlorb 0792ce46af fix firefox bug with browse buttons position 2018-06-19 13:39:03 +02:00
zmagod d68ae63c40 adds repository_items to smart annotation import 2018-06-19 11:58:22 +02:00
Zmago Devetak 16bce8de60
Merge pull request #1215 from ZmagoD/zd_SCI_2294 
removes duplicated keywords [fixes SCI-2294]
 2018-06-18 16:36:09 +02:00
Oleksii Kriuchykhin e6671cf015 Add report elements to samples migration [SCI-2505] 2018-06-18 15:24:02 +02:00
Zmago Devetak be0429a084
Merge pull request #1216 from ZmagoD/zd_SCI_2408_v2 
fix columns check [fixes SCI-2408]
 2018-06-18 15:06:12 +02:00
zmagod fbcc788597 fixes per @duczOr request 2018-06-18 14:00:49 +02:00
zmagod 5f1489a100 fix columns check [fixes SCI-2408] 2018-06-18 13:36:56 +02:00
Zmago Devetak cb7023c18e
Merge pull request #1214 from ZmagoD/zd_SCI_2410 
disable buttons on new/edit repository_item action [fixes SCI-2410]
 2018-06-18 13:03:11 +02:00
zmagod ed39294733 removes duplicated keywords [fixes SCI-2294] 2018-06-18 12:15:52 +02:00
Zmago Devetak bed83ddac0
Merge pull request #1213 from ZmagoD/zd_SCI_2398 
fixes import flash message [fixes SCI-2398]
 2018-06-18 11:52:22 +02:00
zmagod 2f141e9217 disable buttons on new/edit repository_item action [fixes SCI-2410] 2018-06-15 11:37:01 +02:00
zmagod 6a6ff534c0 fixes import flash message [fixes SCI-2398] 2018-06-15 11:12:11 +02:00
okriuchykhin 801d0a4a22
Merge pull request #1212 from okriuchykhin/ok_SCI_2377 
Add hooks to new report modal [SCI-2377]
 2018-06-14 15:48:43 +02:00
Zmago Devetak 1b245716fb
Merge pull request #1211 from ZmagoD/zd_SCI_2246_v2 
adds data-hook
 2018-06-14 15:33:40 +02:00
Oleksii Kriuchykhin 13c374d9b3 Add hooks to new report modal [SCI-2377] 2018-06-14 15:26:06 +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 bb62fc3715 adds data-hook 2018-06-14 12:42:49 +02:00
okriuchykhin 69c25f10e0
Merge pull request #1210 from okriuchykhin/ok_SCI_2376 
Remove result validation [SCI-2376]
 2018-06-13 16:09:41 +02:00
Oleksii Kriuchykhin e10ed86fa1 Remove result validation [SCI-2376] 2018-06-13 14:06:55 +02:00
zmagod f2c0b3aa92 removes samples, adds list_items 2018-06-13 12:45:48 +02:00
Zmago Devetak 29fe58de80
Merge pull request #1208 from ZmagoD/zd_SCI_2408 
adds an additional check if some other user has added/removed reposit…
 2018-06-13 11:30:43 +02:00
Zmago Devetak 2eb6613c6a
Merge pull request #1206 from ZmagoD/zd_SCI_2442 
make manage columns page more responsive [fixes SCI-2442]
 2018-06-13 11:14:35 +02:00
Zmago Devetak d457a66996
Merge pull request #1205 from ZmagoD/zd_SCI_2427 
enables tooltip on long column names [fixes SCI-2427]
 2018-06-13 11:14:29 +02:00
Zmago Devetak a8981d7039
Merge pull request #1201 from ZmagoD/zd_SCI_2421 
fixes bug with tinymce/at.js [fixes SCI-2421]
 2018-06-13 11:14:17 +02:00
Zmago Devetak 673410251d
Merge pull request #1197 from ZmagoD/zd_SCI_2384 
fixes repository table on sidebar toggle [fixes SCI-2384]
 2018-06-13 09:57:27 +02:00
Zmago Devetak 50c1a712d8
Merge pull request #1204 from ZmagoD/zd_SCI_2434 
fixes bug with repository items dropdown [fixes SCI-2434]
 2018-06-13 08:42:13 +02:00
Zmago Devetak 6cab1746cd
Merge pull request #1202 from ZmagoD/zd_SCI_2392 
prevents asset preview modal to close on click [fixes SCI-2392]
 2018-06-13 08:41:41 +02:00
Zmago Devetak e06ab02f68
Merge pull request #1192 from ZmagoD/zd_SCI_2435 
removes visibility toggle from Name column [fixes SCI-2435]
 2018-06-13 08:41:25 +02:00
Luka Murn 24b925c419 Merge branch 'Ducz0r-lm-sci-2431-fix' 2018-06-12 17:45:28 +02:00
Luka Murn 9a4fdd166e Merge branch 'lm-sci-2431-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-2431-fix 
Conflicts:
	app/views/projects/index.html.erb
 2018-06-12 17:44:42 +02:00
zmagod f8ac083d39 adds an additional check if some other user has added/removed repository columns [fixes SCI-2408] 2018-06-12 15:28:03 +02:00
Luka Murn a66d65fb28 Fix the sign in halt layout 
... so it's not dependant on common addon any more.
 2018-06-12 14:47:15 +02:00
zmagod 1cff4a5060 make manage columns page more responsive [fixes SCI-2442] 2018-06-12 10:22:48 +02:00
mlorb 8e90efa94b
Merge pull request #1203 from mlorb/ml-sci-2479 
Fix truncation bug [SCI-2479]
 2018-06-11 15:53:43 +02:00
zmagod a8971b4e20 enables tooltip on long column names [fixes SCI-2427] 2018-06-11 15:22:56 +02:00
Zmago Devetak a174e186bb
removes unneeded code 2018-06-11 15:00:13 +02:00