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

3717 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zmagod ca539cdce8 remove samples from search 2018-04-26 14:25:02 +02:00
zmagod de6c40a921 fix failing specs 2018-04-24 09:47:16 +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 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
Zmago Devetak 76c4202664
Merge pull request #1110 from ZmagoD/zd_SCI_2311 
fixes controller action in manage_columns
 2018-04-20 10:36:31 +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
zmagod 74f23ee461 fixes controller action in manage_columns 2018-04-20 09:53:15 +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
mlorb ab4a66756e
Merge pull request #1107 from mlorb/ml-sci-2314 
Fix file preview background [SCI-2314]
 2018-04-19 17:59:01 +02:00
Zmago Devetak 6b4d786acc
Merge pull request #1105 from ZmagoD/zd_SCI_2307 
change repository icon
 2018-04-19 17:58:48 +02:00
zmagod ec5a8336b9 fixes failing spec 2018-04-19 17:46:44 +02:00
mlorb 72c79013de fix file preview background 2018-04-19 17:40:24 +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 ea4d3f815b add back needed code 2018-04-19 16:51:37 +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
zmagod bb3e1b4dcf change repository icon 2018-04-19 15:39:24 +02:00
zmagod f555e8cea4 fix error message 2018-04-19 15:32:14 +02:00
mlorb 8753df7ce3
Merge pull request #1103 from mlorb/ml-sci-2309 
Fix top navigation style [SCI-2309]
 2018-04-19 15:16:27 +02:00
mlorb 50a4ae6163
Merge pull request #1104 from mlorb/ml-sci-2312 
Fix blocked buttons edit and eye icon [SCI-2312]
 2018-04-19 15:15:25 +02:00
mlorb c149b3cc2a refactoring 2018-04-19 15:12:26 +02:00
mlorb 5f93da27f2
Merge pull request #1102 from mlorb/ml-sci-2308 
Fix screen responsiveness [SCI-2308]
 2018-04-19 14:55:49 +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 ce52eb851b add validation to dropdown items 2018-04-19 14:02:42 +02:00
mlorb c1832969b4 fix top navigation style 2018-04-19 13:26:10 +02:00
zmagod f3af8f4524 switch current_team to repository.team 2018-04-19 13:04:16 +02:00
zmagod 66cc76f640 add view label in locales 2018-04-19 12:49:32 +02:00
zmagod c23eacfe13 fixes for_admin action/ test visible_by functlion 2018-04-19 12:41:00 +02:00
mlorb 4f0c2a8122 fix screen responsiveness 2018-04-18 17:06:47 +02:00
zmagod 9d282d1800 adds new reports index page [fixes SCI-2124] 2018-04-18 16:47:52 +02:00
mlorb 57f09029f5 return needed code 2018-04-18 16:22:36 +02:00
mlorb cc34376253 update reports show page to work with new navigation 2018-04-18 14:40:53 +02:00
Luka Murn 2290b75f8a
Merge pull request #1097 from biosistemika/lm-fix-production-compiling 
Change JS compressor from :uglifier to Uglifier.new(harmony: true)
 2018-04-17 17:46:01 +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
mlorb b13e997350
Merge pull request #1096 from mlorb/ml-sci-2125-v2 
Change links in help [SCI-2125]
 2018-04-17 10:46:43 +02:00
Luka Murn a633861e1f Change JS compressor from :uglifier to Uglifier.new(harmony: true) 
This should fix the command rails assets:precompile for production
environment.
 2018-04-17 09:05:19 +02:00
mlorb 04a20ab7ec change links 2018-04-16 17:05:22 +02:00
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