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
14661 commits 31 branches 181 tags 166 MiB
Commit graph

505 commits

Author SHA1 Message Date
Martin Artnik
0f417f9730 Merge branch 'develop' into features/barcodes 2021-07-29 13:32:17 +02:00
Martin Artnik
67f4e81a3a Merge branch 'develop' into features/new_permissions 2021-07-28 15:16:47 +02:00
Martin Artnik
b32b207f3d Added FLUICS API client [SCI-5939] 2021-07-23 13:52:28 +02:00
Martin Artnik
662370d2bd Removed auto-disable, fixed ActiveJob + DelayedJob retry handling [SCI-5800] 2021-07-22 13:43:36 +02:00
Martin Artnik
4bb080c25b Merge migrations, code fixes [SCI-5800] 2021-07-22 10:51:03 +02:00
Martin Artnik
026bc1eaae Fixed migration [SCI-5902] 2021-07-20 09:35:39 +02:00
artoscinote
5f9c04844f
Added prefixed IDs to repository rows (items) [SCI-5909] (#3441) 
* Added prefixed IDs to repository rows (items) [SCI-5909]

* Fix prefixed id queries to work with joins, use subquery in repository search [SCI-5909]

* Fixed accessing repository_row parent code [SCI-5909]

* Better handling of repository_row code display [SCI-5909]

* Fix index warning for id prefixed models issue setting up project [SCI-5909]
 2021-07-19 14:23:36 +02:00
Martin Artnik
a8f8ab8ba9 Implement label templates with default ZPL template [SCI-5902] 2021-07-19 09:44:14 +02:00
Oleksii Kriuchykhin
d1208bad0b Merge branch 'develop' into features/new_permissions 2021-07-07 13:44:36 +02:00
Martin Artnik
524ea05873 Fix migration rollback [SCI-5828] 2021-06-30 10:37:11 +02:00
Martin Artnik
3e1f0fe109 Migration code style fix [SCI-5828] 2021-06-30 10:28:55 +02:00
Martin Artnik
e1b0b65465 Improved code style, fixed bug [SCI-5828] 2021-06-29 15:57:23 +02:00
zmagoD
9c812e84bd setup logic to group assign all team members and handle the unassignments logic 2021-06-27 13:22:19 +02:00
Martin Artnik
d67d53b926 Code style fixes 2021-06-22 13:27:03 +02:00
Martin Artnik
eaa713f5b8 Fix indices [SCI-5829] 2021-06-22 12:51:25 +02:00
Martin Artnik
a9d6c4bb94 Code style fixes [SCI-5828] 2021-06-18 14:19:35 +02:00
Martin Artnik
29ff910eba Added searching experiments by EX[ID] [SCI-5829] 2021-06-18 14:12:59 +02:00
Martin Artnik
c6648111f3 Code style fixes [SCI-5800] 2021-06-17 22:00:13 +02:00
Martin Artnik
47071e23a1 Added specs for webhooks 2021-06-17 14:54:30 +02:00
Martin Artnik
4ee50f87d5 Implement webhook service and scheduling jobs [SCI-5801, SCI-5802] 2021-06-17 09:19:04 +02:00
zmagoD
8997ba10d1 mark user assigmetns when they are created manually or automatically 2021-06-12 09:36:41 +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
16f83a3e60 Remove docx preview processing flag [SCI-5601] 2021-06-09 10:58:27 +02:00
aignatov-bio
bf781c2ca4 Small fixes [SCI-5765] 2021-06-01 10:58:05 +02:00
aignatov-bio
3c7592657c Add activity filters [SCI-5765] 2021-05-31 13:39:10 +02:00
aignatov-bio
2be59bf8b2 Add pdf preview for docx reports [SCI-5601] 2021-05-25 15:14:50 +02:00
Oleksii Kriuchykhin
29c83ffbb1 Merge branch 'develop' into features/new-reports 2021-05-21 11:04:17 +02:00
Oleksii Kriuchykhin
a175e83a16 Add generation error states to reports [SCI-5702] 2021-05-11 14:52:02 +02:00
zmagoD
c0eb38b564 Merge branch 'develop' of https://github.com/biosistemika/scinote-web into features/new_permissions 2021-05-08 10:33:43 +02:00
Oleksii Kriuchykhin
b67f2a21f5 Add default settings to existing reports [SCI-5619][SCI-5672] 2021-05-06 17:33:58 +02:00
miha
4c29de62be [SCI-5635] Use update_column in the migration in order to avoid callbacks 2021-04-13 10:28:41 +02:00
miha
b6a4a5326f replace .find with .find_each 2021-04-12 13:57:03 +02:00
miha
56ebc3dc07 [SCI-5635] add a migration to fix broken steps, fix the api so it sets last_modified_by_id, minor step model refactor 
migration fix

remove the conditoin for set_last_modified_by callback

set the last_modified_by_id in before_save callback (in case it is not set yet)

remove trailing spaces

Set last modified in protocl import service
 2021-04-12 09:59:00 +02:00
Oleksii Kriuchykhin
67302da968 Add settings to reports [SCI-5612] 2021-04-08 17:40:16 +02:00
Oleksii Kriuchykhin
a9ac8452f2 Add dynamic form elements in report wizard step 1 [SCI-5591] 2021-04-06 13:56:24 +02:00
Oleksii Kriuchykhin
d006b813b9 Add pdf and docx attachments to reports [SCI-5558] 2021-03-15 13:30:03 +01:00
aignatov-bio
df4297f6f7 Merge branch 'develop' into features/local_file_previews 2021-03-08 11:30:47 +01:00
Oleksii Kriuchykhin
d8cffe53c7 Add migration for new user assignments to projects [SCI-5478] 2021-03-01 14:28:21 +01:00
Oleksii Kriuchykhin
49194d1a45 Prepare initial user roles in the database [SCI-5435] 2021-02-22 11:58:40 +01:00
Oleksii Kriuchykhin
afbd763125 Update Doorkeeper configuration [SCI-5497] 2021-02-17 12:54:28 +01:00
Oleksii Kriuchykhin
1e3e701788 Add models for new permissions objects [SCI-5434] 2021-02-04 14:08:20 +01:00
Oleksii Kriuchykhin
75da67b937 Update Rails to 6.1.1, ruby to 2.7.2 [SCI-5459] 2021-01-28 14:43:45 +01:00
Oleksii Kriuchykhin
67b3f853d7 Merge branch 'develop' into features/folders 2020-12-18 14:51:21 +01:00
Oleksii Kriuchykhin
f150a11c4f Archiving: add 'archived' flag on folder [SCI-5268] 2020-12-17 12:47:23 +01:00
Oleksii Kriuchykhin
2a666a3718 Implement additional preview type PDF of the whole document [SCI-5297] 2020-12-16 12:51:10 +01:00
Oleksii Kriuchykhin
62374bee0a Implement the 'seen comments' functionality (red dot) for the comments [SCI-5253] 2020-12-07 11:04:33 +01:00
Mojca Lorber
8aed48d1ae Merge branch 'develop' into features/office-file-previews 2020-11-02 13:45:06 +01:00
aignatov-bio
12991e8fd3 Commit add asset preview mode switcher to step 2020-10-29 16:42:05 +01:00
Oleksii Kriuchykhin
e87407bbd3 Create database structure for project folders [SCI-5126] 2020-10-29 15:44:21 +01:00
Urban Rotnik
1089e7e4fd Merge branch 'jg_sci_2228' of github.com:jbargu/scinote-web into jg_sci_2228 2020-10-22 14:27:32 +02:00
Urban Rotnik
aa1520bfb8 Merge branch 'develop' into jg_sci_2228 2020-10-22 14:21:39 +02:00
aignatov-bio
0a4b89cf39 Merge branch 'develop' into features/office-file-previews 2020-10-15 15:19:56 +02:00
Oleksii Kriuchykhin
a7c6ab9d89 Move some consequence executon into background process [SCI-4978] 2020-09-11 16:18:39 +02:00
Urban Rotnik
9bddac5191 Check if indexes exists in DB 2020-09-07 10:55:05 +02:00
Oleksii Kriuchykhin
a508b07275 Add view mode field to the Asset model [SCI-4958] 2020-09-02 15:02:56 +02:00
Urban Rotnik
a259800590 Merge branch 'develop' into jg_sci_2228 2020-08-31 16:29:23 +02:00
aignatov-bio
6229ba6041 Add morkflow generator 2020-08-27 12:13:13 +02:00
aignatov-bio
c07ebe90fa Add migration for task states 2020-08-27 11:34:59 +02:00
Urban Rotnik
a5fb873d19 Add default workflow 2020-08-27 10:54:39 +02:00
Urban Rotnik
7c14da70d9
Merge branch 'features/task-flows' into develop_to_task_flows 2020-08-04 14:50:46 +02:00
aignatov-bio
15b5f9bb68 Add ordering for result page 2020-07-28 15:39:29 +02:00
aignatov-bio
ddfe8231d8 Merge branch 'features/2fa' into develop 2020-07-22 11:56:36 +02:00
Oleksii Kriuchykhin
7fd004baa8 Prepare database structure and relations for statuses phase one [SCI-4825] 2020-07-17 18:04:09 +02:00
Mojca Lorber
532f6dfc03 Fix uniqueness 2020-07-17 16:37:32 +02:00
Mojca Lorber
d8794972d5 Change migration 2020-07-17 16:35:03 +02:00
Mojca Lorber
b087a8cbce Add migrations for devise lockable 2020-07-14 14:53:20 +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
c479c6100c Clear table state on error 2020-07-01 12:49:24 +02:00
Urban Rotnik
de8aca9dbd Rename column 2020-06-29 10:42:19 +02:00
aignatov-bio
6c7edbb9be Fix markup 2020-06-26 14:32:55 +02:00
aignatov-bio
2da0a6c6bf Improve repository state migration 2020-06-26 14:31:10 +02:00
Urban Rotnik
88f54b16d7 Add 2fa fields to user 2020-06-24 17:58:58 +02:00
aignatov-bio
d940d1e43d Add new line 2020-06-24 10:00:34 +02:00
aignatov-bio
0dff84cae0 Update migration 2020-06-24 09:51:24 +02:00
aignatov-bio
0fe4ee0eae Add migration for repository states 2020-06-22 16:47:42 +02:00
Urban Rotnik
ebbce8d09e Add restore columns to migrations 2020-06-09 18:43:22 +02:00
mlorb
75f2a49cc4
Merge branch 'features/inventory-archiving' into ml-sci-4689 2020-06-08 16:30:24 +02:00
Mojca Lorber
42d6d727b9 Add archive to repository rows 2020-06-04 23:29:37 +02:00
aignatov-bio
4a6d7d0e12 Add archived inventories 2020-06-04 19:07:10 +02:00
Mojca Lorber
d8523e03c8 Add db changes 2020-06-04 16:08:29 +02:00
Mojca Lorber
d3806e53a5 Add archive to repository 2020-06-04 15:44:47 +02:00
Oleksii Kriuchykhin
c74fa3c244 Make snapshots selectable [SCI-4596] 2020-05-13 17:58:05 +02:00
Oleksii Kriuchykhin
307a5d7e1b Improve code style in migration [SCI-4552] 2020-04-29 10:42:00 +02:00
Oleksii Kriuchykhin
e6ad5047e0 Implement background processing of repository snapshots [SCI-4552] 2020-04-28 12:09:36 +02:00
Oleksii Kriuchykhin
3a67c99982 Switch to STI for repositories, fix cell values snapshotting [SCI-4516] 2020-04-09 12:33:04 +02:00
Oleksii Kriuchykhin
a9c3102835 Add repository snapshots with service, refactor item assigning [SCI-4516] 2020-04-07 18:26:39 +02:00
Oleksii Kriuchykhin
3c53be1f9a Add start date to the task [SCI-4504] 2020-03-31 14:17:14 +02:00
Oleksii Kriuchykhin
c2409bbfef Update structure.sql [SCI-4330] 2020-02-07 15:30:15 +01:00
Oleksii Kriuchykhin
6f8f89fbf0 Improve speed of global activities fetching query [SCI-4330] 2020-02-07 13:53:25 +01:00
Urban Rotnik
1531a2f47e Structure.sql fix 2020-01-22 12:25:07 +01:00
Oleksii Kriuchykhin
fc4cd6d14c Fix includes in transactions [SCI-4251] 2020-01-16 17:14:20 +01:00
Oleksii Kriuchykhin
1c33885754 Fix status item migration [SCI-4251] 2020-01-16 16:05:49 +01:00
Oleksii Kriuchykhin
8c2b1e5037 Fix global search for repositories and checklists update [SCI-4251] 2020-01-16 15:30:19 +01:00
Alex Kriuchykhin
da26d8a018
Merge pull request #2304 from okriuchykhin/ok_SCI_4204 
Refactor repository cell cloning to support all data types [SCI-4204]
 2020-01-15 13:04:50 +01:00
Oleksii Kriuchykhin
9e8bd23616 Merge latest branch 'develop' into ok_SCI_3988 2020-01-15 10:52:20 +01:00
Oleksii Kriuchykhin
eed68a2590 Refactor repository cell clonning to support all data types [SCI-4204] 2020-01-14 16:55:10 +01:00
Oleksii Kriuchykhin
7b82e33eb6 Fix repository filtering and improve speed [SCI-4224] 2020-01-13 16:09:07 +01:00
Oleksii Kriuchykhin
522ae12f08 Merge branch 'develop' into ok_SCI_3988 2020-01-07 17:07:22 +01:00
Oleksii Kriuchykhin
1b902ff4b3 Merge branch 'develop' into ok_SCI_3988 2020-01-07 15:26:30 +01:00
Oleksii Kriuchykhin
3e82b1ae89 Fix migrations [SCI-3988] 2020-01-07 13:43:32 +01:00
aignatov-bio
725bb449d5 Fix naming 2019-12-23 09:20:36 +01:00
aignatov-bio
54800cb69b Merge branch 'features/new-column-types' into ai-sci-4168-refactor-checklist-model 2019-12-20 15:46:39 +01:00
aignatov-bio
16c4879e56 Merge migrations and update sorting 2019-12-20 15:42:54 +01:00
aignatov-bio
dc91893d7e Refactor checklist column data structure 2019-12-18 14:10:41 +01:00
Urban Rotnik
7153711570 Move delimiter from column to metadata 2019-12-18 10:22:52 +01:00
aignatov-bio
7fc9c0d1e4 Adding frontend for checklist edit mode 2019-12-10 15:58:59 +01:00
Mojca Lorber
1c342d1d26 structure changes 2019-12-10 13:52:55 +01:00
Mojca Lorber
a3a5b21951 small fixes 2019-12-10 12:02:08 +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
Urban Rotnik
e934e08c17 Implement STI for DateTimeValue types 2019-12-06 12:50:19 +01:00
Urban Rotnik
f39af1916f Split DateTime and DateTimeRange column types, rename DateType table 2019-11-29 10:19:16 +01:00
Urban Rotnik
b9935ce7de structure.sql fix 2019-11-29 10:19:15 +01:00
Urban Rotnik
2a20ad68a3 Add range column to RepositoryColumn 2019-11-29 10:19:14 +01:00
Urban Rotnik
b591346a3f Add DateTime type column 2019-11-29 10:19:13 +01:00
Urban Rotnik
b2ce600820 Add delimiter column for repository_column 2019-11-29 10:19:10 +01:00
Urban Rotnik
24acf1f84b Fix edit mode for File and Text 2019-11-29 10:19:08 +01:00
Urban Rotnik
c00a837105 Add models for RepositoryStatus column type 2019-11-29 10:16:43 +01:00
Oleksii Kriuchykhin
b2862b6c9e Remove Paperclip DB columns and fix experiment templates [SCI-3988] 2019-11-18 14:16:28 +01:00
aignatov-bio
0801df6f9c Fix structure.sql 2019-11-18 13:59:55 +01:00
aignatov-bio
f428bc3921 Remove schema.rb 2019-11-18 13:59:55 +01:00
aignatov-bio
8fd4b46416 Fix migration conflict 2019-11-18 13:59:55 +01:00
aignatov-bio
cb5baa3d13 Fix migration 2019-11-18 13:59:54 +01:00
aignatov-bio
b1f9e7f1ca Fix global activities jsonb field [SCI-3830] (#2030) 
* Fix global activities jsonb field

* Fix tests
 2019-11-18 13:59:54 +01:00
Oleksii Kriuchykhin
53402c9ce1 Fix images in reports, impove speed of report generation [SCI-3990][SCI-3993] 2019-10-17 13:30:14 +02:00
Miha Mencin
e68b8f55c2
skip individual checking 2019-10-09 18:00:06 +02:00
Miha Mencin
2ef095b003
Additional check for attached workflowimages 2019-10-09 17:17:33 +02:00
Oleksii Kriuchykhin
de33cb5751 Rename prepared statement for experiment files migration [SCI-3949] 2019-10-09 17:04:43 +02:00
Oleksii Kriuchykhin
75ed617e34 Add AS migration for existing experiment images [SCI-3949] 2019-10-09 16:47:32 +02:00
Oleksii Kriuchykhin
ab395f46d0 Add paperclip for backward compatibility [SCI-3949] 2019-10-09 10:28:02 +02:00
Oleksii Kriuchykhin
52bbf6740d Remove paperclip attachments from migrations [SCI-3908] 2019-10-03 13:59:17 +02:00
Alex Kriuchykhin
2c3c690713
Merge pull request #2113 from okriuchykhin/ok_SCI_3839 
Remove the deprecated foreign keys from TinyMceAsset [SCI-3839]
 2019-10-02 10:39:35 +02:00
Oleksii Kriuchykhin
efe5d8a6ea Remove the deprecated foreign keys from TinyMceAsset [SCI-3839] 2019-10-01 15:49:37 +02:00
Oleksii Kriuchykhin
f00f594dbf Improve ActiveStorage migrations [SCI-3854] 2019-10-01 12:45:51 +02:00
Urban Rotnik
60a414c4ec Change migrations order back 2019-09-27 16:20:56 +02:00
Jure Grabnar
c748513ca9 Rename Active storage migration to a later date 2019-09-26 13:55:30 +02:00
Oleksii Kriuchykhin
b841d3dd6b Add override for ActiveStorage downloader to handle missing file checksums [SCI-3888] 2019-09-18 15:34:49 +02:00
aignatov-bio
64306cfb2a
Fix active storage migration script (#2060) 
* Fix active storage migration script

* Update check logic
 2019-09-18 09:20:04 +02:00
Oleksii Kriuchykhin
0475394b08 Fix test [SCI-3881] 2019-09-16 13:03:41 +02:00
Oleksii Kriuchykhin
3509543e7b Merge branch 'master' into ok_SCI_3881 2019-09-16 11:56:49 +02:00
Oleksii Kriuchykhin
bc38c6b29e Fix failing test [SCI-3745] 2019-09-16 10:26:13 +02:00
Oleksii Kriuchykhin
c068901b00 Upgrade Rails to 6.0 [SCI-3745] 2019-09-12 17:24:08 +02:00
Oleksii Kriuchykhin
419a4c8e8c Update trim_html_tags Postgres function [SCI-3726] 2019-08-30 16:42:03 +02:00
Oleksii Kriuchykhin
267c53c2d2 Refactor inventory sharing logic [SCI-3803] 2019-08-29 17:21:49 +02:00
Luka Murn
68e3fed14c Remove uneccesary pg sql extension from db/schema.rb 2019-08-23 16:04:24 +02:00
Urban Rotnik
0ce331227c Update permission and model to share repository over all teams 2019-08-13 14:07:24 +02:00
Urban Rotnik
1a77702fa7 Add uniq index for Repository and Team in TeamRepositories 2019-08-09 14:13:00 +02:00
Urban Rotnik
f569411bc7 Add TeamRepository model 2019-08-09 14:12:59 +02:00
Oleksii Kriuchykhin
d52df56fc4 Fix production build and update packages [SCI-3678] 2019-08-08 14:03:15 +02:00
Jure Grabnar
aa5431b153 Fix broken migrations 2019-08-05 18:22:07 +02:00
Luka Murn
6017f40cef Add migration to remove samples' associated data from DB 2019-07-26 10:28:05 +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
ffd415d409 Inital refactor for Assets model 2019-07-12 15:02:06 +02:00
Anton Ignatov
57a273d5d0 Merge branch 'activestorage_migration' into features/marvinjs-integration 2019-07-12 11:34:41 +02:00
Oleksii Kriuchykhin
9d926dc956 Refactor TinyMce assets, user avatars, zip files [SCI-3539] 2019-07-05 16:56:05 +02:00
Anton Ignatov
c9ae9f056e Merge branch 'okriuchykhin-ok_SCI_3539' into features/marvinjs-integration 2019-07-01 10:44:29 +02:00
Oleksii Kriuchykhin
5acb16d43e Update Asset helper methods [SCI-3539] 2019-06-28 08:17:09 +02:00
Oleksii Kriuchykhin
ba2daede0b Add migration scripts [SCI-3539] 2019-06-24 15:17:42 +02:00
Anton Ignatov
7e5c39d3e4 Merge branch 'master' into features/marvinjs-integration 2019-06-21 14:51:45 +02:00
aignatov-bio
9653f16196
Convert image to base64 in PDF reports [SCI-3557] (#1835) 
* Convert image to base64 in PDF reports

* Fix typo error
 2019-06-19 13:57:04 +02:00
Oleksii Kriuchykhin
109793c7fb Upgrade to Rails 5.2.3 and add ActiveStorage [SCI-3539] 2019-06-13 12:10:44 +02:00
Anton Ignatov
16d00340cd Fix merge errors 2019-05-31 10:35:04 +02:00
Anton Ignatov
c9a29b12ba Merge branch 'master' into features/marvinjs-integration 2019-05-31 10:27:14 +02:00
Oleksii Kriuchykhin
d46d82d0f0 Fix Hound warning [SCI-3368] 2019-05-21 10:56:55 +02:00
Oleksii Kriuchykhin
d3f29d5d72 Add type column to zip_exports for STI [SCI-3368] 2019-05-20 16:35:24 +02:00
Anton Ignatov
259b75a6ba Merge branch 'master' into features/marvinjs-integration 2019-05-16 09:28:48 +02:00
Anton Ignatov
652fba0e23 Merge branch 'master-with-note-section' 2019-05-13 11:08:11 +02:00
Urban Rotnik
2364c2653f Add bulk insert for UserSystemNotifications, New service for sending emails 2019-05-08 08:38:10 +02:00
Anton Ignatov
f80d881847 Fix markup 2019-04-28 19:11:41 +02:00
Anton Ignatov
46f0e0c0c2 Add marvin js assets to assets sort and name field 2019-04-27 12:46:45 +02:00
Anton Ignatov
fe620c4a63 Add marvin model and controller 2019-04-26 22:59:38 +02:00
Anton Ignatov
7d60eb5572 Fix migration issues 2019-04-23 11:11:22 +02:00
Anton Ignatov
aa2dab2014 Merge branch 'features/note-section' into master-with-note-section 2019-04-23 10:31:37 +02:00
aignatov-bio
6ac620feb3
Migration for old tinymce assets [SCI-3176] (#1663) 
* adding rake task

* Addign test for update images

* Adding tests for tiny mce model
 2019-04-19 15:24:54 +02:00
Oleksii Kriuchykhin
4014f19665 Update schema.rb file 2019-04-17 14:57:38 +02:00
aignatov-bio
8d7cc57da1
Add zoom to image annotation and check jpeg file quality before save [SCI-3300] (#1654) 
* Add zoom to image annotation and check jpeg file quality before save
* Move compression to front end
* Move quality extractor to paperclip processor
 2019-04-15 09:49:44 +02:00
aignatov-bio
08263ab64e
adding filters for task activities [SCI-3076] (#1553) 
* update task activity screen
 2019-03-28 10:55:48 +01:00
Miha Mencin
4a87216a3d
Merge branch 'master' into features/global-activities 2019-03-25 14:35:24 +01:00
Anton Ignatov
5d6f009ee8 fix error for delay deleting 2019-03-20 15:20:31 +01:00
Anton Ignatov
55c93922ea markup fixes 2019-03-20 14:46:54 +01:00
Anton Ignatov
07c2819163 refactoring tinymce image uploading 2019-03-20 14:46:54 +01:00
Anton Ignatov
87280f083a [SCI-3166] Finalize global activities front end 2019-03-19 13:50:55 +01:00
Urban Rotnik
ad8e5973fa Remove not null constraint from project_id in Activity table 2019-03-11 08:36:15 +01:00
Miha Mencin
6deaff6382 fixing hound errors 2019-03-04 18:36:32 +01:00
Miha Mencin
fa7bba9de7 scheduling creation of demo project at the sign in time 
remove wrong schema, fix comment, add migration
 2019-03-04 18:26:15 +01:00
Miha Mencin
51b3aea49a added uniquness validator and index on user_projects and user_teams relations 
finxing typo, fixied failing test

fixing mistakenly commited file

fixing schema to include bigint migration
 2019-02-27 15:09:47 +01:00
Urban Rotnik
3ad6cee766 Fix tests, remove nullable field 2019-02-25 16:50:38 +01:00
Urban Rotnik
5b5c6c7122 Changes to Activity model 2019-02-25 16:49:55 +01:00
Urban Rotnik
7b6c6c414d Merge branch 'master' into features/templates 2019-02-19 14:46:15 +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
aignatov-bio
5c85595ab4
System Notifications - View All Page [SCI-2956 and SCI-3001] (#1482) 
* System notification view and notification partial (SCI 2956 and SCI 3001)
 2019-02-13 13:06:14 +01:00
Urban Rotnik
8ebb7561d9 Add last_time_changed_at columnd to SystemNotifications 2019-01-31 16:44:20 +01:00
Oleksii Kriuchykhin
cc92de3726 Merge latest features/templates [SCI-2939] 2019-01-30 10:43:54 +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
Oleksii Kriuchykhin
f7b73c617a Fix code styling [SCI-2939] 2019-01-28 15:37:24 +01:00
Miha Mencin
4acd2a592d Adding previously forgotten schema file 2019-01-28 11:25:35 +01:00
Oleksii Kriuchykhin
bd2efa55ac Add templates business logic [SCI-2939] 2019-01-25 10:55:08 +01:00
Miha Mencin
6e16a63dcd implementing suggestion from alex, now table and indices names are hardoced 2019-01-21 11:02:33 +00:00