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

1333 commits

Author SHA1 Message Date
mlorb 2bce62cab8
Merge branch 'ux-release-1' into ml-sci-2405 2018-05-28 11:43:14 +02:00
mlorb f791234ec7 changes on Zmago's request 2018-05-28 11:36:37 +02:00
Zmago Devetak 792b134737
Merge pull request #1170 from ZmagoD/zd_SCI_2437 
adds flash_message div in manage repository column page
 2018-05-28 10:32:06 +02:00
mlorb 099cc29abb fix tests 2018-05-28 09:29:46 +02:00
Luka Murn b3ae1d8fa6 Remove some dead code, make sidebar toggle animated 2018-05-27 16:24:47 +02:00
Luka Murn 8b527d8a5b Restyle left side menu bar so it also works with lower heights 2018-05-27 15:24:49 +02:00
Luka Murn ce4883522a
Merge pull request #1171 from biosistemika/lm-change-login-btn-to-primary 
Change login button color to green
 2018-05-25 17:15:57 +02:00
mlorb f02363dfce fix error if user is not assigned to any teams 2018-05-25 17:14:22 +02:00
Luka Murn 23d8dc0b31
Change login button color to green 
What it says, change it to `btn-primary`.
 2018-05-25 17:05:00 +02:00
zmagod 6512970b9c adds flash_message div in manage repository column page 2018-05-25 14:36:15 +02:00
Luka Murn c76b926387
Delete _report_sidebar.html.erb 
This file is no longer needed from my research.
 2018-05-25 11:04:05 +02:00
Luka Murn fe3ddb7c65 Update code so it works 2018-05-25 08:50:27 +02:00
Zmago Devetak 280a926554
Merge pull request #1159 from ZmagoD/zd_SCI_2372 
adds data-hook in save_PDF_to_inventory modal [fixes SCI-2372]
 2018-05-24 16:05:56 +02:00
zmagod 06f1daf7a9 rename data-hook 2018-05-24 16:02:56 +02:00
Luka Murn c9f3de9f27 Improve toggle 2018-05-24 13:39:04 +02:00
mlorb c5e62207eb fix bug with protocol preview does not open on protocols containing files 2018-05-24 11:51:27 +02:00
mlorb 3368e3b963
Merge branch 'ux-release-1' into ml-sci-2271 2018-05-23 14:06:54 +02:00
mlorb 2bb2f8d193
Merge pull request #1161 from mlorb/ml-sci-2350 
move the open/close arrow to the bottom of left menu [SCI-2350]
 2018-05-23 14:01:12 +02:00
mlorb 5e689f6b4d fix toggle button on inventory page 2018-05-23 11:20:42 +02:00
mlorb 79f1a1c0ad fix padding and change label colors 2018-05-23 11:13:28 +02:00
mlorb 7b5ec4ae3f move the open/close arrow to the bottom of left menu 2018-05-23 09:44:46 +02:00
mlorb c4ecfc4d38 Change icons throughout sciNote - navigation, project, task cards 2018-05-22 16:55:58 +02:00
zmagod e97a98f189 adds data-hook in save_PDF_to_inventory modal [fixes SCI-2372] 2018-05-22 14:18:40 +02:00
mlorb c2cf52bb34 add another toggle button 2018-05-18 16:34:01 +02:00
mlorb 81392362ac Final button colour changes 2018-05-18 16:24:24 +02:00
mlorb 64cbddb9a0 UI/UX restyle - update colours for navigation 2018-05-18 10:41:32 +02:00
Zmago Devetak c3d247faae
Merge pull request #1128 from ZmagoD/zd_SCI_2331 
adds deface hook in support dropdown [fixes SCI-2331]
 2018-05-18 09:31:02 +02:00
zmagod e019767e90 refactor save_pdf_to_inventory_item service 2018-05-17 13:17:19 +02:00
zmagod b125863baf Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2371 2018-05-17 11:25:33 +02:00
zmagod ca0c8cbb71 fixes typos, fixes pdf rendering 2018-05-17 11:21:34 +02:00
Zmago Devetak 9d2303c777
Merge pull request #1115 from ZmagoD/zd_SCI_2321 
fixes images preview in repository/library [fixes SCI-2321]
 2018-05-16 12:05:33 +02:00
mlorb f59ea8c7a6
Merge pull request #1137 from mlorb/ml-sci-2336-v2 
UI/UX restyle - fixes throughout application - part 2 [SCI-2336]
 2018-05-16 11:30:54 +02:00
