Commit graph

223 commits

Author SHA1 Message Date
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
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
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
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
zmagod
df43614f00 swithced quill gem to master branch 2016-11-10 14:15:39 +01:00
zmagod
7c7106d8ff included updated guill-rails version [fixes SCI-639] 2016-11-10 14:04:22 +01:00
Mojca Lorber
c44e25d72e add gemfile.lock 2016-11-09 17:08:50 +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
zmagod
32f03ec94c Add Deface hooks 2016-10-06 16:47:36 +02:00
Jure Grabnar
1bdbc00e8c Update Gemfile.lock 2016-09-28 11:56:19 +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
Jure Grabnar
0e9756ad94 Fix bad step view rebase 2016-09-28 09:33:44 +02:00
Jure Grabnar
9a8d49d513 Update Gemfile.lock 2016-09-28 09:33:44 +02:00
Nejc Bernot
b2b1d5a8f5 Initial commit of WOPI integration 2016-09-28 09:33:44 +02:00
zmagod
ca0ba1403d set flask icon to experiment [fixes SCI-330] 2016-08-17 14:17:29 +02:00
Jure Grabnar
c801e7b7e3 Add old Gemfile.lock with graphviz 2016-08-10 15:43:15 +02:00
Jure Grabnar
ef608d18e7 Add missing Gemfile.lock 2016-08-10 08:30:58 +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