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

222 commits

Author SHA1 Message Date
miha
e610683d5c [SCI-5623] added external_id setting to user 2021-04-14 09:44:09 +02:00
Oleksii Kriuchykhin
67302da968 Add settings to reports [SCI-5612] 2021-04-08 17:40:16 +02:00
Oleksii Kriuchykhin
f7c865974d Switch to graphviz gem [SCI-5596] 2021-03-25 17:42:57 +01:00
Urban Rotnik
347f208480 Bring back old notifications 
SCI-4140
 2021-02-25 11:59:14 +01:00
Oleksii Kriuchykhin
49194d1a45 Prepare initial user roles in the database [SCI-5435] 2021-02-22 11:58:40 +01:00
Oleksii Kriuchykhin
1e3e701788 Add models for new permissions objects [SCI-5434] 2021-02-04 14:08:20 +01:00
Oleksii Kriuchykhin
f43340a849 Fix projects visibility in the sidebar [SCI-5338] 2021-01-05 13:50:42 +01:00
Oleksii Kriuchykhin
f150a11c4f Archiving: add 'archived' flag on folder [SCI-5268] 2020-12-17 12:47:23 +01:00
aignatov-bio
6a44e23697
Add projects sidebar [SCI-5178] (#2995) 
* Add projects sidebar navigation [SCI-5178]
 2020-12-08 16:07:26 +01:00
Urban Rotnik
a259800590 Merge branch 'develop' into jg_sci_2228 2020-08-31 16:29:23 +02:00
aignatov-bio
ddfe8231d8 Merge branch 'features/2fa' into develop 2020-07-22 11:56:36 +02:00
Mojca Lorber
f7083a000a Add devise lockable to user 2020-07-14 14:49:51 +02:00
aignatov-bio
c592954400 Add UX 2020-07-13 16:05:23 +02:00
aignatov-bio
fef6e5f1db Add recovery strategy for 2fa 2020-07-09 17:01:00 +02:00
aignatov-bio
13f7653667 Merge branch 'develop' into features/2fa 2020-07-07 13:05:45 +02:00
aignatov-bio
9b33cbc104 Rename ensure 2fa method 2020-07-02 11:24:33 +02:00
aignatov-bio
46256c89c9 Fix tests 2020-07-01 15:44:52 +02:00
aignatov-bio
742fb0d27b Small 2fa improvments 2020-07-01 14:41:55 +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
Urban Rotnik
de8aca9dbd Rename column 2020-06-29 10:42:19 +02:00
Urban Rotnik
88f54b16d7 Add 2fa fields to user 2020-06-24 17:58:58 +02:00
Mojca Lorber
6e8062179c Implement archiving and restoring of whole inventories 2020-06-18 18:07:23 +02:00
Urban Rotnik
ebbce8d09e Add restore columns to migrations 2020-06-09 18:43:22 +02:00
Mojca Lorber
a9a278409c Fix test 2020-06-08 16:22:37 +02:00
Mojca Lorber
42d6d727b9 Add archive to repository rows 2020-06-04 23:29:37 +02:00
Mojca Lorber
d3806e53a5 Add archive to repository 2020-06-04 15:44:47 +02:00
Urban Rotnik
5c72200801 Remove tooltips settings for user 2020-04-28 12:44:47 +02:00
Oleksii Kriuchykhin
943285d4a0 Fix Azure AD user creation on sign in [SCI-4544] 2020-04-22 16:47:06 +02:00
Oleksii Kriuchykhin
9d0d75acc5 Add API endpoints for new column types [SCI-4276] 2020-02-18 15:13:46 +01:00
Oleksii Kriuchykhin
522ae12f08 Merge branch 'develop' into ok_SCI_3988 2020-01-07 17:07:22 +01:00
Oleksii Kriuchykhin
d9b9243da7 Merge branch 'develop' into features/new-column-types 2020-01-07 16:03:33 +01:00
Oleksii Kriuchykhin
1b902ff4b3 Merge branch 'develop' into ok_SCI_3988 2020-01-07 15:26:30 +01:00
Alex Kriuchykhin
792e6f2eb9
Merge pull request #2263 from okriuchykhin/ok_SCI_4142 
Implement SSO with Azure AD [SCI-4142]
 2019-12-12 16:12:40 +01:00
Oleksii Kriuchykhin
1aa334fdaa Merge branch 'develop' into release-1-17-8 2019-12-11 10:55:00 +01:00
Oleksii Kriuchykhin
ff4ef818fb Implement SSO with Azure AD [SCI-4142] 2019-12-10 17:24:53 +01:00
Mojca Lorber
a3a5b21951 small fixes 2019-12-10 12:02:08 +01:00
mlorb
1122fe2d2f
Merge branch 'features/new-column-types' into ml-sci-4029 2019-12-10 10:54:41 +01:00
Urban Rotnik
e764e856d8 Fix syntax error 2019-12-10 09:40:40 +01:00
Mojca Lorber
8503dd7007 Add numeric repository column type 2019-12-09 16:38:21 +01:00
aignatov-bio
09079fbcda Fix naming and tests 2019-12-09 13:48:36 +01:00
aignatov-bio
d8676596f1 Add checklists column type 2019-12-09 13:48:36 +01:00
Oleksii Kriuchykhin
7a89cae56f Fix TinyMCE images and avatars for export all [SCI-4107] 2019-12-05 13:27:17 +01:00
Urban Rotnik
b591346a3f Add DateTime type column 2019-11-29 10:19:13 +01:00
Urban Rotnik
c00a837105 Add models for RepositoryStatus column type 2019-11-29 10:16:43 +01:00
Oleksii Kriuchykhin
6b20a10473 Refactor Azure configuration [SCI-4098] 2019-11-26 15:09:40 +01:00
Oleksii Kriuchykhin
b2862b6c9e Remove Paperclip DB columns and fix experiment templates [SCI-3988] 2019-11-18 14:16:28 +01:00
Anton Ignatov
7b855f54ac Finish main part of selectors 2019-11-18 13:59:54 +01:00
aignatov-bio
9950a23188 Replace base64 avatars with url 2019-10-22 12:27:13 +02:00
Anton Ignatov
646107a35b Fix error on task copy 2019-09-23 16:33:57 +02:00
Oleksii Kriuchykhin
c068901b00 Upgrade Rails to 6.0 [SCI-3745] 2019-09-12 17:24:08 +02:00
aignatov-bio
a3b2c7d5fe
Fix report image issues [SCI-3772] (#1983) 
* Fix report image issues

* Small fixes
 2019-09-12 09:02:45 +02:00
Anton Ignatov
e2e876b2a3 Merge branch 'activestorage_migration' into ai-sci-3728-fix-active-storage-tests 2019-08-05 13:51:04 +02:00
Anton Ignatov
84fe10df47 Fix tests for models and tema import/export 2019-07-26 12:40:36 +02:00
Luka Murn
83bb89fdf5 Cherry-picked commit from ZZ (and LM)'s various changes 2019-07-26 10:13:14 +02:00
Anton Ignatov
57a273d5d0 Merge branch 'activestorage_migration' into features/marvinjs-integration 2019-07-12 11:34:41 +02:00
Oleksii Kriuchykhin
a1941a21dc Futher refactoring of old Paperclip methods [SCI-3539] 2019-07-09 10:28:15 +02:00
Oleksii Kriuchykhin
9d926dc956 Refactor TinyMce assets, user avatars, zip files [SCI-3539] 2019-07-05 16:56:05 +02:00
aignatov-bio
7a3eedf461
Adding missing avatars to comments (#1838) 2019-06-14 16:20:13 +02:00
Urban Rotnik
f19eeba8dc Add factory valid check for User's associations 2019-06-10 12:24:04 +02:00
Luka Murn
8b116d9de7 Fix the user.activities association so it works 
Closes SCI-3494.
 2019-05-22 15:42:50 +02:00
Oleksii Kriuchykhin
40550f92c9 Improve HTML data escaping in JSON endpoints [SCI-3403] 2019-05-08 17:38:24 +02:00
Urban Rotnik
22af36dd2d Fix for exports_left, fix for some edge cases 2019-04-16 09:59:02 +02:00
Urban Rotnik
caccf8d9f0 Reset counter for export in last 24 hours 
Fix for check if user has avaiable exports, bit refactored increas_counter method.
 2019-04-10 10:56:33 +02:00
aignatov-bio
e2e299b424
Add dynamic generating filters for global activities [SCI-3228] (#1644) 
* Add dynamic generating filters

* Add url methods
 2019-04-09 09:08:27 +02:00
Oleksii Kriuchykhin
7d4fbcb32e Fix unconfirmed users clean-up issues [SCI-3172] 2019-03-29 11:11:53 +01:00
Miha Mencin
4a87216a3d
Merge branch 'master' into features/global-activities 2019-03-25 14:35:24 +01:00
Anton Ignatov
a6666c688c Adding check for user tutorial 2019-02-27 13:55:46 +01:00
Urban Rotnik
3ad6cee766 Fix tests, remove nullable field 2019-02-25 16:50:38 +01:00
aignatov-bio
c598541e09
System notification modal window [SCI-2957 and SCI-2958] (#1484) 
* Added new system notification modal

* Adding loading system notification on sign in
 2019-02-15 13:07:29 +01:00
Urban Rotnik
3e2c9934d0 Add SystemNotification model 
- SystemNotifiction model with spec
- UserSystemNotification model for many-many association
 2019-01-29 11:40:26 +01:00
Urban Rotnik
247bae8a9f Refactor export_all_counter increasing/reseting logic 
- Remove daily task
- Add method to user Model
 2019-01-25 11:16:31 +01:00
Alex Kriuchykhin
d524a1d508
Merge pull request #1364 from okriuchykhin/ok_SCI_2778 
Add time format selection to settings [SCI-2778]
 2018-11-19 10:17:09 +01:00
Luka Murn
e9c0b34662 Merge branch 'core-api' into 'master' 
Conflicts:
	Gemfile
	app/services/api.rb
	config/initializers/api.rb
	config/initializers/extends.rb
	config/routes.rb
	db/schema.rb
	spec/controllers/api/api_controller_spec.rb
 2018-11-14 16:59: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
mlorb
4d156080ac fix empty projects page bug and projects tree bug 2018-11-07 13:45:46 +01:00
Matej Zrimšek
18e52e2c6f Fix fetching all user projects [SCI-2787] 2018-10-24 00:29:30 +02:00
Oleksii Kriuchykhin
02f536cd08 Merge latest features/export-all [SCI-2733] 2018-10-16 17:20:19 +02:00
Jure Grabnar
2558b7a313 Fix formatting according to HoundBot 2018-10-16 11:00:38 +02:00
Jure Grabnar
26df1e5a98 Add export project modal 
Closes [SCI-2645]
 2018-10-16 11:00:38 +02:00
Oleksii Kriuchykhin
f221d71bbc Fix datatables state restore [SCI-2733] 2018-10-12 15:15:43 +02:00
Luka Murn
cbb5bda7fe Hound is love, Hound is life 2018-09-05 16:42:15 +02:00
Luka Murn
586a442abc Refactor the settings page, rename setting to tooltips_enabled 2018-09-05 16:36:32 +02:00
Zanz2
384371802c fixes travis 2018-08-31 13:12:34 +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
beb1d02914 Made fiew part for toggler, now debugging why checkbox doenst render properly and why it defaults to false always 2018-08-20 15:57:09 +02:00
Oleksii Kriuchykhin
ecde634a2c Add OAuth2 provider [SCI-2515] 2018-08-17 13:17:59 +02:00
Oleksii Kriuchykhin
0e372af729 Adds API authentication with Azure AD [SCI-2608] 2018-07-24 14:21:33 +02:00
zmagod
2def874ffd fixes project duplication [fixes SCI-2486] 2018-06-05 09:44:03 +02:00
Oleksii Kriuchykhin
8de0e282e3 Fix project_tree for non admin users [SCI-2478] 2018-06-01 16:38:49 +02:00
Oleksii Kriuchykhin
2ddc0fb561 Improve sidebar rendering performance [SCI-2478] 2018-06-01 13:49:02 +02:00
Luka Murn
5e90ae7383 Remove uneccesary save when setting notification settings on user 
These methods should behave as the rest of setters on
ActiveRecords, ergo setting the model state, but not saving it.

The save is called at the end of the action inside the controller
anyway, so this save is redundant.
 2018-05-18 13:43:04 +02:00
Zmago Devetak
19d5c687ef
remove unneeded :rememberable module 2018-05-03 14:35:59 +02:00
zmagod
0584453575 fixes per @okriuchykhin 's request 2018-04-26 17:18:03 +02:00
Oleksii Kriuchykhin
a105e61d48 Remove tutorial [SCI-1860] 2018-03-18 13:18:05 +01:00
mlorb
08439e7f58 sign up with linkedIn account 2018-02-28 18:12:21 +01:00
zmagod
f8a3fca2db Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling 2018-01-23 11:06:33 +01:00
zmagod
862b73cae7 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1866 2018-01-05 09:13:43 +01:00