284 commits

Author	SHA1	Message	Date
zmagod	a434649f42	Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration	2017-01-03 16:35:25 +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	62e4d32221	updated gemfile	2016-12-16 10:45:14 +01:00
zmagod	ac52e643be	cleanup direct upload	2016-12-08 11:26:13 +01:00
Zmago Devetak	91f29745c4	Merge pull request #314 from ZmagoD/zd_SCI_643 ... adds autolink	2016-12-05 10:47:23 +01:00
Matej Zrimšek	46465060d0	Added automatic sign in with token authentication, needed when signing in from different webpage. [closes SCI-689]	2016-11-30 16:56:56 +01:00
Luka Murn	76ec77fce4	Merge pull request #329 from biosistemika/simplify-signup ... Merge simplify-signup into master	2016-11-30 09:41:20 +01:00
Luka Murn	de7c0ad641	Remove commit reference to quill-rails in Gemfile	2016-11-24 09:19:43 +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	60f23b109b	integrate reCaptcha into sciNote	2016-11-22 14:57:41 +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
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
Luka Murn	8302a87671	Update Gemfile	2016-11-16 10:07:18 +01:00
Luka Murn	fa6d8d3020	Save first time tutorial Activity-s without callbacks ... This PR adds a new, pretty useful little gem called sneaky-save. Closes SCI-655	2016-11-14 15:55:44 +01:00
Zmago Devetak	a5637a65a0	Merge pull request #274 from ZmagoD/zd_SCI_639 ... Customize the library SCI-639	2016-11-11 12:15:23 +01:00
Luka Murn	55f9633d1d	Add jQuery.autosize plugin	2016-11-11 09:09:41 +01:00
zmagod	df43614f00	swithced quill gem to master branch	2016-11-10 14:15:39 +01:00
Mojca Lorber	3e162b3a93	remove redcarpet gem - markdown	2016-11-10 14:11:32 +01:00
zmagod	7c7106d8ff	included updated guill-rails version [fixes SCI-639]	2016-11-10 14:04:22 +01:00
Mojca Lorber	ab0879e8d6	Integrate library with default settings	2016-11-09 13:09:53 +01:00
Luka Murn	02d3e03f75	Bugfix for notification emails ... The URLs in notification emails didn't get server URL prepended, so users could not click on them.	2016-10-13 12:12:28 +02:00
Luka Murn	448daab7c8	Merge pull request #207 from biosistemika/add-deface-hotfix ... Merge hotfix 1.3.1 into master	2016-10-07 18:26:13 +02:00
zmagod	32f03ec94c	Add Deface hooks	2016-10-06 16:47:36 +02:00
Matej Zrimšek	5d5681bffe	Added code semantic and style checking for JS, ERB, and SCSS files. JS, ERB and RUBY checkers were also bound to Hound.	2016-10-05 14:28:34 +02:00
Jure Grabnar	b51f2a3027	Add basic WOPI proof checking ... Still missing validation of timestamp. Remove web_console gem for testing. Add relevant tests from manual for WOPI proof.	2016-09-28 09:33:44 +02:00
Nejc Bernot	b2b1d5a8f5	Initial commit of WOPI integration	2016-09-28 09:33:44 +02:00
Matej Zrimšek	c6a23aab98	Added missing validations for text fields. Added text trimming, which removes spaces from beginning and ending of text. [fixes SCI-408]	2016-09-21 19:37:36 +02:00
Matej Zrimšek	84693bfbf7	Added gem for smart code searching	2016-09-13 18:53:54 +02:00
zmagod	ca0ba1403d	set flask icon to experiment [fixes SCI-330]	2016-08-17 14:17:29 +02:00
zmagod	1a56396eb5	add workflow image to project overview page [fixes SCI-41]	2016-08-08 16:02:17 +02:00
Jure Grabnar	b402d67f24	Add rubocop gem to development env	2016-08-03 12:52:51 +02:00
zmagod	0955d1c66a	1. Fixed fixtures ... 2. Added shoulda matcher gem 3. Added Experiment test suite 4. Fixed failing tests	2016-07-27 10:49:13 +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