scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-18 15:13:21 +08:00
Code Issues Projects Releases Packages Wiki Activity
12574 commits 31 branches 181 tags 166 MiB
Commit graph

286 commits

Author SHA1 Message Date
Martin Artnik
47071e23a1 Added specs for webhooks 2021-06-17 14:54:30 +02:00
Oleksii Kriuchykhin
b132a13698 Fix user preferences date format selector [SCI-5815] 2021-06-15 11:15:46 +02:00
Martin Artnik
380473c825 Fixed emails for successful report file generation [SCI-5814] 2021-06-14 13:25:50 +02:00
aignatov-bio
afe2a19c88
Add webhooks management [SCI-5767] (#3376) 
* Add webhooks managment [SCI-5767]

* Markup fixes [SCI-5676]
 2021-06-09 12:53:11 +02:00
aignatov-bio
9559ed88aa
Add webhooks index page [SCI-5766] (#3366) 2021-06-03 14:00:43 +02:00
aignatov-bio
f98aad5853 Fix nit issue in team description [SCI-5700] 2021-05-29 23:10:48 +02:00
Oleksii Kriuchykhin
29c83ffbb1 Merge branch 'develop' into features/new-reports 2021-05-21 11:04:17 +02:00
miha
ac18cb7225 rename partial to include html 2021-04-14 14:07:55 +02:00
miha
e610683d5c [SCI-5623] added external_id setting to user 2021-04-14 09:44:09 +02:00
Oleksii Kriuchykhin
2f6194a99f Remove canvas-to-blob library [SCI-5595] 2021-03-29 14:02:30 +02:00
aignatov-bio
8396c086f5
Add sticky toolbar for projects page [SCI-5401] (#3108) 
* Add sticky toolbar for projects page [SCI-5401]
 2021-01-25 15:36:23 +01:00
aignatov-bio
2fe55250b9
Update settings navigation [SCI-5316] (#3028) 2021-01-05 09:11:05 +01:00
Mojca Lorber
81798a96ad Add new SciNote avatars 2020-11-25 10:43:59 +01:00
Oleksii Kriuchykhin
6c367428a1 Fix team switcher [SCI-5080] 2020-10-02 14:25:44 +02:00
aignatov-bio
9474319d6b Fir error handling in invite user view 2020-08-13 11:34:21 +02:00
aignatov-bio
91b8475db5
Merge pull request #2784 from aignatov-bio/ai-sci-4918-display-all-errors-on-signup 
Fix error handling on registration page [SCI-4918]
 2020-08-12 09:39:21 +02:00
aignatov-bio
84b99eaf3d Fix error handling on registration page 2020-08-11 15:39:35 +02:00
Urban Rotnik
3c3a2bfb8b Add check if user is locked, show link unlock instructions 2020-08-06 15:18:20 +02:00
aignatov-bio
33e3e3d301 Small 2fa fixes 2020-07-27 13:42:51 +02:00
aignatov-bio
53d62b0310 Fix tests 2020-07-22 13:16:27 +02:00
aignatov-bio
ddfe8231d8 Merge branch 'features/2fa' into develop 2020-07-22 11:56:36 +02:00
aignatov-bio
c592954400 Add UX 2020-07-13 16:05:23 +02:00
Mojca Lorber
212ba76c16 Fix Settings pages titles 2020-07-13 14:51:51 +02:00
aignatov-bio
7d20bf6fea Add recovery screen 2020-07-13 09:51:04 +02:00
aignatov-bio
fef6e5f1db Add recovery strategy for 2fa 2020-07-09 17:01:00 +02:00
Urban Rotnik
b11f166c38 Fix cucumber tests 2020-07-09 13:14:07 +02:00
Mojca Lorber
00b668a4ba Change title size to h1 2020-07-08 13:02:47 +02:00
aignatov-bio
88c092dc98 Add i18n and constants 2020-07-07 15:59:02 +02:00
aignatov-bio
7a9a25e6a9 Add 2fa wizzard tabs 2020-07-07 13:17:17 +02:00
aignatov-bio
be3a1994f8 Add basic UX to 2FA 2020-07-07 13:09:48 +02:00
aignatov-bio
4b9881e31e Add 2fa to user settings page 2020-07-01 13:25:06 +02:00
Urban Rotnik
62a4a5f203 Add 2fa login 2020-07-01 12:46:26 +02:00
aignatov-bio
fe79fa4788 Fix markup 2020-06-29 10:57:41 +02:00
aignatov-bio
6fa97d3639 Add enable 2fa button to user settings 2020-06-29 10:56:06 +02:00
Urban Rotnik
a9bed41ff5 Remove obsolete html message 2020-05-22 10:33:13 +02:00
Urban Rotnik
5c72200801 Remove tooltips settings for user 2020-04-28 12:44:47 +02:00
aignatov-bio
f313b6ff01
Merge pull request #2492 from aignatov-bio/ai-sci-4339-refactor-login-screen 
Update css for login screen [SCI-4339]
 2020-04-02 15:47:17 +02:00
Alex Kriuchykhin
92279d07ad
Merge pull request #2437 from aignatov-bio/ai-sci-4380-saving-navigation-state 
Refactor sidebar [SCI-4380]
 2020-03-30 09:56:51 +02:00
aignatov-bio
b9e81f208d Fix i18n 2020-03-27 10:34:06 +01:00
aignatov-bio
8ff4b540e2 Update css for login screen 2020-03-27 09:43:49 +01:00
Oleksii Kriuchykhin
4db810c18f Fix taken space display for teams [SCI-4479] 2020-03-23 16:32:05 +01:00
Mojca Lorber
ea755eaea7 Change default date in preferences 2020-03-17 15:52:57 +01:00
aignatov-bio
8b273acaca Update all sidebars 2020-02-28 14:03:08 +01:00
Oleksii Kriuchykhin
62c19f7c02 Add invite users to the team permission check [SCI-4381] 2020-02-26 17:25:38 +01:00
Mojca Lorber
509e197f64 Change repository name and team name to h2 2020-02-11 13:18:33 +01:00
Mojca Lorber
e70bc67146 Implement missing style guide changes 2020-01-31 14:11:37 +01:00
Mojca Lorber
981f8678df Fix alerts style 2020-01-21 15:21:40 +01:00
aignatov-bio
54c78cf4d1
Merge pull request #2262 from aignatov-bio/ai-sci-update-global-styles 
Update colors and buttons
 2020-01-08 12:30:51 +01:00
aignatov-bio
68646276f5 Replace bootstrap styles for button 2020-01-07 16:13:34 +01:00
Oleksii Kriuchykhin
d9b9243da7 Merge branch 'develop' into features/new-column-types 2020-01-07 16:03:33 +01:00
aignatov-bio
464d03558a Fix markup, replace buttons and add new logo 2020-01-06 10:40:20 +01:00
aignatov-bio
ef3814ccec Add new buttons to protocols, tasks, experiments, projects 2020-01-06 10:40:20 +01:00
Oleksii Kriuchykhin
ff4ef818fb Implement SSO with Azure AD [SCI-4142] 2019-12-10 17:24:53 +01:00
Oleksii Kriuchykhin
03667f619f Merge branch 'release-1-17-7' into develop 2019-12-05 13:03:39 +01:00
Urban Rotnik
3a76753b72 Add Edit renderer for ListColumnType 2019-11-29 12:52:27 +01:00
Oleksii Kriuchykhin
6c7f45fc20 Add simplified view for sign-in form [SCI-4098] 2019-11-28 17:00:43 +01:00
Oleksii Kriuchykhin
f5abb7c767 Add connected accounts section to settings [SCI-4106] 2019-11-27 23:16:25 +01:00
aignatov-bio
3322676373 Replace RTE with simple textarea 2019-11-27 12:37:33 +01:00
aignatov-bio
7fa753ca81 Fix name update and path to team 2019-11-23 23:20:38 +01:00
aignatov-bio
96523ae131 Update CSS for team preferences and enable autosave 2019-11-22 10:46:44 +01:00
aignatov-bio
56ae32323c Add autosave for protocol keywords and user preferences 2019-11-20 14:57:53 +01:00
aignatov-bio
a9690482d1 Add autosave feature to text fields 2019-11-12 11:26:18 +01:00
Mojca Lorber
16eddc0ad0 Save on click away, inline editing 2019-11-03 14:59:30 +01:00
Mojca Lorber
7b86a3932a Additional avatar small fixes 2019-10-30 15:23:14 +01:00
Mojca Lorber
a0873cb16d Small improvements in the avatar settings 2019-10-29 13:21:22 +01:00
aignatov-bio
54627faeb3 Fix tests 2019-10-11 11:46:51 +02:00
aignatov-bio
521a367960 Add predefined avatars 2019-10-11 11:46:51 +02:00
aignatov-bio
1f43f35073 First modal 2019-10-11 11:46:51 +02:00
Oleksii Kriuchykhin
973efa55e1 Merge branch 'master' into ok_SCI_3678 2019-08-08 11:17:07 +02:00
Jure Grabnar
d9f6c249f9 Fix CVE-2015-9284 omniauth security precautions 
Close SCI-3588
 2019-07-31 16:59:38 +02:00
Jure Grabnar
6546bd1532 Add omniauth-rails_csrf_protection gem 
Close SCI-3588
 2019-07-31 16:05:06 +02:00
Oleksii Kriuchykhin
9d926dc956 Refactor TinyMce assets, user avatars, zip files [SCI-3539] 2019-07-05 16:56:05 +02:00
aignatov-bio
cd7460a4bd
Add croppie tool to avatar editing [SCI-3502] (#1801) 
* Add croppie tool to avatar editing
 2019-05-31 15:44:27 +02:00
Mojca Lorber
eac90109f7 Change ownership of inventory items, when a user leaves a team 2019-04-26 10:47:08 +02:00
aignatov-bio
606708987f
Notification changes on settings page [SCI 3084] (#1517) 
* Fix css and update text settings
 2019-02-22 13:20:51 +01:00
Urban Rotnik
29d77ca81d Add system_notification sending email feature 2019-02-19 11:20:25 +01:00
Miha Mencin
126a031498 SCI-2928 moving team modal js file to application.js.erb in order to run the first time when page is loaded 2019-01-23 15:30:23 +01:00
Oleksii Kriuchykhin
5ea5b76d39 Change sample date in date format settings [SCI-2907] 2019-01-03 14:15:41 +01:00
Oleksii Kriuchykhin
23f8602872 Use fixed date example in date format dropdown [SCI-2907] 2018-12-13 17:53:04 +01:00
mlorb
8170e1b367
Merge pull request #1414 from mlorb/ml-sci-2899 
Fix invited member is added multiple times to team [SCI-2899]
 2018-12-12 11:26:41 +01:00
mlorb
d761a81b26 fix download link in email again 2018-12-07 15:02:45 +01:00
mlorb
d37f3a3c09 fix invited member is added multiple times to team 2018-12-07 11:36:26 +01:00
mlorb
5dee804006 fix download exported project from email link 2018-12-06 09:42:58 +01:00
mlorb
398c2f0576
Merge pull request #1392 from mlorb/ml-sci-2676 
Hide sign-in with third party applications (e.g. LinkedIn) in Oauth… [SCI-2676]
 2018-11-27 11:06:45 +01:00
mlorb
18d9ab5888 fixes upon @Ducz0r request 2018-11-26 14:23:26 +01:00
Luka Murn
87ff7c71e3 Update the delivery email look & feel 
Closes SCI-2884.
 2018-11-23 17:24:10 +01:00
mlorb
f61187dd18 Hide sign-in with third party applications (e.g. LinkedIn) in Oauth flows 2018-11-23 15:44:04 +01:00
Oleksii Kriuchykhin
537de596a7 Merge latest master [SCI-2778] 2018-11-14 13:05:57 +01:00
Luka Murn
84df2c81f9 Merge branch 'features/export-all' 
Conflicts:
	app/controllers/experiments_controller.rb
	app/controllers/my_modules_controller.rb
	db/schema.rb
 2018-11-13 09:14:02 +01:00
Oleksii Kriuchykhin
8d0dbc7076 Add time format selection to settings [SCI-2778] 2018-11-09 16:19:40 +01:00
Luka Murn
42793d25b7 Add bottom padding to sign in/up/forgot password pages 
Closes SCI-2764.
 2018-10-24 13:57:58 +02:00
Luka Murn
95340bcf36 Update team name placeholder & sublabel on sign up pages 2018-10-24 13:43:56 +02:00
Jure Grabnar
d7c875135e
Merge pull request #1304 from jbargu/jg_zipfile_structure 
Create zipfile structure for export all, implement inventory CSV for export [SCI-2640] [SCI-2642] [SCI-2643] [SCI-2644]
 2018-10-05 15:36:56 +02:00
Luka Murn
d71be76657 Fix minor styling & text on settings - preferences page 2018-10-02 13:59:19 +02:00
Luka Murn
63b4f7d909
Merge pull request #1274 from Zanz2/zz_in_app_tooltips_help_sci2662 
Added Tooltips (bootstrap popovers) for various elements in scinote [SCI-2662]
 2018-09-24 16:23:53 +02:00
Jure Grabnar
7877d559a3 Update email/notification, type: deliver 
Closes [SCI-2643], [SCI-2644].
 2018-09-23 18:45:13 +02:00
Luka Murn
586a442abc Refactor the settings page, rename setting to tooltips_enabled 2018-09-05 16:36:32 +02:00
Zanz2
1bed2c2a3c Partially fixed according to pull request review, added comments to code review 2018-08-31 12:11:51 +02:00
Zanz2
d4aa5e60a2 Merge branch 'master' of https://github.com/biosistemika/scinote-web into zz_tooltip_settings_enable_sci2663 
Merging to update db, so i dont have to docker-clean my whole environment 2 times to switch between this branch and up to date ones
 2018-08-31 11:42:26 +02:00
Zanz2
2d1d4c78bc
Merge branch 'master' into zz_in_app_tooltips_help_sci2662 2018-08-21 11:27:01 +02:00