Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Started: 5.14.0 #7241

Merged
merged 15 commits into from
Feb 22, 2025
Merged

Started: 5.14.0 #7241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
3713bbe
added composer to dev dependancies
DawoudIO Feb 3, 2025
11fb1bb
rebulit
DawoudIO Feb 3, 2025
8f36f18
started 5.14.0
DawoudIO Feb 3, 2025
da69354
Merge branch 'master' into buid/5.14.0
DawoudIO Feb 3, 2025
d654fb7
Update ChurchCRM-Database.sql
DawoudIO Feb 3, 2025
441b438
Merge branch 'master' into buid/5.14.0
DawoudIO Feb 3, 2025
f6b82f6
Merge branch 'master' into buid/5.14.0
DawoudIO Feb 3, 2025
2693437
rolled back
DawoudIO Feb 3, 2025
b426f2f
Merge branch 'master' into buid/5.14.0
DawoudIO Feb 9, 2025
49ea785
Merge branch 'master' into buid/5.14.0
DawoudIO Feb 12, 2025
f017992
Merge branch 'master' into buid/5.14.0
DawoudIO Feb 19, 2025
bbc0673
Revert package-lock.json
DawoudIO Feb 19, 2025
2b388e1
Update package-lock.json
DawoudIO Feb 19, 2025
343c3d5
Merge branch 'master' into buid/5.14.0
DawoudIO Feb 22, 2025
9a11731
removed composer
DawoudIO Feb 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion demo/ChurchCRM-Database.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2242,7 +2242,7 @@ CREATE TABLE `version_ver` (
LOCK TABLES `version_ver` WRITE;
/*!40000 ALTER TABLE `version_ver` DISABLE KEYS */;
SET autocommit=0;
INSERT INTO `version_ver` VALUES (1,'3.5.0','2019-02-10 20:14:23',NULL),(2,'3.5.2','2019-09-10 22:54:56','2019-09-10 22:54:56'),(3,'3.5.4','2019-10-11 22:45:35','2019-10-11 22:45:35'),(4,'4.0.0','2020-06-16 13:11:20','2020-06-16 13:11:20'),(5,'4.1.0','2020-06-16 13:11:20','2020-06-16 13:11:21'),(6,'4.2.3','2020-10-17 01:46:16','2020-10-17 01:46:16'),(7,'4.3.1','2020-11-23 18:55:02','2020-11-23 18:55:02'),(8,'4.3.2','2020-12-10 01:57:09','2020-12-10 01:57:09'),(9,'4.4.0','2021-03-21 17:44:23','2021-03-21 17:44:23'),(10,'4.4.1','2021-05-09 13:58:09','2021-04-27 13:58:09'),(11,'4.4.2','2021-05-09 13:58:09','2021-04-27 13:58:09'),(12,'4.4.3','2021-05-09 13:58:09','2021-04-27 13:58:09'),(13,'4.4.4','2021-07-08 13:58:09','2021-07-08 13:58:09'),(14,'4.4.5','2021-07-09 13:58:09','2021-07-09 13:58:09'),(15,'4.5.0','2021-07-09 13:58:09','2021-09-03 13:58:09'),(16,'4.5.1','2022-12-03 14:02:00','2022-12-03 14:02:00'),(17,'4.5.2','2022-12-28 21:42:20','2022-12-28 21:42:20'),(18,'4.5.3','2023-01-01 20:32:08','2023-01-01 20:32:08'),(19,'5.0.0','2023-05-06 17:29:55','2023-05-06 17:29:55'),(20,'5.0.5','2023-10-21 19:04:42','2023-10-21 19:04:42'),(21,'5.1.0','2023-10-31 23:33:49','2023-10-31 23:33:49'),(22,'5.2.2','2023-11-05 12:28:43','2023-11-05 12:28:43'),(23,'5.2.3','2023-11-16 12:39:14','2023-11-16 12:39:14'),(24,'5.3.0','2023-11-18 11:10:21','2023-11-18 11:10:21'),(25,'5.3.1','2023-11-21 02:04:10','2023-11-21 02:04:10'),(27,'5.4.0','2023-12-03 20:27:58','2023-12-03 20:27:58'),(29,'5.4.3','2024-01-03 23:24:10','2024-01-03 23:24:10'),(30,'5.5.0','2024-01-03 23:43:18','2024-01-03 23:43:18'),(31,'5.6.0','2024-03-07 20:35:26','2024-03-07 20:35:26'),(32,'5.7.0','2024-03-08 11:58:40','2024-03-08 11:58:40'),(33,'5.8.0','2024-04-25 14:50:41','2024-04-25 14:50:41'),(35,'5.9.0','2024-07-13 17:23:00','2024-07-13 17:23:00'),(36,'5.13.0','2024-07-13 17:23:02','2024-07-13 17:23:02');
INSERT INTO `version_ver` VALUES (1,'3.5.0','2019-02-10 20:14:23',NULL),(2,'3.5.2','2019-09-10 22:54:56','2019-09-10 22:54:56'),(3,'3.5.4','2019-10-11 22:45:35','2019-10-11 22:45:35'),(4,'4.0.0','2020-06-16 13:11:20','2020-06-16 13:11:20'),(5,'4.1.0','2020-06-16 13:11:20','2020-06-16 13:11:21'),(6,'4.2.3','2020-10-17 01:46:16','2020-10-17 01:46:16'),(7,'4.3.1','2020-11-23 18:55:02','2020-11-23 18:55:02'),(8,'4.3.2','2020-12-10 01:57:09','2020-12-10 01:57:09'),(9,'4.4.0','2021-03-21 17:44:23','2021-03-21 17:44:23'),(10,'4.4.1','2021-05-09 13:58:09','2021-04-27 13:58:09'),(11,'4.4.2','2021-05-09 13:58:09','2021-04-27 13:58:09'),(12,'4.4.3','2021-05-09 13:58:09','2021-04-27 13:58:09'),(13,'4.4.4','2021-07-08 13:58:09','2021-07-08 13:58:09'),(14,'4.4.5','2021-07-09 13:58:09','2021-07-09 13:58:09'),(15,'4.5.0','2021-07-09 13:58:09','2021-09-03 13:58:09'),(16,'4.5.1','2022-12-03 14:02:00','2022-12-03 14:02:00'),(17,'4.5.2','2022-12-28 21:42:20','2022-12-28 21:42:20'),(18,'4.5.3','2023-01-01 20:32:08','2023-01-01 20:32:08'),(19,'5.0.0','2023-05-06 17:29:55','2023-05-06 17:29:55'),(20,'5.0.5','2023-10-21 19:04:42','2023-10-21 19:04:42'),(21,'5.1.0','2023-10-31 23:33:49','2023-10-31 23:33:49'),(22,'5.2.2','2023-11-05 12:28:43','2023-11-05 12:28:43'),(23,'5.2.3','2023-11-16 12:39:14','2023-11-16 12:39:14'),(24,'5.3.0','2023-11-18 11:10:21','2023-11-18 11:10:21'),(25,'5.3.1','2023-11-21 02:04:10','2023-11-21 02:04:10'),(27,'5.4.0','2023-12-03 20:27:58','2023-12-03 20:27:58'),(29,'5.4.3','2024-01-03 23:24:10','2024-01-03 23:24:10'),(30,'5.5.0','2024-01-03 23:43:18','2024-01-03 23:43:18'),(31,'5.6.0','2024-03-07 20:35:26','2024-03-07 20:35:26'),(32,'5.7.0','2024-03-08 11:58:40','2024-03-08 11:58:40'),(33,'5.8.0','2024-04-25 14:50:41','2024-04-25 14:50:41'),(35,'5.9.0','2024-07-13 17:23:00','2024-07-13 17:23:00'),(36,'5.14.0','2024-07-13 17:23:02','2024-07-13 17:23:02');
/*!40000 ALTER TABLE `version_ver` ENABLE KEYS */;
UNLOCK TABLES;
COMMIT;
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "churchcrm",
"version": "5.13.0",
"version": "5.14.0",
"description": "Free Church CRM Software",
"repository": {
"type": "git",
Expand Down Expand Up @@ -119,4 +119,4 @@
"cypress": "^13.17.0",
"grunt-poeditor-gd": "^0.2.1"
}
}
}
4 changes: 2 additions & 2 deletions src/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "Free Church CRM Software",
"license": "MIT",
"type": "project",
"version": "5.13.0",
"version": "5.14.0",
"keywords": [
"church",
"crm"
Expand Down Expand Up @@ -106,4 +106,4 @@
"@orm-gen"
]
}
}
}
6 changes: 3 additions & 3 deletions src/composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions src/mysql/upgrade.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,9 +397,10 @@
"5.10.1",
"5.11.0",
"5.11.0",
"5.12.0"
"5.12.0",
"5.13.0"
],
"scripts": [],
"dbVersion": "5.13.0"
"dbVersion": "5.14.0"
}
}
Loading