scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-18 15:13:21 +08:00
Code Issues Projects Releases Packages Wiki Activity
2294 commits 31 branches 181 tags 166 MiB
Commit graph

2294 commits

This branch
This branch
All branches
Author SHA1 Message Date
Oleksii Kriuchykhin
16a68bbaee Fix hound [SCI-1412] 2017-06-28 17:02:37 +02:00
Oleksii Kriuchykhin
e474cda03a Fix activities [SCI-1412] 2017-06-28 16:49:50 +02:00
Zmago Devetak
b830be3ec6 Merge pull request #719 from ZmagoD/zd_SCI_1395 
fixes experiment page [fixes SCI-1395]
 2017-06-28 15:58:00 +02:00
Zmago Devetak
502eb5c211 fixes tabs 2017-06-28 15:40:15 +02:00
zmagod
d8a3fdea20 fixes hound 2017-06-28 15:29:10 +02:00
zmagod
525c9770ac fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
Zmago Devetak
f7cef48f9f Merge pull request #709 from ZmagoD/zd_SCI_1388 
Upgrate to Rails 5.1
 2017-06-27 15:57:14 +02:00
zmagod
71aa05bb0e refactor 2017-06-27 14:58:49 +02:00
zmagod
819f47b450 setup sciNote for Rails 5.1 2017-06-23 15:19:08 +02:00
zmagod
1b21f073d7 Rails 5.1.1 2017-06-23 10:34:46 +02:00
zmagod
909a114418 Rails 5.0.0.rc2 2017-06-23 10:08:54 +02:00
zmagod
75507107fd migrate to 4.2.9 2017-06-23 08:50:12 +02:00
Zmago Devetak
f9e04e80b4 Merge pull request #705 from ZmagoD/zd_SCI_1393 
removes imported repository row if the row value is not valid [fixes …
 2017-06-22 17:50:02 +02:00
Zmago Devetak
cffac82e88 Merge pull request #704 from ZmagoD/zd_SCI_1392 
fixes bug with long text in parse records modal [fixes SCI-1392]
 2017-06-22 17:47:15 +02:00
Zmago Devetak
514c6c0d53 Merge pull request #706 from ZmagoD/zd_SCI_1385 
fixes row dupplication [fixes SCI-1385]
 2017-06-22 17:47:00 +02:00
zmagod
7367435c6d refactor 2017-06-22 17:32:12 +02:00
zmagod
2dd9b6ff19 fix update repository_row 2017-06-22 17:29:17 +02:00
zmagod
590135b9b3 refactor 2017-06-22 17:26:11 +02:00
Zmago Devetak
77a1848f6d Merge pull request #707 from ZmagoD/pdf_export 
fixes export pdf error on production
 2017-06-22 17:11:19 +02:00
zmagod
1690d8ebe3 removed reload on hide modal 2017-06-22 16:47:50 +02:00
zmagod
2b2f513366 fixes export pdf error on production 2017-06-22 16:40:50 +02:00
zmagod
e7328c2e20 fixes row dupplication [fixes SCI-1385] 2017-06-22 16:01:37 +02:00
mlorb
09b3bfb927 Merge pull request #703 from mlorb/ml_sci_1389 
Allign no. of pages and showing entries per page [SCI-1389]
 2017-06-22 15:53:48 +02:00
zmagod
703be13fb0 removes imported repository row if the row value is not valid [fixes SCI-1393] 2017-06-22 15:21:36 +02:00
zmagod
a2e1aa5b36 fixes bug with long text in parse records modal [fixes SCI-1392] 2017-06-22 14:43:01 +02:00
Mojca Lorber
1ba32e19cb allign no. of pages and showing entries per page 2017-06-22 14:23:03 +02:00
Zmago Devetak
b5649d3d5b Merge pull request #702 from ZmagoD/zd_SCI_1336 
Repositories - import functionality
 2017-06-21 17:44:40 +02:00
zmagod
28129ebb73 refactor 2017-06-21 17:39:20 +02:00
zmagod
bad52ceff1 Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1336 2017-06-21 15:56:07 +02:00
zmagod
18fd5b00ba fix hound 2017-06-21 15:01:55 +02:00
zmagod
f66fb49b56 adds import records to repositories [fixes SCI-1336] 2017-06-21 14:45:50 +02:00
mz3944
568e41f5fa Merge pull request #701 from mz3944/mz-SCI-1383 
Removed empty first column of repository export file [SCI-1383]
 2017-06-21 10:57:46 +02:00
Matej Zrimšek
d907819de5 Removed byebug calls. [SCI-1383] 2017-06-21 10:49:00 +02:00
mz3944
d19bfc8fd8 Merge pull request #700 from mz3944/mz-SCI-1386 
Fixed tooltip not showing on mouse over truncated cell text [SCI-1386]
 2017-06-21 10:40:37 +02:00
mz3944
2ad27289c9 Merge pull request #699 from mz3944/mz-SCI-1378 
Change repository icon on reports [SCI-1378]
 2017-06-21 10:40:16 +02:00
mz3944
4d5136270a Merge pull request #698 from mz3944/mz-SCI-1384 
Fixed AJAX error when deleting custom columns in repository table [SCI-1384]
 2017-06-21 10:39:53 +02:00
zmagod
f64e1ac713 fix locales 2017-06-21 09:31:39 +02:00
Matej Zrimšek
47407ef40c Removed empty first column of repository export file. [SCI-1383] 2017-06-20 18:40:41 +02:00
Matej Zrimšek
ce97d18e78 Fixed tooltip not showing on mouse over truncated cell text. [SCI-1386] 2017-06-20 17:51:51 +02:00
okriuchykhin
164d41c8c5 Merge pull request #697 from okriuchykhin/ok_SCI_1381 
Fix total number of records in task repository [SCI-1381]
 2017-06-20 16:39:42 +02:00
Matej Zrimšek
d49524a26f Set correct repository icon on reports and done some needed refactoring with this. [SCI-1378] 2017-06-20 16:10:50 +02:00
Oleksii Kriuchykhin
115ce91d8d Handle column mappings in task repository [SCI-1381] 2017-06-20 15:58:52 +02:00
Matej Zrimšek
6c7987681c Updating repository table state of every user belonging to the team of the repository, when custom column is removed or added. [SCI-1384] 2017-06-20 14:52:41 +02:00
Oleksii Kriuchykhin
9a9f8b9c41 Fix total number of records in task repository [SCI-1381] 2017-06-19 16:45:57 +02:00
mlorb
14429a270c Merge pull request #689 from mlorb/ml_sci_1354 
Truncate and display text in tooltip in custom repository fields [SCI-1354]
 2017-06-19 15:50:38 +02:00
Mojca Lorber
730c4738d5 fix tooltip in edit mode 2017-06-19 15:49:31 +02:00
Mojca Lorber
39dd6daabb small fixes 2017-06-19 15:30:38 +02:00
mlorb
122ac7971f Merge pull request #692 from mlorb/ml_sci_1348 
Fix cog position on repositories page [SCI-1348]
 2017-06-19 15:16:01 +02:00
mlorb
9a7669bf2a remove empty line 2017-06-19 15:15:27 +02:00
mlorb
ff02c45f5f Merge pull request #695 from mlorb/ml_sci_1353 
Retain the same word case in repositories dropdown [SCI-1353]
 2017-06-19 14:48:58 +02:00