scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-20 12:04:31 +08:00
Code Issues Projects Releases Packages Wiki Activity
1954 commits 88 branches 195 tags 173 MiB
Commit graph

319 commits

Author SHA1 Message Date
Luka Murn
488613afcc Add index to users' full name attribute 2017-01-05 16:26:49 +01:00
Luka Murn
ef688feb4e Hotfix 1.6.1 
Set confirmed_at to created_at when using no
email confirmations and users sign up by themselves.
 2017-01-05 15:27:18 +01:00
Oleksii Kriuchykhin
0ecb6904d4 Add user input sanitizing in the models [SCI-102] 2017-01-05 13:31:35 +01:00
Luka Murn
a78bb79618 Temp commit 2017-01-05 12:07:17 +01:00
Luka Murn
3bee9d2e12 Save an (yet unworking) version of user smart annotations 
Used so other devs can start working on smart annotations.
 2017-01-04 10:54:02 +01:00
zmagod
a434649f42 Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration 2017-01-03 16:35:25 +01:00
Oleksii Kriuchykhin
4d3e002c81 Add sorting to Project's experiments overview [SCI-361] 2016-12-23 15:40:01 +01:00
zmagod
e554fdf805 code refactor 2016-12-21 16:52:15 +01:00
Oleksii Kriuchykhin
b537feb8a0 Added large preview [SCI-694] 2016-12-16 17:07:08 +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
b87246c8c2 cleanup spinner after edit step 2016-12-16 11:10:03 +01:00
Mojca Lorber
69d164da68 add new column on first position 2016-12-15 11:20:40 +01:00
zmagod
6d2fb3b02c Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_SCI_790 2016-12-14 17:05:00 +01:00
Oleksii Kriuchykhin
fa1cf1f04d Better handling of columns deleting with fixing columns ordering [SCI-783] 2016-12-14 15:23:00 +01:00
zmagod
3c1a275510 fixes invited user samples table [fixes SCI-790] 2016-12-13 10:56:13 +01:00
Luka Murn
d30a9780f4 Merge branch 'lm-sci-711-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-711-fix 
Conflicts:
	app/assets/javascripts/samples/sample_datatable.js
 2016-12-12 09:57:37 +01:00
Oleksii Kriuchykhin
274fd63a41 Initial code commit [SCI-779] 2016-12-09 15:21:26 +01:00
zmagod
de3099e4d1 removes asset_helper, fixes loading of processed thumbnails in results and steps and when loading protocols from repository 2016-12-09 13:59:49 +01:00
Luka Murn
1a8b141b95 Add delete custom field functionality 2016-12-09 13:49:19 +01:00
Mojca Lorber
0e3526c9ad Merge branch 'mlorb-ml-sci-696' into improved-sample-table 
Conflicts:
	app/assets/javascripts/samples/sample_datatable.js
 2016-12-08 15:44:50 +01:00
zmagod
40fdfef67f setup delayed_paperclip gem 2016-12-08 15:24:14 +01:00
Mojca Lorber
7d88e247fc refactoring 2016-12-08 14:41:35 +01:00
zmagod
ac52e643be cleanup direct upload 2016-12-08 11:26:13 +01:00
Nbernot
1eb3ddee53 Token expiration restored to 1 day. 2016-12-08 11:12:24 +01:00
Mojca Lorber
227fe9c284 change to after_create 2016-12-07 17:43:00 +01:00
Mojca Lorber
87dc76f4e3 change to update samples table state after initialize 2016-12-07 17:25:42 +01:00
Mojca Lorber
114a17ff0f change to create 2016-12-07 16:57:17 +01:00
Mojca Lorber
228990f9da fix samples table state, when adding new custom column 2016-12-07 16:37:16 +01:00
Mojca Lorber
195055f9cf change SAMPLES_TABLE_DEFAULT_STATE 2016-12-07 14:51:34 +01:00
Mojca Lorber
39b6fa66fe add SamplesTable for new users 2016-12-07 14:14:32 +01:00
Luka Murn
62353b6c3b Temporary change token expiration 2016-12-06 16:33:32 +01:00
Mojca Lorber
01e75fbbcc create samples table model and migration 2016-12-05 11:08:33 +01:00
zmagod
7725374c42 refactor sample types/groups [fixes SCI-700] 2016-12-02 09:58:35 +01:00
Luka Murn
372b455d7d Merge pull request #332 from Ducz0r/lm-sci-750-751 
Fix inviting users not working
 2016-12-01 15:52:40 +01:00
Luka Murn
6a770f6a7e Fix inviting users not working 
Closes SCI-750, SCI-751.

Probably reopens parts of SCI-746.
 2016-12-01 15:46:37 +01:00
Nejc Bernot
c54bd6df82 Added user ids to wopi tokens 2016-12-01 13:48:11 +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
Nejc Bernot
cb03ed8384 Users can now have multiple tokens 
A new token is generated whenever an edit or view file is called. Tokens have a TTL of one day.
Also enabled the toggling of both wopi and wopi test mode, using environmental variables.
 2016-11-30 16:48:42 +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
zmagod
a2e13441e5 removes create_sample_type modal and related js actions 2016-11-30 09:02:34 +01:00
Oleksii Kriuchykhin
d8f8e01a46 Code cleanup, added new image types to whitelist [SCI-736] 2016-11-28 11:13:20 +01:00
Oleksii Kriuchykhin
cc0aab2e59 Improve regexp for image whitelisting [SCI-736] 2016-11-28 10:08:54 +01:00
Luka Murn
7658ae264a Add uniqueness to sample_type & sample_group name 
Closes SCI-720.
 2016-11-25 16:15:05 +01:00
Oleksii Kriuchykhin
74f6455a8f Add whitelisting of supported image types [SCI-736] 2016-11-25 16:12:43 +01:00
Mojca Lorber
51abd8907c add switch to toggle email confirmations 2016-11-23 09:49:52 +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
9d3685f872 Merge branch 'gamification' into 'master' 
Conflicts:
	app/controllers/users/invitations_controller.rb
	app/controllers/users/settings_controller.rb
 2016-11-17 16:30:18 +01:00
zmagod
e5ba134e83 fixes search 2016-11-16 14:50:06 +01:00
Luka Murn
eb4d031b79 Fix destroying of users in relation to notifications 2016-11-15 15:56:32 +01:00
Luka Murn
e733da728c Fix a bug where user could be assigned to same project twice 
Closes SCI-675.
 2016-11-15 10:44:32 +01:00