Pavel Maslov
15ea8fc0dc
Bug fixed: comments in results have no error message if the text exceeds 1000 characters.
2016-09-13 12:01:56 +02:00
Zmago Devetak
1368716aa0
Merge pull request #130 from ZmagoD/zd_SCI_348
...
project overview - updating (or creating new) experiment details
2016-09-08 12:49:35 +02:00
mlorb
f4029a04fd
Merge pull request #142 from mlorb/ml_sci_415
...
fixes navbar size when resizing window [SCI-415]
2016-09-08 12:46:36 +02:00
Mojca Lorber
302a777615
fixes button collision
2016-09-08 12:37:06 +02:00
Luka Murn
0c1759c15a
Merge pull request #135 from Ducz0r/lm-sci-397
...
Resize archived experiment panels
2016-09-07 11:14:53 +02:00
Matej Zrimšek
b0ad6d0753
Fixed result file deletion and result name updating [fixes SCI-409]. Fixed step name and checklists names and its items names checking, and items removing [fixes SCI-407].
2016-09-06 23:26:00 +02:00
zmagod
b44a284b54
sets edit experiment validation
2016-09-06 11:46:28 +02:00
zmagod
9d469f9092
sets front end validation for new experiment modal [fixes SCI-348]
2016-09-06 11:44:03 +02:00
zmagod
de6c03a73b
setup experiment modal input validation
2016-09-06 11:44:03 +02:00
Zmago Devetak
9440371f3f
Merge pull request #131 from ZmagoD/zd_SCI_400
...
Sets front end validation for experiment move action [fixes SCI-400]
2016-09-06 11:39:38 +02:00
Luka Murn
bda5120548
Resize archived experiment panels
...
Closes SCI-397.
2016-09-06 10:55:05 +02:00
Mojca Lorber
47983812e7
minimize buttons on mobile phone
2016-09-06 10:10:49 +02:00
Luka Murn
81883911c4
Merge pull request #132 from Ducz0r/lm-sci-228
...
Updates to invite users to team modal window
2016-09-05 15:53:15 +02:00
mlorb
aea288371f
Merge pull request #129 from mlorb/ml_sci_310
...
adds tasks, experiment and project category in protocol search results [SCI-310]
2016-09-05 15:31:35 +02:00
Mojca Lorber
6a802e9fa7
fixes redirection to project page for all categories in search results
2016-09-05 11:40:49 +02:00
Mojca Lorber
740392c687
optimization
2016-09-05 10:58:37 +02:00
zmagod
667fb67052
sets front end validation for experiment move action [fixes SCI-400]
2016-09-02 16:31:17 +02:00
Zmago Devetak
ea26a532e4
Merge pull request #126 from ZmagoD/zd_SCI_332
...
By default all experiments should be collapsed
2016-09-02 15:58:03 +02:00
Mojca Lorber
83034f705d
adds tasks, experiment and project category in protocol search results
2016-09-02 11:45:54 +02:00
Luka Murn
61f4fbd1d4
Remove warning info when removing pending user from organization
2016-09-01 13:23:53 +02:00
zmagod
ac7ac95da8
[fixes SCI-332]
2016-09-01 10:38:20 +02:00
zmagod
e8f971829a
added project to session storage
2016-08-31 15:13:17 +02:00
zmagod
eb394ce209
fixes searching tables bug [fixes SCI-402]
2016-08-31 11:01:10 +02:00
zmagod
b05c3df4d3
adds toggle id only to elements with modules
2016-08-31 10:25:40 +02:00
zmagod
eb39eedfdf
[fixes SCI-398] again
2016-08-31 08:46:51 +02:00
Zmago Devetak
375a72db18
Merge pull request #114 from ZmagoD/zd_SCI_294_vol2
...
fixes reports file name [fixes SCI-294]
2016-08-30 14:59:07 +02:00
Mojca Lorber
43c3a0bb81
fixes merge again
2016-08-30 12:54:08 +02:00
Mojca Lorber
81f9e59dcd
fixes merge
2016-08-30 12:14:15 +02:00
Mojca Lorber
e8d187b5f6
Merge branch 'ml_sci_395'
...
Conflicts:
app/views/canvas/edit/modal/_move_module.html.erb
app/views/canvas/edit/modal/_move_module_group.html.erb
2016-08-30 11:41:25 +02:00
zmagod
f356acb882
fixes reports file name [fixes SCI-294]
2016-08-30 11:36:39 +02:00
Zmago Devetak
6878adda46
Merge pull request #112 from ZmagoD/zd_SCI_338_vol2
...
Tutorial
2016-08-30 11:07:51 +02:00
jbargu
fa357dd54f
Merge pull request #110 from jbargu/jg_SCI_328_move_task_no_experiment
...
Remove move on empty experiments
2016-08-30 11:06:16 +02:00
Mojca Lorber
596d403d5f
change position of buttons
2016-08-30 09:16:53 +02:00
zmagod
5518d1cd1e
fixed 16 step of tutorial
2016-08-30 08:52:44 +02:00
Jure Grabnar
0c184dcdcf
Remove Move button on empty experiments
...
SCI-328 #close.
2016-08-30 08:26:59 +02:00
zmagod
2ac20d1af1
adds new image + new panel title [fixes SCI-336]
2016-08-29 09:28:29 +02:00
Luka Murn
a0311970f8
Add missing commits for showing image and not able to preview
2016-08-26 16:49:32 +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
Zmago Devetak
0cfc758f43
Merge pull request #102 from ZmagoD/zd_SCI_336
...
implement first time popup logic
2016-08-26 09:19:36 +02:00
zmagod
2031c42920
fixed confirmation text
2016-08-26 09:13:45 +02:00
zmagod
1738ca66d2
one-time introductory popup [fixes SCI-336]
2016-08-25 18:44:21 +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
1b21e55fea
Merge pull request #100 from ZmagoD/zd_SCI_381
...
Adds experiment and team to tag search resuls [fixes SCI-381]
2016-08-25 15:43:50 +02:00
zmagod
8ff645fb89
disabled experiment dropdown actions
2016-08-25 15:16:51 +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
6d86a02d7c
Add individual permission checks in dropdowns
...
Closes SCI-258.
2016-08-25 13:51:50 +02:00
Luka Murn
24dd25d9f5
Add edit/delete result comment functionality
...
Lessons learned during this fix:
Don't use dependant: :destroy on both ends of association
between 2 ActiveRecords, or you will run into stack overflow.
2016-08-25 13:51:31 +02:00
Luka Murn
bac0455435
Add edit&delete functionality to step comments
...
This commit also:
* fixes a bug in permission_helper.rb,
* fixes comments.js a bit,
* adds 2 more re-renders of dropdown position calculations to canvas.js and projects/index.js.
2016-08-25 13:51:31 +02:00
Luka Murn
c92d016f65
Add edit&delete module/task comments functionality
...
This required a minor fix of comments.js.
2016-08-25 13:51:31 +02:00
