Zmago Devetak
|
a680b09cc9
|
Merge pull request #72 from ZmagoD/zd_fix_exl_archive
fixed experiments archive bug
|
2016-08-18 13:16:51 +02:00 |
|
Zmago Devetak
|
fe626a8cb3
|
Merge pull request #71 from ZmagoD/zd_SCI_294
Zd sci 294
|
2016-08-18 13:16:38 +02:00 |
|
zmagod
|
d62500cb56
|
check search input string [fixes SCI-346]
|
2016-08-18 13:14:31 +02:00 |
|
zmagod
|
4b5be7530c
|
fixed task archive
|
2016-08-18 11:53:57 +02:00 |
|
zmagod
|
da2b9ccf82
|
fixes user duplication [fixes SCI-344]
|
2016-08-18 11:26:52 +02:00 |
|
zmagod
|
fa08b861d0
|
fixed experiments archive bug
|
2016-08-18 10:55:29 +02:00 |
|
Jure Grabnar
|
6879521a75
|
Add missing .experiment to can_unlink_protocol
|
2016-08-18 10:48:44 +02:00 |
|
zmagod
|
6bb8d075e0
|
truncate asset name in task step and result [fixes SCI-294]
|
2016-08-18 09:22:12 +02:00 |
|
zmagod
|
072f816286
|
refactor restore_after_tutorial function
|
2016-08-18 08:55:40 +02:00 |
|
zmagod
|
f2ee5d73a0
|
fixed project tutorial bug
|
2016-08-18 08:53:34 +02:00 |
|
Zmago Devetak
|
b6ccecf478
|
Merge pull request #69 from ZmagoD/zd_SCI_335
cleans experiment form report if moved [fixes SCI-335]
|
2016-08-18 08:37:09 +02:00 |
|
Jure Grabnar
|
c3074e91de
|
Fix activity in first time generator
|
2016-08-18 08:33:08 +02:00 |
|
mlorb
|
36d24523b4
|
Merge pull request #61 from biosistemika/ml_sci_291
fixes dissapearance of sample type/group when editing samlpe or adding new sample [SCI-291]
|
2016-08-18 08:25:31 +02:00 |
|
Zmago Devetak
|
4897e2da0c
|
Merge pull request #68 from ZmagoD/zd_SCI_330
Zd sci 330
|
2016-08-18 08:10:20 +02:00 |
|
Zmago Devetak
|
f2e08db106
|
Merge pull request #67 from ZmagoD/zd_SCI_337
Zd sci 337
|
2016-08-18 08:06:38 +02:00 |
|
Zmago Devetak
|
d17af4e898
|
Merge pull request #66 from ZmagoD/zd_SCI_331
adds active class to experiment name in sidebar [fixes SCI-331]
|
2016-08-18 08:06:03 +02:00 |
|
Zmago Devetak
|
052279a459
|
Merge pull request #65 from ZmagoD/zd_SCI_329
Adds single tasks to the experiment img [fixes SCI-329]
|
2016-08-18 08:04:56 +02:00 |
|
Matej Zrimšek
|
4ad384df5a
|
Fixed hound alerts.
|
2016-08-17 21:02:05 +02:00 |
|
Matej Zrimšek
|
27a9dac412
|
File permissions corrected, with some refactoring.
|
2016-08-17 18:23:24 +02:00 |
|
Matej Zrimšek
|
e4a6a3944e
|
Added deleting of files on S3 server when editing/removing a file. Some refactoring.
|
2016-08-17 18:13:35 +02:00 |
|
Matej Zrimšek
|
ccdccc5cf1
|
Changed file uploding to work properly with multiple files and be user friendly in case of errors. Some function names refactoring.
|
2016-08-17 18:11:13 +02:00 |
|
Matej Zrimšek
|
854ef0d227
|
Special characters caused error [fixes SCI-315].
|
2016-08-17 18:10:47 +02:00 |
|
Matej Zrimšek
|
c87ba5b45c
|
Multiple files upload handling and user experience improved. Spinner now also prevents user from accidentally leaving page.
|
2016-08-17 18:10:32 +02:00 |
|
Matej Zrimšek
|
951cf67b3d
|
A lot of file uploading edge cases considered. File uploading is now actually redirected to S3 server, as before was not. Error functions changed and error output format specified, which should be used consistently throughout the application. Some other refactoring.
|
2016-08-17 18:08:21 +02:00 |
|
Matej Zrimšek
|
b70f49f4e0
|
Some additional refinements.
|
2016-08-17 18:00:04 +02:00 |
|
Matej Zrimšek
|
d59fd0de95
|
Ignore billing module, so it can be attached if needed.
|
2016-08-17 17:59:32 +02:00 |
|
Matej Zrimšek
|
86880f0299
|
Additional changes, refactoring and improvements.
|
2016-08-17 17:57:54 +02:00 |
|
Matej Zrimšek
|
01aad1764c
|
Some hotfixes to previous commit. Client-side file validation added (except file type validation). Some refactoring.
|
2016-08-17 17:54:45 +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 |
|
Jure Grabnar
|
78cf4f396e
|
render_403 and 404 now return true
To prevent any: render_403 and return type of bugs
|
2016-08-17 15:46:30 +02:00 |
|
Jure Grabnar
|
77f75fdeb6
|
Delete module from canvas when moving
|
2016-08-17 15:46:30 +02:00 |
|
Jure Grabnar
|
0cdea0b51a
|
Add modal for moving task on canvas
|
2016-08-17 15:46:30 +02:00 |
|
zmagod
|
c27c6c19e5
|
cleans experiment form report if moved [fixes SCI-335]
|
2016-08-17 15:21:53 +02:00 |
|
zmagod
|
9fd68c7bd5
|
fixes 'new experiment' button bug on smaller screens
|
2016-08-17 14:27:59 +02:00 |
|
zmagod
|
ca0ba1403d
|
set flask icon to experiment [fixes SCI-330]
|
2016-08-17 14:17:29 +02:00 |
|
zmagod
|
cc2ed32ccb
|
fixes canvas bug when no actions are available for the viewer
|
2016-08-17 13:29:22 +02:00 |
|
zmagod
|
6c5cc8aac9
|
fixes notification [fixes SCI-337]
|
2016-08-17 13:17:40 +02:00 |
|
zmagod
|
8d69ca0b88
|
adds active class to experiment name in sidebar [fixes SCI-331]
|
2016-08-17 11:21:48 +02:00 |
|
zmagod
|
d557f3249f
|
Adds single tasks to the experiment img [fixes SCI-329]
|
2016-08-17 11:13:49 +02:00 |
|
Zmago Devetak
|
da735a51f4
|
Merge pull request #62 from ZmagoD/zd_SCI_318
Zd sci 318
|
2016-08-17 10:01:10 +02:00 |
|
Zmago Devetak
|
13697e8688
|
Merge pull request #58 from ZmagoD/zd_SCI_74
Filter search query for special chars [fixes SCI_74]
|
2016-08-17 10:00:47 +02:00 |
|
zmagod
|
63fc8e504b
|
Merge branch 'ZmagoD-zd_SCI_271'
|
2016-08-17 09:59:05 +02:00 |
|
zmagod
|
4293f9c267
|
Merge branch 'zd_SCI_271' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_271
|
2016-08-17 09:58:29 +02:00 |
|
zmagod
|
c9d439f652
|
Merge branch 'experiment-level'
|
2016-08-17 09:45:37 +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 |
|
zmagod
|
76dd4bc90a
|
fixed protocol status bar [fixes SCI-318]
|
2016-08-16 10:47:23 +02:00 |
|
Zmago Devetak
|
762b805651
|
Merge pull request #55 from ZmagoD/zd_papperclip_migration_bug
fixes migration error
|
2016-08-16 10:44:53 +02:00 |
|
Zmago Devetak
|
9b97dad03d
|
Merge pull request #54 from ZmagoD/zd_SCI_39
fixes loading samples error in blank project
|
2016-08-16 10:44:35 +02:00 |
|
jbargu
|
20a8fd551f
|
Merge pull request #60 from jbargu/jg_clone_move_experiment
Clone/move experiment functionality
[fixes SCI-308]
|
2016-08-16 10:24:52 +02:00 |
|