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
3831 commits 70 branches 179 tags 165 MiB
Commit graph

3831 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oleksii Kriuchykhin 8ec643c54b Move REPOSITORIES_LIMIT from constants to env variables [SCI-2301] 2018-05-09 18:03:16 +02:00
Zmago Devetak a6275062b7
Merge pull request #1126 from ZmagoD/zd_SCI_2344 
adds new string truncation method [fixes SCI-2344]
 2018-05-07 16:30:12 +02:00
Zmago Devetak ee307886df
Merge pull request #1124 from ZmagoD/zd_SCI_2347 
fix the missing icons on task card [fixes SCI-2347]
 2018-05-04 09:34:49 +02:00
zmagod fa30278153 change dropdown lenght 2018-05-03 16:25:59 +02:00
zmagod 0177dc811b fixes per @mojca 's request 2018-05-03 16:21:29 +02:00
Zmago Devetak 27b1251fdf
Merge pull request #1119 from ZmagoD/zd_SCI_2142_v2 
fixes flash message [fixes SCI-2142]
 2018-05-03 15:38:02 +02:00
zmagod abbc0995f2 fix css 2018-05-03 14:51:49 +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
Zmago Devetak d744f24b85
Merge pull request #1118 from ZmagoD/zd_SCI_2323 
sign_out user after 7 days [fixes SCI-2323]
 2018-05-03 14:36:44 +02:00
Zmago Devetak 19d5c687ef
remove unneeded :rememberable module 2018-05-03 14:35:59 +02:00
Zmago Devetak 9ce071693d
Merge pull request #1116 from ZmagoD/zd_SCI_2310 
parse smart annotations in repository export [fixes SCI-2310]
 2018-05-03 14:34:29 +02:00
zmagod 0b721d86b1 adds new string truncation method [fixes SCI-2344] 2018-05-03 14:24:23 +02:00
Zmago Devetak 4fe4fea4fc
Merge pull request #1122 from ZmagoD/zd_SCI_2339 
repository when sorting/searching bug fix [SCI-2339]
 2018-05-03 12:05:39 +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 f04677600b fix the missing icons on task card [fixes SCI-2347] 2018-05-03 10:05:40 +02:00
mlorb 491416a0f7 final fix tests 2018-05-03 09:22:01 +02:00
zmagod 0584453575 fixes per @okriuchykhin 's request 2018-04-26 17:18:03 +02:00
Zmago Devetak b277501e6d
Merge pull request #1114 from ZmagoD/zd_SCI_2304 
removes samples from views [fixes SCI-2304]
 2018-04-26 17:05:56 +02:00
mlorb d78bf166fe fix tests again 2018-04-26 16:39:07 +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
mlorb 88d5ba369d
Merge branch 'ux-release-1' into ml-sci-2244 2018-04-26 14:07:03 +02:00
mlorb 97d619ab51 fix tests again 2018-04-26 13:47:31 +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
zmagod 23f8f35a2c a shotgun surgery that fixes searching/filtering of repository_rows [fixes SCI-2339] 2018-04-26 11:05:02 +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
Zmago Devetak a6b2bb0228
Merge pull request #1120 from ZmagoD/zd_SCI_2338 
add permission check to repostiory show action [fixes SCI-2338]
 2018-04-26 09:41:43 +02:00
mlorb e077c7dbf6 fix tests 2018-04-25 14:34:23 +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 12365b3f0f add permission check to repostiory show action [fixes SCI-2338] 2018-04-25 11:56:30 +02:00
zmagod 589389fa8e fixex failing specs 2018-04-25 11:00:22 +02:00
Luka Murn bd6f97fabc Add initializer to include helpers in all assets (including .js) 2018-04-25 10:51:19 +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 796e7c9822 sign_out user after 7 days [fixes SCI-2323] 2018-04-24 15:42:31 +02:00
zmagod 3a4df069d7 remove task description info from canvas task card [fixes SCI-2187] 2018-04-24 15:11:48 +02:00
zmagod 7d26ce561c parse smart annotations in repository export [fixes SCI-2310] 2018-04-24 14:53:49 +02:00
Zmago Devetak 1e4a975304
Merge pull request #1113 from ZmagoD/zd_SCI_2307_v2 
rename smart annotations icons [fixes SCI-2307]
 2018-04-24 10:11:30 +02:00
zmagod 3431ab2da3 fix failing spec 2018-04-24 09:53:26 +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
zmagod f56f457c78 fixes failing specs 2018-04-23 13:34:56 +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 efd1e470f6 rename smart annotations icons [fixes SCI-2307] 2018-04-23 12:38:54 +02:00
zmagod 199a2a23bf fixes per @mlorb 's request 2018-04-23 12:26:21 +02:00
Luka Murn c0da83c5de Add some additional nil guards 2018-04-20 12:31:22 +02:00