scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 23:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
3660 commits 70 branches 179 tags 165 MiB
Commit graph

3660 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zmago Devetak f90589d714
Merge pull request #1095 from ZmagoD/zd_SCI_2300 
fixes archive button [fixes SCI-2300]
 2018-04-16 16:19:21 +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
Zmago Devetak 8803a7ca15
Merge pull request #1092 from ZmagoD/zd_SCI_2297 
adds edit repository item permission to normal user [fixes SCI-2297]
 2018-04-16 16:18:05 +02:00
mlorb aa2a347f1e
Merge pull request #1094 from mlorb/ml-sci-2075 
implement file column type when editing & creating new rows... [SCI-2075]
 2018-04-16 14:21:29 +02:00
mlorb dceef349a4 fix bug and some refectoring 2018-04-16 14:10:49 +02:00
zmagod a2d8285f35 fixes archive button but [fixes SCI-2300] 2018-04-16 09:22:10 +02:00
mlorb 2627efe402 implement file column type when editing & creating new rows in inventories DataTables 2018-04-13 17:21:17 +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
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
Zmago Devetak d466fdf8e8
Merge pull request #1089 from ZmagoD/zd_SCI_2292 
remove unneeded label in destroy repository record modal [fixes SCI-2…
 2018-04-12 16:58:28 +02:00
Zmago Devetak 09e5579f0f
Merge pull request #1087 from ZmagoD/zd_SCI_2240 
rename Repository/Library => Inventory [fixes SCI-2240]
 2018-04-12 16:58:08 +02:00
Zmago Devetak 9d58292dcf
fix 2018-04-12 16:44:38 +02:00
Zmago Devetak f83390e5ad
fix 2018-04-12 16:20:05 +02:00
Luka Murn 8c7e272d89
Fix breaking tests introduced with PR #930 2018-04-12 15:24:33 +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
Luka Murn fa603b54b8
Merge pull request #930 from okriuchykhin/ok_SCI_1860 
Remove tutorial [SCI-1860]
 2018-04-12 14:46:20 +02:00
Luka Murn 09c60d2468 Fixes per @Ducz0r's request 2018-04-12 14:38:22 +02:00
Zmago Devetak de17c26b2b
Merge pull request #1085 from ZmagoD/zd_SCI_2110 
adds asset preview link to repository row modal and to table row item…
 2018-04-12 14:13:35 +02:00
zmagod 309bd04e61 rename Repository/Library => Inventory [fixes SCI-2240] 2018-04-12 14:11:26 +02:00
zmagod b4deb232c0 rename variable: not_in_repository => display_image_tag 2018-04-12 13:40:17 +02:00
Luka Murn 9bf8b5d864 Merge branch 'ok_SCI_1860' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_1860 
Conflicts:
	Makefile
	app/assets/javascripts/projects/index.js.erb
	app/assets/stylesheets/themes/scinote.scss
	config/locales/en.yml
 2018-04-12 13:16:46 +02:00
zmagod 233e73c709 adds asset preview link to repository row modal and to table row item [fixes SCI-2110] 2018-04-10 17:06:53 +02:00
Zmago Devetak eca69cfc75
Merge pull request #1080 from ZmagoD/zd_SCI_2076 
add asset field preview/sort/search in repository table [fixes SCI-2076]
 2018-04-09 14:29:45 +02:00
mlorb a10f671184
Merge pull request #1081 from mlorb/ml-sci-2123 
Refactor settings into the new navigation bar [SCI-2123]
 2018-04-09 13:21:16 +02:00
mlorb 8a35ce5c58 add locales 2018-04-09 10:53:03 +02:00
mlorb 80fe1dd73b fix travis 2018-04-06 17:16:04 +02:00
Zmago Devetak bdb6554870
Merge pull request #1049 from ZmagoD/zd_SCI_2218_2219 
adds manage columns page
 2018-04-06 17:06:28 +02:00
zmagod 58b6eb908e fix duplications 2018-04-06 17:02:10 +02:00
mlorb 0c851f227c remove unused locals 2018-04-06 15:00:19 +02:00
mlorb 70dfe66b2d refactoring 2018-04-06 14:20:40 +02:00
Zmago Devetak 6d68c5b9f4
Merge pull request #1070 from okriuchykhin/ok_SCI_2223 
Refactor smart annotations modal [SCI-2223]
 2018-04-06 13:26:26 +02:00
zmagod cf7761daaa Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into ok_SCI_2223 2018-04-06 12:56:39 +02:00
zmagod b51ad84ee5 add asset field preview/sort/search in repository table [fixes SCI-2076] 2018-04-06 12:03:39 +02:00
mlorb b8e91e91a1 refactor settings into the new navigation bar 2018-04-05 16:30:02 +02:00
zmagod 030ce271be fixes name validations 2018-04-05 10:47:47 +02:00
zmagod 515c95061c fixes delete column action 2018-04-05 09:56:09 +02:00
zmagod afc2a35557 move import export to dropdown 2018-04-05 09:32:34 +02:00
zmagod a8a19df06d Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2218_2219 2018-04-05 08:51:58 +02:00
zmagod d47337fbf3 remove destroy column modal 2018-04-05 08:51:21 +02:00
okriuchykhin e608d629c7
Merge pull request #1068 from okriuchykhin/ok_SCI_2217 
Refactor file preview modal [SCI-2217]
 2018-04-05 00:18:43 +02:00
Oleksii Kriuchykhin 9720063fb3 Fix tests [SCI-2217] 2018-04-05 00:06:11 +02:00
mlorb ab58354cbe
Merge pull request #1076 from mlorb/ml-sci-2220 
fix merge bananas
 2018-04-04 16:59:19 +02:00
zmagod 525a1c15ca fixes hound 2018-04-04 16:40:07 +02:00
mlorb 58433f4218 fix merge bananas 2018-04-04 16:36:26 +02:00