zmagod 4573655ec8 adds save PDF report to inventory feature [fixes SCI-2371] 2018-05-16 09:31:19 +02:00
Oleksii Kriuchykhin 0ca0884937 Fix pagination in global search inside repositories [SCI-2411] 2018-05-15 17:48:48 +02:00
mlorb cea7f5a3f7 some extra style unification 2018-05-15 17:10:31 +02:00
mlorb dfe65ccaed UI/UX restyle - fixes throughout application - part 2 2018-05-14 18:33:57 +02:00
mlorb f01cfc2968 fix hound 2018-05-14 12:08:45 +02:00
mlorb ed27a7a62a some extra restyling/unifying off app 2018-05-11 18:02:17 +02:00
mlorb b5649f0574
Merge branch 'ux-release-1' into ml-sci-2336-v1 2018-05-10 13:59:57 +02:00
zmagod e5c3fb6af2 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2321 2018-05-10 10:38:56 +02:00
zmagod 4bc01c44e9 add file name to loading image 2018-05-10 10:37:48 +02:00
Zmago Devetak 0a4deeaa35
Merge pull request #1112 from ZmagoD/zd_SCI_2261 
propagate assigned repository items in workflow [fixes SCI-2261]
 2018-05-10 09:57:49 +02:00
mlorb 7df40e56c7 UI/UX restyle - fixes throughout application part one 2018-05-08 16:33:42 +02:00
zmagod ed6098ece6 adds deface hook in support dropdown [fixes SCI-2331] 2018-05-07 13:09:33 +02:00
zmagod 60e5aa8716 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2142_v2 2018-05-03 14:49:06 +02:00
mlorb d2c0ae241e
Merge pull request #1121 from mlorb/ml-sci-2244 
Update buttons positions and wording throughout app [SCI-2244]
 2018-05-03 11:05:15 +02:00
mlorb ca022fead7 rename inventories buttons 2018-05-03 10:39:50 +02:00
zmagod 66b676b5ce Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2321 2018-04-26 17:04:36 +02:00
zmagod 0afe461962 fixes download link 2018-04-26 17:00:51 +02:00
mlorb f97477f3f0 some extra button styling 2018-04-26 15:19:05 +02:00
mlorb 763d934aa7 fix buttons again 2018-04-26 15:02:24 +02:00
zmagod e9642cadad Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2304 2018-04-26 14:26:30 +02:00
zmagod ca539cdce8 remove samples from search 2018-04-26 14:25:02 +02:00
zmagod 8dac887f10 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2261 2018-04-26 14:18:41 +02:00
zmagod 24acd5c779 fixes per @duco 's request 2018-04-26 14:13:46 +02:00
mlorb 88d5ba369d
Merge branch 'ux-release-1' into ml-sci-2244 2018-04-26 14:07:03 +02:00
Luka Murn cb6fe50832 Merge branch 'master' into ux-release-1 
Conflicts:
	app/assets/javascripts/repositories/index.js
 2018-04-26 11:38:54 +02:00
Zmago Devetak ac10f9fdb1
Merge pull request #1117 from ZmagoD/zd_SCI_2187 
remove task description info from canvas task card [fixes SCI-2187]
 2018-04-26 09:42:47 +02:00
mlorb 9e11f3b220 update buttons positions and wording throughout app 2018-04-25 13:57:12 +02:00
Luka Murn cd04596c62
Merge pull request #1111 from Ducz0r/lm-sci-2276-fix 
Update the code for repository table states so it (hopefully) causes less errors [SCI-2276]
 2018-04-25 12:37:27 +02:00
zmagod 4d6e995481 add dismiss buttons back 2018-04-25 10:43:16 +02:00
zmagod c026044322 fixes flash message [fixes SCI-2142] 2018-04-25 07:32:49 +02:00
zmagod 3a4df069d7 remove task description info from canvas task card [fixes SCI-2187] 2018-04-24 15:11:48 +02:00
zmagod 503ad1ba20 removes samples from views [fixes SCI-2304] 2018-04-24 08:26:55 +02:00
Zmago Devetak 096167c125
Merge pull request #1101 from ZmagoD/zd_SCI_2124 
adds new reports index page [fixes SCI-2124]
 2018-04-23 12:42:24 +02:00
zmagod 199a2a23bf fixes per @mlorb 's request 2018-04-23 12:26:21 +02:00
zmagod 824962c084 propagate assigned repository items in workflow [fixes SCI-2261] 2018-04-23 11:33:16 +02:00
Luka Murn d023db16af Update the destroy_column action so it properly updates all states 2018-04-20 12:31:22 +02:00
zmagod e96b690a5b removes reports link from secondary navigation, fix bug with turbolinks 2018-04-20 11:57:52 +02:00
Zmago Devetak 645e9a19d8
Merge pull request #1108 from ZmagoD/zd_SCI_2313 
fix file preview [SCI-2313]
 2018-04-20 10:38:23 +02:00
