165 commits

Author	SHA1	Message	Date
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
Matej Zrimšek	8ad52354eb	Used locales instead of hardcoded values for intro.js tutorial popup.	2017-04-25 16:03:50 +02:00
Matej Zrimšek	e8bc9542cc	Removed some unneeded intro.js tutorial code.	2017-04-25 16:03:50 +02:00
Matej Zrimšek	a6573bd508	Next button is now always focused when navigating through tutorial steps. [fixes SCI-719]	2017-04-25 16:03:50 +02:00
Matej Zrimšek	a5cffd06f3	Removed all tutorial data from ERB, so that all tutorial code is in JS. [needed for fixing SCI-719]	2017-04-25 16:03:50 +02:00
Mojca Lorber	49574e7a06	remove behavior of not allowing the empty tables in steps	2017-04-25 10:21:16 +02:00
rekonder	b93edac3b9	My profile - avatar size fixes [SCI-1088]	2017-04-25 10:02:00 +02:00
zmagod	66f43803c0	refactor, fix user annotation bug	2017-04-24 16:22:25 +02:00
zmagod	550f563666	working version for steps first run	2017-04-21 16:09:04 +02:00
zmagod	c25df63a14	add tinymce img importer and refactor input sanitize helper	2017-04-19 09:11:52 +02:00
Oleksii Kriuchykhin	181d981a51	Add image preview to protocol repository [SCI-877]	2017-04-12 16:05:38 +02:00
Zmago Devetak	5c9954bb89	Merge pull request #450 from ZmagoD/zd_SCI_939 ... Refactor "organizations" to "teams"	2017-02-01 13:12:02 +01:00
okriuchykhin	9909f9dcff	Merge pull request #456 from okriuchykhin/ok_SCI_951 ... Fix missing preview images in task and protocol management [SCI-951]	2017-01-27 14:42:41 +01:00
zmagod	e59b2e039a	Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_939	2017-01-27 11:15:31 +01:00
Oleksii Kriuchykhin	0f860496a7	Fix image preview after saving of report [SCI-951]	2017-01-26 14:42:14 +01:00
Mojca Lorber	13d1cc5171	fix entering new smart anotations	2017-01-26 13:50:32 +01:00
zmagod	8c035a1981	renames organization in assets	2017-01-25 12:12:27 +01:00
Oleksii Kriuchykhin	365eef506c	Fixes merge conflicts with smart-annotations branch	2017-01-24 15:20:50 +01:00
mlorb	02f314ce60	Merge pull request #443 from mlorb/ml_sci_919_v2 ... Remove table of content and customize link target [SCI-919]	2017-01-24 14:39:47 +01:00