zmagod
|
a4aa933151
|
refactor smart annotation parser helper
|
2017-01-11 10:34:14 +01:00 |
|
zmagod
|
a903772de8
|
style dropdown
|
2017-01-10 17:05:32 +01:00 |
|
Mojca Lorber
|
510731bd4e
|
change color of clickable nameswhen row is selected in datatables
|
2017-01-09 15:51:21 +01:00 |
|
Luka Murn
|
0ee5b98977
|
Refactor code a bit, add dismiss button to header
|
2017-01-07 09:59:52 +01:00 |
|
Luka Murn
|
b614ce714b
|
Restyle atwho dropdown
|
2017-01-05 14:06:48 +01:00 |
|
Luka Murn
|
e12907c9b9
|
Remove original atwho css, apply our own
|
2017-01-05 10:52:28 +01:00 |
|
mlorb
|
59751ec41e
|
Merge pull request #373 from mlorb/ml_sci_709
Add Protocol Preview to Protocol repository [SCI-709]
|
2017-01-04 11:28:55 +01:00 |
|
Luka Murn
|
3bee9d2e12
|
Save an (yet unworking) version of user smart annotations
Used so other devs can start working on smart annotations.
|
2017-01-04 10:54:02 +01:00 |
|
Luka Murn
|
23e60e0d01
|
Add Gems for smart annotations (atwho)
|
2017-01-04 10:51:55 +01:00 |
|
Mojca Lorber
|
fe37ac3b6d
|
fix hound 2
|
2017-01-03 17:46:30 +01:00 |
|
Mojca Lorber
|
0011474ea3
|
fix hound
|
2017-01-03 17:43:55 +01:00 |
|
Mojca Lorber
|
c476faca30
|
fix hound
|
2017-01-03 11:04:09 +01:00 |
|
Oleksii Kriuchykhin
|
c77c83752e
|
Remove unused css class link-look [SCI-819]
|
2016-12-30 15:50:43 +01:00 |
|
Luka Murn
|
4b50c73474
|
Merge pull request #363 from Ducz0r/lm-sci-546-fix
Restyle step table display in reports [SCI-546]
|
2016-12-23 12:57:54 +01:00 |
|
Mojca Lorber
|
40e3240a99
|
add content to preview modal
|
2016-12-22 11:43:11 +01:00 |
|
Oleksii Kriuchykhin
|
cbef971d85
|
Fix timeouts when fetching images from S3 [SCI-694]
|
2016-12-20 15:36:07 +01:00 |
|
Oleksii Kriuchykhin
|
d2b76d8385
|
Improved image preview modal [SCI-694]
|
2016-12-19 17:36:18 +01:00 |
|
Luka Murn
|
a48eaf662e
|
Restyle step table display in reports so
Closes SCI-546.
|
2016-12-19 15:09:49 +01:00 |
|
Oleksii Kriuchykhin
|
b537feb8a0
|
Added large preview [SCI-694]
|
2016-12-16 17:07:08 +01:00 |
|
Oleksii Kriuchykhin
|
0541253ffa
|
Added modal for images preview [SCI-694]
|
2016-12-16 15:53:16 +01:00 |
|
Zmago Devetak
|
c8631077df
|
Merge pull request #361 from biosistemika/improved-sample-table
Improved sample table
|
2016-12-16 15:37:54 +01:00 |
|
zmagod
|
25671c744a
|
disables sorting and columns dropdown when editing or adding new sampe [fixes SCI-804]
|
2016-12-16 09:50:45 +01:00 |
|
zmagod
|
9083f84396
|
Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_SCI_789
|
2016-12-15 11:03:19 +01:00 |
|
zmagod
|
b003d192c3
|
fixed edit mode
|
2016-12-15 09:54:38 +01:00 |
|
zmagod
|
6d2fb3b02c
|
Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_SCI_790
|
2016-12-14 17:05:00 +01:00 |
|
zmagod
|
1ff98bb6df
|
adds tooltip to samples dropdown and column names
|
2016-12-14 13:36:10 +01:00 |
|
zmagod
|
d9971b4502
|
adds error message in samples table dropdown [fixes SCI-789]
|
2016-12-13 17:08:19 +01:00 |
|
zmagod
|
c960230bf0
|
fixes dropdown height bug [fixes SCI-787]
|
2016-12-13 11:35:50 +01:00 |
|
zmagod
|
8dd8a7e7cd
|
Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_improved_samples_table_SCI_774_775_778_777
|
2016-12-12 15:52:25 +01:00 |
|
zmagod
|
d9025a9601
|
changes create/edit mode buttons [fixes SCI-777]
|
2016-12-12 14:42:06 +01:00 |
|
zmagod
|
8bb452e4f7
|
trim long names [fixes SCI-774] adds secondary navigation and sidebar [fixes SCI-775]
|
2016-12-12 10:30:03 +01:00 |
|
Luka Murn
|
d30a9780f4
|
Merge branch 'lm-sci-711-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-711-fix
Conflicts:
app/assets/javascripts/samples/sample_datatable.js
|
2016-12-12 09:57:37 +01:00 |
|
Matej Zrimšek
|
0b12c87b09
|
Restyled new sample type and group dropdown links. Some minor refactoring of related code and docs. [Fixes SCI-701]
|
2016-12-09 16:44:50 +01:00 |
|
zmagod
|
8b0dab624d
|
clear unneeded css, change processing image [fixes SCI-758]
|
2016-12-09 14:24:20 +01:00 |
|
Luka Murn
|
54ebdbb06c
|
Update edit mode JS & CSS
|
2016-12-09 13:18:59 +01:00 |
|
Luka Murn
|
da630ac2cb
|
Make edit, delete buttons clickable & hide them if neccesary
|
2016-12-09 13:18:59 +01:00 |
|
okriuchykhin
|
cb2abfa7a9
|
Merge pull request #325 from okriuchykhin/ok_SCI_712
Added form for adding new columns to samples table into dropdown [SCI-712]
|
2016-12-06 15:00:01 +01:00 |
|
Zmago Devetak
|
49f9e64171
|
Merge pull request #333 from ZmagoD/zd_SCI_700
Managing sample groups tab
|
2016-12-06 14:51:09 +01:00 |
|
zmagod
|
dd85b128d2
|
fixed glyphicon-ok position
|
2016-12-06 14:47:16 +01:00 |
|
Oleksii Kriuchykhin
|
f6dd64772a
|
Add columns to samples table without page reload [SCI-712]
|
2016-12-06 13:22:26 +01:00 |
|
Oleksii Kriuchykhin
|
22dabd2177
|
Added form for adding new columns to samples table into dropdown [SCI-712]
|
2016-12-06 13:17:05 +01:00 |
|
zmagod
|
787b8b1600
|
fixed new sample type/group form
|
2016-12-06 12:01:02 +01:00 |
|
Zmago Devetak
|
91f29745c4
|
Merge pull request #314 from ZmagoD/zd_SCI_643
adds autolink
|
2016-12-05 10:47:23 +01:00 |
|
zmagod
|
83aae59eed
|
adds sample groups index page
|
2016-12-02 09:33:09 +01:00 |
|
Zmago Devetak
|
33adb58950
|
Merge pull request #328 from ZmagoD/zd_SCI_699
Managing sample types tab
|
2016-11-30 16:14:13 +01:00 |
|
Oleksii Kriuchykhin
|
2a27c8e6b3
|
Fix hound warning [SCI-695]
|
2016-11-30 11:52:07 +01:00 |
|
Oleksii Kriuchykhin
|
f51f33ec25
|
Added sorting functionality to samples colunmns dropdown [SCI-695]
|
2016-11-30 11:42:05 +01:00 |
|
zmagod
|
4e4a48620c
|
adds validation to input fields
|
2016-11-29 18:08:29 +01:00 |
|
zmagod
|
12848f15fa
|
adds sample_type index view with all crud actions
|
2016-11-29 17:15:54 +01:00 |
|
Luka Murn
|
90816ae1fa
|
Just pleasing the Hound
|
2016-11-28 17:16:39 +01:00 |
|
Luka Murn
|
073f30dcc5
|
Fix task comments not properly showing in reports
Closes SCI-733.
|
2016-11-28 17:14:27 +01:00 |
|
Zmago Devetak
|
1e870a6e7c
|
Merge pull request #320 from ZmagoD/zd_SCI_698
adds new samples columns dropdown [fixes SCI-698]
|
2016-11-28 16:30:16 +01:00 |
|
zmagod
|
72d1dfb15e
|
cleanup sample_datatable.js
|
2016-11-28 16:28:22 +01:00 |
|
zmagod
|
9d91d2ce28
|
adds new samples columns dropdown [fixes SCI-698]
|
2016-11-25 17:29:30 +01:00 |
|
Luka Murn
|
b1b095910c
|
Merge pull request #309 from Ducz0r/lm-remove-unused-files
Brace for impact...
|
2016-11-25 10:00:29 +01:00 |
|
zmagod
|
fafecce264
|
adds autolink to comments, tast desc., step desc., experiment desc., samples table 'only custom fields', checklists [fixes SCI-643]
|
2016-11-23 14:18:50 +01:00 |
|
Mojca Lorber
|
91b0f4907c
|
fix hound
|
2016-11-18 12:54:32 +01:00 |
|
Mojca Lorber
|
086f937fbb
|
fix empty space and blockquote padding - rich text editing
|
2016-11-18 12:43:57 +01:00 |
|
Luka Murn
|
f5795f5516
|
Remove unused assets & helpers
|
2016-11-18 11:30:03 +01:00 |
|
Luka Murn
|
26d04b1f3c
|
Merge branch 'rich-text-formatting' into 'master'
Conflicts:
Gemfile.lock
app/assets/stylesheets/themes/scinote.scss
|
2016-11-17 16:39:33 +01:00 |
|
Matej Zrimšek
|
0d133ff32e
|
Refactoring and added back buttons for tutorial steps 1-5.
|
2016-11-17 14:46:04 +01:00 |
|
Luka Murn
|
d1701bd7ae
|
Merge pull request #276 from Ducz0r/lm-sci-637
Automatically resize textarea elements [SCI-637]
|
2016-11-17 09:58:36 +01:00 |
|
Mojca Lorber
|
7002fc3f2f
|
fix hound
|
2016-11-14 15:10:37 +01:00 |
|
Mojca Lorber
|
615cd3c278
|
profile changes for gamification
|
2016-11-14 15:04:18 +01:00 |
|
mlorb
|
b0b2484fdf
|
Merge pull request #279 from mlorb/ml_sci_638_vol2
Fix validation problems for rich text fields [SCI-638]
|
2016-11-11 12:37:02 +01:00 |
|
Mojca Lorber
|
4b7fa440f6
|
fix hound
|
2016-11-11 12:03:01 +01:00 |
|
Luka Murn
|
5727158495
|
Hotfix to nicely render comments form on Firefox as well
|
2016-11-11 09:47:37 +01:00 |
|
Luka Murn
|
b42922d32c
|
Add autosize functionality to all textareas
Closes SCI-637
|
2016-11-11 09:09:41 +01:00 |
|
Luka Murn
|
acd8ce8932
|
Merge pull request #270 from Ducz0r/lm-sci-644
Convert all large text input fields into text areas (10000 characters)
|
2016-11-11 09:07:25 +01:00 |
|
Mojca Lorber
|
1facd2cefe
|
fix validation problems
|
2016-11-10 17:20:17 +01:00 |
|
Mojca Lorber
|
ab0879e8d6
|
Integrate library with default settings
|
2016-11-09 13:09:53 +01:00 |
|
Luka Murn
|
d44a757b25
|
Add textareas to checklist name & items
Closes SCI-644
|
2016-11-08 11:50:29 +01:00 |
|
Luka Murn
|
55d8fea359
|
Make all comment edit fields textareas
|
2016-11-08 11:29:55 +01:00 |
|
Luka Murn
|
6fe0d6b3df
|
A working invite modal!
|
2016-11-07 09:43:10 +01:00 |
|
Luka Murn
|
ccf8932611
|
Add first version of invite users modal
|
2016-11-07 09:43:09 +01:00 |
|
Mojca Lorber
|
44b51d087a
|
merging
|
2016-11-02 14:06:20 +01:00 |
|
Oleksii Kriuchykhin
|
d28edfb488
|
Added statistics block in users profile [SCI-566]
|
2016-10-27 13:44:27 +02:00 |
|
Mojca Lorber
|
888aa31aed
|
fix hound
|
2016-10-27 11:18:11 +02:00 |
|
Mojca Lorber
|
5719d4c61f
|
show edit avatar on mouse hover, add background and center image
|
2016-10-27 11:09:30 +02:00 |
|
Mojca Lorber
|
8309df0aaf
|
fix hound
|
2016-10-26 13:51:05 +02:00 |
|
Mojca Lorber
|
878952f072
|
change edit avatar in profile
|
2016-10-26 13:41:17 +02:00 |
|
Zmago Devetak
|
12c77df883
|
Merge pull request #237 from ZmagoD/zd_SCI_593_v2
Styled global team switch and search [fixes SCI-593]
|
2016-10-21 16:28:50 +02:00 |
|
zmagod
|
9a4603dd7d
|
removed unneeded css
|
2016-10-21 16:27:53 +02:00 |
|
zmagod
|
49d3879642
|
fixes padding on mobile, added separator on team switch dropdown, focus search input
|
2016-10-21 11:46:59 +02:00 |
|
zmagod
|
c642e208dd
|
styled global team switch and search [fixes SCI-593]
|
2016-10-21 09:33:18 +02:00 |
|
zmagod
|
9214adc591
|
fixed team name position
|
2016-10-20 15:35:09 +02:00 |
|
zmagod
|
f9fb4d8bd6
|
move tooltip to the right [fixes SCI-591]
|
2016-10-20 14:34:45 +02:00 |
|
zmagod
|
76f6e30078
|
fixes word-wrap on mozilla
|
2016-10-17 15:36:33 +02:00 |
|
zmagod
|
8a6899aeea
|
restyled team switch dropdown
|
2016-10-17 15:21:19 +02:00 |
|
zmagod
|
8cd86a50bb
|
styled dropdown
|
2016-10-17 15:10:26 +02:00 |
|
Matej Zrimšek
|
a31753ea39
|
Added additional color constants. Fix Ruby color constants RGB format so no errors occur for external Gems.
|
2016-10-17 11:57:47 +02:00 |
|
Matej Zrimšek
|
f2cd9890dd
|
Replaced hardcoded infinity values with constants. Added quotation marks to Ruby string constants in JS.
|
2016-10-17 11:57:47 +02:00 |
|
Matej Zrimšek
|
a6a2a237aa
|
Removed unneeded ERB tags, which caused error. Minor refactoring.
|
2016-10-17 11:57:47 +02:00 |
|
mlorb
|
cbc14d9d50
|
Merge pull request #211 from mlorb/ml_sci_491
change 80s glow [SCI-491]
|
2016-10-13 10:13:14 +02:00 |
|
Mojca Lorber
|
c51aedb178
|
change thickness of shadow
|
2016-10-13 10:11:32 +02:00 |
|
Mojca Lorber
|
8f783f87f7
|
fixes hound
|
2016-10-12 15:32:40 +02:00 |
|
Mojca Lorber
|
4f1cbad7da
|
adding update notifications in settings
|
2016-10-12 10:42:07 +02:00 |
|
Mojca Lorber
|
b1b23b8f41
|
fixes hound
|
2016-10-11 10:39:00 +02:00 |
|
Mojca Lorber
|
63ec63047d
|
change 80s glow
|
2016-10-11 10:33:26 +02:00 |
|
zmagod
|
fe7b367eae
|
fixed hound
|
2016-10-07 15:25:53 +02:00 |
|
zmagod
|
130db6a2c3
|
fixed assignment icon [fixes SCI-561]
|
2016-10-07 12:27:44 +02:00 |
|
zmagod
|
0bdf77562d
|
add word-wrap to notrification index page [fixes SCI-556]
|
2016-10-06 13:49:24 +02:00 |
|
zmagod
|
de00a19dd9
|
fixes styling in settings preferences [SCI-553]
|
2016-10-06 13:22:44 +02:00 |
|
Luka Murn
|
5c80c8a817
|
Add "no notifications" to dropdown & notifications index page
|
2016-10-05 16:58:21 +02:00 |
|
Luka Murn
|
877574e853
|
Add link to settings from both notification lists
|
2016-10-05 16:26:26 +02:00 |
|
Oleksii Kriuchykhin
|
4e2ad1d5e6
|
Fix the issues after code review [SCI-442]
|
2016-10-05 15:54:31 +02:00 |
|
Oleksii Kriuchykhin
|
d2b48e94bd
|
CSS color fix [SCI-442]
|
2016-10-05 15:51:11 +02:00 |
|
Oleksii Kriuchykhin
|
246dae4f46
|
Code style improvements according to hound [SCI-442]
|
2016-10-05 15:51:11 +02:00 |
|
Oleksii Kriuchykhin
|
8907e54b49
|
Global notifications index page added [SCI-442]
|
2016-10-05 15:51:11 +02:00 |
|
Oleksii Kriuchykhin
|
8b5b0723d1
|
Initial code commit
|
2016-10-05 15:51:11 +02:00 |
|
Zmago Devetak
|
eea310514a
|
Merge pull request #194 from ZmagoD/zd_SCI_531_533
Notification style fixes
|
2016-10-05 15:27:36 +02:00 |
|
Zmago Devetak
|
71ad5bf034
|
Merge pull request #190 from ZmagoD/zd_SCI_529
Prepare settings screen for notifications
|
2016-10-05 14:54:47 +02:00 |
|
zmagod
|
dfcbebbf4f
|
cleaned up bootstrap extension
|
2016-10-05 14:49:23 +02:00 |
|
zmagod
|
9c7a690944
|
fixed type, fixed settings controller, fixes setting view on mobile devices
|
2016-10-05 14:33:22 +02:00 |
|
zmagod
|
cba4318185
|
add word wrapping to notifications dropdown [fixes SCI-532]
|
2016-10-05 13:22:33 +02:00 |
|
zmagod
|
5bf278298b
|
fixed navbar on sceens smaller than 1000px
|
2016-10-05 12:22:27 +02:00 |
|
zmagod
|
f9d956bbca
|
fix notifications number on [fixes SCI-531]
|
2016-10-05 11:50:57 +02:00 |
|
zmagod
|
c4f28c3649
|
made notification images bigger [fixes SCI-533]
|
2016-10-05 10:16:51 +02:00 |
|
zmagod
|
6229e6a3a1
|
styled notification settings button [fixes SCI-529]
|
2016-10-04 16:12:56 +02:00 |
|
zmagod
|
a68e7abc57
|
first run notification settings
|
2016-10-04 15:52:48 +02:00 |
|
Luka Murn
|
61cb9651c7
|
Merge pull request #188 from biosistemika/global-notifications
Global notifications
|
2016-10-04 08:30:50 +02:00 |
|
mlorb
|
00b0f6ab07
|
Merge pull request #184 from mlorb/ml_sci_472
Protocol steps/results - change title for comment section, remove info tab [SCI-472]
|
2016-10-03 17:20:45 +02:00 |
|
zmagod
|
0d23f05698
|
Merge branch 'global-notifications' of https://github.com/biosistemika/scinote-web into zd_SCI_440
|
2016-10-03 16:14:22 +02:00 |
|
zmagod
|
ea17182372
|
generate notifications [fixes SCI-440]
|
2016-10-03 11:37:29 +02:00 |
|
zmagod
|
b9bc2f17c8
|
fixing hound
|
2016-10-03 08:27:13 +02:00 |
|
zmagod
|
2ee02ec472
|
mark all seen notifications
|
2016-10-03 08:20:23 +02:00 |
|
Luka Murn
|
49c5474219
|
Merge pull request #178 from mz3944/mz_help_button_SCI_13_v2
Fixed wrong CSS formatting and added release notes link to help link.
|
2016-09-30 08:27:57 +02:00 |
|
Luka Murn
|
e32e0a232c
|
Merge pull request #177 from okriuchykhin/ok_SCI-480
Fixes issue with scrollbar on sidebar [SCI-480]
|
2016-09-30 08:25:54 +02:00 |
|
Luka Murn
|
12c9f9a42f
|
Merge pull request #175 from okriuchykhin/ok_SCI-423
Fix issue with spinner in avatar upload [SCI-423]
|
2016-09-30 08:25:15 +02:00 |
|
Mojca Lorber
|
35477b1005
|
Remove Info tab and change comment title on results view
|
2016-09-29 16:43:19 +02:00 |
|
zmagod
|
60a503f115
|
added assignment image
|
2016-09-29 16:05:43 +02:00 |
|
zmagod
|
e1a1b93d44
|
fixed migrations
|
2016-09-29 14:49:58 +02:00 |
|
Mojca Lorber
|
c9fbf845f1
|
Remove Info tab and change comment title
|
2016-09-29 14:37:29 +02:00 |
|
Matej Zrimšek
|
a6324d61c5
|
Fixed wrong CSS formatting, added release notes link to help links, and links now open in new tab.
|
2016-09-29 14:27:26 +02:00 |
|
Oleksii Kriuchykhin
|
f9e5d204bb
|
Fixes issue with scrollbar on sidebar [SCI-480]
|
2016-09-27 10:43:07 +02:00 |
|
Oleksii Kriuchykhin
|
792f949a61
|
Fix issue with spinner in avatar upload [SCI-423]
|
2016-09-27 09:12:31 +02:00 |
|
Oleksii Kriuchykhin
|
908ee05a23
|
Fix issue with words break in task description and comments [SCI-477]
|
2016-09-26 16:03:22 +02:00 |
|
Matej Zrimšek
|
fc86b7b1fd
|
Added help dropdown. [SCI-13]
|
2016-09-23 12:52:38 +02:00 |
|
Matej Zrimšek
|
c614843044
|
Minor refactoring with hound alert fixes.
|
2016-09-21 19:48:18 +02:00 |
|
Matej Zrimšek
|
234918a76d
|
Word wrapping and truncating added to whole application [fixes SCI-458]. Fixed some bugs which were related to long/too long text and validations. Modified parts of application to accomodate for longer text limits.
|
2016-09-21 19:48:18 +02:00 |
|
zmagod
|
06b1992e94
|
Merge branch 'zd_SCI_436' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_436
|
2016-09-21 19:20:55 +02:00 |
|
zmagod
|
2bfe8f0636
|
fixing hound
|
2016-09-21 08:16:23 +02:00 |
|
zmagod
|
42bbc47f5f
|
first working version
|
2016-09-20 17:06:07 +02:00 |
|
zmagod
|
da86208441
|
styled step comments
|
2016-09-20 14:13:40 +02:00 |
|
Matej Zrimšek
|
ffe6799313
|
Fixed hound alerts.
|
2016-09-16 15:57:54 +02:00 |
|
Matej Zrimšek
|
dd6e8a3a9a
|
Added step name word wrapping (needs to be improved).
|
2016-09-16 15:57:54 +02:00 |
|
zmagod
|
e90f0bd3d5
|
refactor step view
|
2016-09-16 09:04:21 +02:00 |
|
zmagod
|
0a2ab57e28
|
styled new comments layout
|
2016-09-15 11:45:51 +02:00 |
|
Mojca Lorber
|
65415415b6
|
fixes hound again again
|
2016-09-14 11:37:17 +02:00 |
|
Mojca Lorber
|
aba5305cd6
|
fixes hound
|
2016-09-14 11:24:19 +02:00 |
|
Mojca Lorber
|
a9029e0928
|
fixes responsiveness on mobile phone for sample view
|
2016-09-14 11:08:40 +02:00 |
|
Zmago Devetak
|
f86c6b954e
|
Merge pull request #141 from ZmagoD/zd_SCI_340
styled dottel line in sidebar [fixes SCI-340]
|
2016-09-13 11:58:26 +02:00 |
|
zmagod
|
1b31f8827d
|
set experiment description to 255
|
2016-09-08 14:35:52 +02:00 |
|
Mojca Lorber
|
0435011fee
|
fixes hound
|
2016-09-08 12:43:30 +02:00 |
|
Mojca Lorber
|
302a777615
|
fixes button collision
|
2016-09-08 12:37:06 +02:00 |
|
zmagod
|
d92597ac30
|
styled dottel line in sidebar [fixes SCI-340]
|
2016-09-07 09:01:40 +02:00 |
|
zmagod
|
d886d05ccb
|
Merge branch 'zd_SCI_338'
|
2016-08-26 16:32:49 +02:00 |
|
Matej Zrimšek
|
e3a7f45fdf
|
Merge branch 'master' into mz_file_upload_and_client_side_upgrade
Conflicts:
app/assets/javascripts/application.js
app/views/results/_result_asset.html.erb
app/views/steps/_step.html.erb
|
2016-08-26 11:13:40 +02:00 |
|
Luka Murn
|
8018cff02e
|
Merge pull request #103 from Ducz0r/bb_edit_delete_comments
Edit&delete comments
|
2016-08-25 17:18:48 +02:00 |
|
Zmago Devetak
|
b090fd8d5b
|
Merge pull request #95 from ZmagoD/zd_SCI_374
adds edit workflow link if no workflow [fixes SCI-374]
|
2016-08-25 14:07:33 +02:00 |
|
Luka Murn
|
a480c8d403
|
Styling fixes
|
2016-08-25 13:59:50 +02:00 |
|
Luka Murn
|
f0d9cb96fa
|
Add edit project comments functionality
|
2016-08-25 13:51:30 +02:00 |
|
Luka Murn
|
15c0baeee8
|
Add delete project comment functionality
This commit also removes the old code from @bberic.
|
2016-08-25 13:51:30 +02:00 |
|
zmagod
|
92bb3dda99
|
hide last next button
|
2016-08-25 08:46:11 +02:00 |
|
zmagod
|
dbdbff12eb
|
add experiment level tutorial step [fixes SCI-338]
|
2016-08-24 19:03:58 +02:00 |
|
mlorb
|
2d90ad1a65
|
Merge pull request #88 from mlorb/ml_sci_362
fixes tile size in edit canvas [SCI-362]
|
2016-08-24 17:07:11 +02:00 |
|
zmagod
|
9393a96302
|
adds edit workflow link if no workflow [fixes SCI-374]
|
2016-08-24 14:10:50 +02:00 |
|
Zmago Devetak
|
9dc7708b73
|
Merge pull request #85 from ZmagoD/zd_SCI_360
fixes project overview style and add no description link [fixes SCI-360]
|
2016-08-23 16:24:22 +02:00 |
|
Zmago Devetak
|
aa650bbc65
|
Merge pull request #82 from ZmagoD/zd_SCI_359
Add plus button at the bottom of project overview page [fixes SCI-359]
|
2016-08-23 16:23:20 +02:00 |
|
Mojca Lorber
|
126cf0c210
|
fixes drag connections area
|
2016-08-23 16:08:05 +02:00 |
|
Mojca Lorber
|
86ed4c18d8
|
fixes hound
|
2016-08-23 13:51:20 +02:00 |
|
Mojca Lorber
|
ac68db97b9
|
fixes tile size in edit canvas
|
2016-08-23 13:33:10 +02:00 |
|
zmagod
|
03a3759cf5
|
fixes project overview style and add no description link [fixes SCI-360]
|
2016-08-23 08:52:53 +02:00 |
|
zmagod
|
8c592753e4
|
fixes hound
|
2016-08-22 15:27:11 +02:00 |
|
zmagod
|
bb11999566
|
adds plus button at the bottom of project overview page [fixes SCI-359]
|
2016-08-22 15:22:05 +02:00 |
|
zmagod
|
eab05eb9db
|
adds font-awesome to pdf [fixes SCI-345]
|
2016-08-22 14:40:09 +02:00 |
|
Matej Zrimšek
|
4ad384df5a
|
Fixed hound alerts.
|
2016-08-17 21:02:05 +02:00 |
|
Matej Zrimšek
|
e2f94caa96
|
Step creation is now completelly validated on client-side also, to avoid front-end problems after server-side validation. This was needed as lots of issues were caused by this. Also step creation user experience is enriched and refactoring of related code was done.
|
2016-08-17 17:54:06 +02:00 |
|
zmagod
|
ca0ba1403d
|
set flask icon to experiment [fixes SCI-330]
|
2016-08-17 14:17:29 +02:00 |
|
zmagod
|
850f5d8dad
|
fixing hound alerts
|
2016-08-17 09:44:23 +02:00 |
|
zmagod
|
7abc8f3a90
|
Merge branch 'master' into experiment-level
|
2016-08-17 09:28:35 +02:00 |
|
mlorb
|
f3163ea7ce
|
visual corrections
|
2016-08-12 08:54:14 +02:00 |
|
Mojca Lorber
|
94915a9ba7
|
fixes problem with splitted table when generating pdf report [SCI-302]
|
2016-08-11 15:24:18 +02:00 |
|
Mojca Lorber
|
b350dff826
|
fixes problem with splitted table when generating pdf report [SCI-302]
|
2016-08-11 10:42:36 +02:00 |
|
zmagod
|
5583105d8a
|
fixed hound alert
|
2016-08-09 14:28:55 +02:00 |
|
zmagod
|
5f3a5cb845
|
fixed project overview
|
2016-08-09 14:26:08 +02:00 |
|
Zmago Devetak
|
4bd489d29c
|
Merge pull request #46 from ZmagoD/zd_SCI_303
update sidebar v2 [fixes SCI-303]
|
2016-08-08 08:56:01 +02:00 |
|
jbargu
|
3f91e7a476
|
Merge pull request #47 from biosistemika/jg_explvl_reports
Update reports with experiment level
[Fixes SCI-35].
|
2016-08-08 08:51:23 +02:00 |
|
zmagod
|
520cf2e0cf
|
hound....
|
2016-08-08 08:40:24 +02:00 |
|
zmagod
|
e16abe486c
|
fix hound alert
|
2016-08-08 08:37:22 +02:00 |
|
zmagod
|
756c3c777e
|
styled workflow dots
|
2016-08-08 08:33:18 +02:00 |
|
Mojca Lorber
|
c691ca63e2
|
fixing houndci-bot comment
|
2016-08-05 09:47:06 +02:00 |
|
Mojca Lorber
|
5d137324bc
|
moving and targeting .label class
|
2016-08-05 09:12:17 +02:00 |
|
Jure Grabnar
|
2f0dc57ea6
|
Fix Hounds warning
|
2016-08-05 08:29:49 +02:00 |
|
Jure Grabnar
|
a25a4354c6
|
Fix css, #hound.
|
2016-08-05 08:05:14 +02:00 |
|
zmagod
|
a4ec558596
|
start to implement project overview page
|
2016-08-04 12:57:33 +02:00 |
|
zmagod
|
f8f87e9540
|
Feed the Hound
|
2016-08-03 16:16:09 +02:00 |
|
zmagod
|
45dac782ca
|
update sidebar [fixes SCI-303]
|
2016-08-03 16:09:45 +02:00 |
|
Jure Grabnar
|
598c5a63fd
|
Add experiment level to project report contents modal
|
2016-08-03 12:52:05 +02:00 |
|
Luka Murn
|
b085aa1db3
|
Remove uneccesary project_activities HTML pages
|
2016-07-29 16:06:35 +02:00 |
|
Luka Murn
|
076b67620f
|
Migration GitLab -> GitHub
|
2016-07-21 13:11:15 +02:00 |
|
Luka Murn
|
055298fee8
|
Initial commit.
|
2016-02-12 16:52:43 +01:00 |
|