zmagod dafa29d4bf Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2124 2018-04-20 10:33:15 +02:00
Zmago Devetak e94f1ad6aa
Merge pull request #1109 from ZmagoD/zd_SCI_2297_v3 
add permission to column management [fixes SCI-2297]
 2018-04-20 09:57:30 +02:00
mlorb 3249d5db0d
Merge pull request #1100 from mlorb/ml-sci-2303 
Update reports show page to work with new navigation [SCI-2303]
 2018-04-20 09:50:35 +02:00
zmagod 078645332b add permission to column management [fixes SCI-2297] 2018-04-20 09:34:12 +02:00
zmagod 2a5c4daa9d fix file preview [SCI-2313] 2018-04-20 09:29:08 +02:00
Zmago Devetak 487fb1fb48
Merge pull request #1106 from ZmagoD/zd_SCI_2239_v2 
Zd sci 2239 v2
 2018-04-19 18:00:19 +02:00
Zmago Devetak 93fc1af12d
Merge pull request #1083 from ZmagoD/zd_SCI_2259 
set limit on maximum number of dropdown list items [fixes SCI-2259]
 2018-04-19 17:17:54 +02:00
Zmago Devetak 1290435372
Merge pull request #1086 from ZmagoD/zd_SCI_2207 
enables copying of repository items [fixes SCI-2207]
 2018-04-19 17:13:43 +02:00
mlorb d7eccac289
Merge pull request #1099 from mlorb/ml-sci-2167 
Remove breadcrumbs throughout application [SCI-2167]
 2018-04-19 16:11:37 +02:00
zmagod a948710576 fixes alert label [fixes SCI-2239] 2018-04-19 15:51:36 +02:00
mlorb c149b3cc2a refactoring 2018-04-19 15:12:26 +02:00
mlorb 56e00740c1 fix blocked buttons edit and eye icon 2018-04-19 14:40:46 +02:00
mlorb 58bdce557d
Merge pull request #1098 from mlorb/ml-sci-2306 
Fix project navigation to work with archived pages and… [SCI-2306]
 2018-04-19 14:17:32 +02:00
Zmago Devetak 540dff25e7
Merge pull request #1091 from ZmagoD/zd_SCI_2254 
adds correct preview images to files [fixes SCI-2254]
 2018-04-19 14:04:24 +02:00
zmagod 66cc76f640 add view label in locales 2018-04-19 12:49:32 +02:00
zmagod 9d282d1800 adds new reports index page [fixes SCI-2124] 2018-04-18 16:47:52 +02:00
mlorb cc34376253 update reports show page to work with new navigation 2018-04-18 14:40:53 +02:00
mlorb c08d72be36 remove breadcrumbs throughout application 2018-04-17 17:00:04 +02:00
mlorb 600ec99c82 fix project navigation to work with archived pages and correct current team 2018-04-17 13:52:43 +02:00
Zmago Devetak a0f549e935
Merge pull request #1093 from ZmagoD/zd_SCI_2296 
hides the create new inventory button for non admin users [fixes SCI-…
 2018-04-16 16:18:15 +02:00
zmagod bef166ff30 hides the create new inventory button for non admin users [fixes SCI-2296] 2018-04-13 13:39:58 +02:00
zmagod 0adc06b1a1 adds edit repository item permission to normal user [fixes SCI-2297] 2018-04-13 13:11:29 +02:00
Zmago Devetak 0815111cae
Merge pull request #1090 from ZmagoD/zd_SCI_2293 
fixes edin/destory button on repository page after redirected from co…
 2018-04-13 09:58:01 +02:00
zmagod 9812a9f160 adds correct preview images to files [fixes SCI-2254] 2018-04-13 09:43:14 +02:00
Zmago Devetak f5127bad99
Merge pull request #1088 from ZmagoD/zd_SCI_2290 
remove catched views [fixes SCI-2290]
 2018-04-13 08:24:28 +02:00
zmagod f2c314cc85 fix indentation 2018-04-12 17:12:45 +02:00
zmagod 3c5ce09bcd fixes edin/destory button on repository page after redirected from columns_management page [fixes SCI-2293] 2018-04-12 17:09:53 +02:00
zmagod d084998906 remove unneeded label in destroy repository record modal [fixes SCI-2292] 2018-04-12 15:00:41 +02:00
zmagod 5f5829bbe4 fix indentation 2018-04-12 14:49:51 +02:00
zmagod 123f3b796b remove catched views [fixes SCI-2290] 2018-04-12 14:48:14 +02:00