183 commits

Author	SHA1	Message	Date
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
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
Luka Murn	fa603b54b8	Merge pull request #930 from okriuchykhin/ok_SCI_1860 ... Remove tutorial [SCI-1860]	2018-04-12 14:46:20 +02:00
Luka Murn	9bf8b5d864	Merge branch 'ok_SCI_1860' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_1860 ... Conflicts: Makefile app/assets/javascripts/projects/index.js.erb app/assets/stylesheets/themes/scinote.scss config/locales/en.yml	2018-04-12 13:16:46 +02:00
zmagod	233e73c709	adds asset preview link to repository row modal and to table row item [fixes SCI-2110]	2018-04-10 17:06:53 +02:00
zmagod	ea4bd8831f	fixes bug with CSRF on file upload, fixes turbolink issues with remote form submition [fixes SCI-2284]	2018-04-10 13:19:53 +02:00
zmagod	cf7761daaa	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into ok_SCI_2223	2018-04-06 12:56:39 +02:00
Oleksii Kriuchykhin	8ee98b7cf0	Update Capybara and dependencies [SCI-2217]	2018-04-04 14:13:37 +02:00
Oleksii Kriuchykhin	51860652c1	Refactor smart annotations modal [SCI-2223]	2018-04-02 20:38:56 +02:00
Oleksii Kriuchykhin	cc5d8550b1	Refactor file preview modal [SCI-2217]	2018-03-30 11:50:28 +02:00
Oleksii Kriuchykhin	a105e61d48	Remove tutorial [SCI-1860]	2018-03-18 13:18:05 +01:00
zmagod	a6a25bbe08	add floating alert message	2018-03-13 16:33:48 +01:00
zmagod	2b55cd7090	rename variables	2018-03-02 14:14:27 +01:00
zmagod	e3ca782996	add info modal for repository items [fixes SCI-2066]	2018-02-27 16:21:46 +01:00
zmagod	bd1345d560	fixes bug with assets upload on task result page, ... adds ctrl+v listener to upload images from clipboard, adds image preview modal	2018-02-06 15:39:19 +01:00
zmagod	f8a3fca2db	Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling	2018-01-23 11:06:33 +01:00
Oleksii Kriuchykhin	89230bd730	Fix about modal [SCI-1875]	2017-12-22 18:27:20 +01:00
Oleksii Kriuchykhin	afb579bef1	Fix invite users dropdown [SCI-1893]	2017-12-21 16:49:10 +01:00
okriuchykhin	b3b0e367e8	Merge pull request #889 from okriuchykhin/ok_SCI_1747 ... Improve server side assets validation display for steps [SCI-1747]	2017-12-04 14:12:43 +01:00
Oleksii Kriuchykhin	745dac09a7	Improve clean-up of dropped files [SCI-1747]	2017-11-28 16:48:47 +01:00
Oleksii Kriuchykhin	e35031dd9a	Small code fixies [SCI-1747]	2017-11-28 11:34:57 +01:00
zmagod	d200e355ed	follow @Ducz0r 's suggestions	2017-11-24 11:45:07 +01:00
Oleksii Kriuchykhin	fe8b7d26c1	Improve server side assets validation display for steps [SCI-1747]	2017-11-21 13:48:06 +01:00
Mojca Lorber	ff998a6c98	change text for avatar size on my profile page	2017-11-15 14:21:04 +01:00
Oleksii Kriuchykhin	631b41cdaa	Improve error handling in file uploads [SCI-1609][SCI-1612][SCI-1551]	2017-10-19 11:38:23 +02:00
Mojca Lorber	a0f7030a70	fix bug with tinyMCE text validaton	2017-09-07 14:54:12 +02:00
Zmago Devetak	69919359f1	Merge pull request #738 from ZmagoD/zd_SCI_1452 ... fixes issue with smart annotations in repositories [fixes SCI-1452]	2017-07-12 14:50:29 +02:00
zmagod	baaec67399	fixes issue with smart annotations in repositories [fixes SCI-1452]	2017-07-10 16:22:32 +02:00
Luka Murn	3e80f761b8	Add "about" modal, prepare hooks, VERSION system for addons ... Also the addon generator is fixed so it properly creates VERSION file for new addons.	2017-07-10 15:27:50 +02:00
zmagod	6dd85d6c39	fixes drag'n drop bug in results on safari [fixes SCI-1370]	2017-06-14 09:45:49 +02:00
Luka Murn	e26337d5ee	Merge pull request #671 from biosistemika/custom-repositories ... Merge custom-repositories into master	2017-06-09 18:46:47 +02:00
zmagod	33b996ffee	refactor	2017-06-09 09:49:57 +02:00
zmagod	c6bb20039b	adds drag'n drop feature in task results [fixes SCI-1011], [fixes SCI-1310] and [fixes SCI-285]	2017-06-07 13:29:39 +02:00
Mojca Lorber	51c4eeb106	renaming	2017-06-06 15:50:43 +02:00
Matej Zrimšek	2c6ad4aa05	Refactored modal popups for repositories to make them general. [fix 1269]	2017-06-05 14:13:24 +02:00
zmagod	67d902db52	refactor	2017-06-05 10:43:58 +02:00
Matej Zrimšek	c82fd66146	Removed unneeded utility JS function. [SCI-1269]	2017-06-02 17:52:04 +02:00
Matej Zrimšek	791bb934ca	Remove repository modal logic (WIP). [SCI-1269]	2017-06-02 17:50:33 +02:00
Matej Zrimšek	20265ddd69	Readded result content modal for report creation and updated checkbox hierarchy logic accordingly. [fixes SCI-487]	2017-05-17 18:18:57 +02:00
Matej Zrimšek	79ec3b5e4c	Selected all checkboxes by default for result content adding modal and added disabling logic for dependent checkboxes. [fixes SCI-487]	2017-05-15 18:20:42 +02:00
Matej Zrimšek	901558c733	Made checkbox logic sitewide available and applied it to other content adding modals in report aswell. [fixes SCI-487]	2017-05-15 18:20:42 +02:00
zmagod	9bec7dd96e	Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1248	2017-05-15 14:49:37 +02:00
zmagod	a4032f5cc6	first run	2017-05-10 13:53:32 +02:00
Oleksii Kriuchykhin	52ad5ecdc2	Fix error messages display during file upload in steps and results [SCI-1235]	2017-05-09 17:13:47 +02:00
okriuchykhin	bd0b930382	Merge pull request #598 from okriuchykhin/ok_SCI_152 ... Add counters for users and comments on canvas [SCI-152]	2017-05-09 10:22:53 +02:00
Oleksii Kriuchykhin	344b9c290a	Add counters for users and comments on canvas [SCI-152]	2017-05-08 17:32:55 +02:00
Zmago Devetak	4b816f5322	Merge pull request #568 from ZmagoD/zd_SCI_1119 ... Add images to fields with rich text formatting	2017-05-08 13:06:58 +02:00
zmagod	5b58824ec0	refactor	2017-05-03 15:30:08 +02:00
ajugo	081aa4aea7	Merge pull request #570 from rekonder/aj-SCI-1088 ... My profile - avatar size fix [SCI-1088]	2017-05-03 12:27:05 +02:00