scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-10-01 12:26:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
3709 commits 69 branches 179 tags 165 MiB
Commit graph

3709 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zmago Devetak ab48e4f527
Merge pull request #1072 from ZmagoD/zd_SCI_2239 
change export model wording [fixes SCI-2239]
 2018-04-04 15:40:18 +02:00
Zmago Devetak d1f3a65279
Merge pull request #1073 from ZmagoD/zd_SCI_2206 
add ID column to repository [fixes SCI-2206]
 2018-04-04 15:39:59 +02:00
zmagod 77f80271dd fixes per @mojca 's request 2018-04-04 14:52:59 +02:00
zmagod 6e255a4657 fixes failing specs 2018-04-04 14:44:32 +02:00
Oleksii Kriuchykhin 3b7977ee3b Merge latest changes from ux-release-1 [SCI-2217] 2018-04-04 14:20:34 +02:00
Oleksii Kriuchykhin 8ee98b7cf0 Update Capybara and dependencies [SCI-2217] 2018-04-04 14:13:37 +02:00
Zmago Devetak c71a8a7506
Merge pull request #1047 from ZmagoD/zd_SCI_2139_2121 
adds libraries/repositories to sidebar navigation and blank page for no libraries/repositories
 2018-04-04 13:58:24 +02:00
zmagod 5eb007f4d2 fixes per @mlorb 's request 2018-04-04 13:22:14 +02:00
zmagod 38b84edfb0 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121 2018-04-04 12:59:41 +02:00
zmagod e630d3113f add ID column to repository [fixes SCI-2206] 2018-04-04 11:55:11 +02:00
Zmago Devetak 685255afbc
Merge pull request #1065 from ZmagoD/zd_SCI_2222 
refactor smart annotation parser, adds repository item to smart annot…
 2018-04-04 11:07:29 +02:00
zmagod 8a156ad91e change method name 2018-04-03 13:05:25 +02:00
mlorb 11c0f5e5a1
Merge pull request #1067 from mlorb/ml-sci-2243 
Style Guide - refactor colors, typography and buttons [SCI-2243]
 2018-04-03 11:30:02 +02:00
zmagod 3d5137b56f change export model wording [fixes SCI-2239] 2018-04-03 11:22:23 +02:00
mlorb e5e92eb215 fix the rest of the constants 2018-04-03 10:28:39 +02:00
zmagod 7dfec94ffc remove samples from smart annotations 2018-04-03 09:43:12 +02:00
Oleksii Kriuchykhin 51860652c1 Refactor smart annotations modal [SCI-2223] 2018-04-02 20:38:56 +02:00
Oleksii Kriuchykhin b7c31d704f Merge branch 'zd_SCI_2222' of git://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_2222 2018-04-01 11:10:18 +02:00
mlorb 6a20c37449 fix travis againnnnn 2018-03-30 17:16:18 +02:00
Oleksii Kriuchykhin f656ad1561 Fix fa icons [SCI-2217] 2018-03-30 17:03:44 +02:00
mlorb 5f0d33d75e fix travis again 2018-03-30 16:47:23 +02:00
Zmago Devetak f5f6fa4a4f
Merge pull request #1066 from ZmagoD/zd_SCI_2235 
updated repository import modal html [fixes SCI-2235]
 2018-03-30 14:32:53 +02:00
okriuchykhin a6d45fea0a
Merge pull request #1059 from okriuchykhin/ok_SCI_2205 
Add repository name to record info modal [SCI-2205]
 2018-03-30 14:02:53 +02:00
mlorb 69b83a3f3d fix travis 2018-03-30 12:50:06 +02:00
Oleksii Kriuchykhin cc855cda86 Fix translations [SCI-2205] 2018-03-30 12:48:34 +02:00
okriuchykhin 5e0cf58bc5
Merge pull request #1058 from okriuchykhin/ok_SCI_2111 
Implement search in file repository cells and improve performance [SCI-2111]
 2018-03-30 12:39:47 +02:00
Oleksii Kriuchykhin cc5d8550b1 Refactor file preview modal [SCI-2217] 2018-03-30 11:50:28 +02:00
mlorb 10b5e1de84 refactor typography 2018-03-30 09:54:57 +02:00
zmagod 802e917e69 updated repository import modal html [fixes SCI-2235] 2018-03-30 09:47:27 +02:00
zmagod fd88104fe2 adds manage repository link in repository actions dropdown 2018-03-29 17:10:57 +02:00
zmagod 56b0900619 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2218_2219 2018-03-29 16:42:10 +02:00
zmagod 01a548e8b3 fix hound 2018-03-29 16:11:21 +02:00
zmagod 659a088058 refactor smart annotation parser, adds repository item to smart annotation parser [fixes SCI-2222] 2018-03-29 15:55:26 +02:00
mlorb 4bf9369bc5 refactor buttons 2018-03-29 13:58:14 +02:00
zmagod 7c1390ece2 implement sidebar toggle [fixes SCI-2232] 2018-03-28 14:12:11 +02:00
mlorb 22afa61b11 refactor colors 2018-03-28 13:54:01 +02:00
Oleksii Kriuchykhin fac5875cfd Add repository name to record info modal [SCI-2205] 2018-03-26 16:18:09 +02:00
Oleksii Kriuchykhin e42fc3117b Implement search in file repository cells and improve performance [SCI-2111] 2018-03-26 13:19:09 +02:00
zmagod 8f09e1f7a4 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121 2018-03-26 13:08:31 +02:00
mlorb b7a14215bc
Merge pull request #1050 from mlorb/ml-sci-2120-v2 
Refactor project navigation [SCI-2120]
 2018-03-26 12:56:19 +02:00
mlorb 0092be08cc refactor links 2018-03-26 12:11:59 +02:00
zmagod 3efe06a410 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121 2018-03-26 12:02:24 +02:00
zmagod 9e1f285c9e adds missing labels [fixes SCI-2219] 2018-03-26 11:28:14 +02:00
mlorb 3c09150c7b
Merge pull request #1054 from mlorb/ml-sci-2238 
Re-implement About sciNote modal [SCI-2238]
 2018-03-26 11:00:50 +02:00
mlorb 1797afa718
Merge branch 'ux-release-1' into ml-sci-2238 2018-03-26 10:44:43 +02:00
mlorb 70e0d8bd1d
Merge pull request #1052 from mlorb/ml-sci-2125 
Implement new Help dropup in navigation [SCI-2125]
 2018-03-26 09:22:39 +02:00
mlorb 83741358d1 fix locales 2018-03-23 16:19:06 +01:00
zmagod baf69461f5 adds edit/create modal and related actions 2018-03-23 16:00:33 +01:00
mlorb eee597b315 fix naming 2018-03-23 15:56:38 +01:00
mlorb 2e81359ebb re-implement About sciNote modal 2018-03-23 15:14:49 +01:00