AS1024
/
itflow
mirror of https://github.com/itflow-org/itflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,875 Commits 6 Branches 15 Tags 166 MiB
Commit Graph

1875 Commits

Author SHA1 Message Date
johnnyq 3baea5e757 Used the DB Update function to write new repo_branch var for docker the new docker to function properly 2023-01-13 21:44:13 -05:00
johnnyq c0399a2c42 Added Disable and Activate Users, fixes #539 2023-01-13 18:24:50 -05:00
johnnyq df9182cd78 More UI / Icons / Wording work on the pop up modals 2023-01-12 23:39:02 -05:00
johnnyq 0ffe1b9c75 Only show Items in client overview if records exist More link fixes 2023-01-10 22:43:20 -05:00
johnnyq c75bd40b80 hide tables in contact details that dont have no records 2023-01-10 22:15:43 -05:00
johnnyq d57074f5c7 Properly link to contact details through global search and client overview 2023-01-10 22:06:45 -05:00
johnnyq 243da47dd0 Keep contacts side nav active when viewing client contact details for easier navigation 2023-01-10 21:54:53 -05:00
johnnyq 0388d1e934 Contact Details now has a seperate page with related materials such as assets logins, started work on the UI for asset network interfaces, db structure updates for many to many relations between contacts and assets 2023-01-10 21:50:34 -05:00
johnnyq a0455cc296 DB Structure for Asset Network Interfaces ex switch ports, routers etc 2023-01-09 19:15:23 -05:00
johnnyq 71fc1bd591 Condensed the Recurring income by client table 2023-01-09 15:12:55 -05:00
johnnyq 6bd54431d9 Boldered Recurring total on report 2023-01-09 15:11:21 -05:00
johnnyq 607915f0f1 Added Recurring grand total to the bottom of Recurring income by client 2023-01-09 15:10:23 -05:00
johnnyq cdbe930f95 Added Recurring Monthly Report by client 2023-01-09 15:02:33 -05:00
johnnyq 6bafb0bcbb Added Recurring Monthly to Client Listing Billing column as well 2023-01-09 14:51:13 -05:00
johnnyq ee8aa53590 Merge branch 'master' of github.com:itflow-org/itflow 2023-01-09 14:47:50 -05:00
johnnyq 47755ee7c5 Added Recurring Monthly Billing stat to client header 2023-01-09 14:47:25 -05:00
wrongecho fd30cc50e9
Update email to ticket parser filename 2023-01-08 20:23:08 +00:00
Johnny 4a684a070c
Merge pull request #554 from itflow-org/revert-553-master 
Revert "removed warning"
 2023-01-08 14:02:31 -05:00
Johnny b91ead19ce
Revert "removed warning" 2023-01-08 14:00:16 -05:00
johnnyq dc27504a46 Removed docker will be moving into its own repo itflow-docker 2023-01-08 13:41:18 -05:00
Johnny 24ba1c63be
Merge pull request #553 from chandachewe10/master 
removed warning
 2023-01-08 13:28:36 -05:00
Johnny fe04f9de4b
Merge pull request #551 from lued/docker 
initial docker commit
 2023-01-08 13:27:23 -05:00
chandachewe10 e0b314e5a9 removed warning 2023-01-08 00:01:52 +00:00
johnnyq 6cd8649296 Do not htmlentities client name into notifications 2023-01-07 17:26:19 -05:00
johnnyq cb5f1779c2 More modal UI Updates and Cleanups 2023-01-05 15:41:44 -05:00
Xander Luedtke 8d4a2d8ef6 Fix " to ' on new variable. Sed is broken. Update Dockerfile to v1.2 2023-01-04 18:56:12 -07:00
Xander Luedtke 0f3fdbec51 -f typo 2023-01-04 18:50:04 -07:00
Xander Luedtke 0e0a67ef4f fix for settings_update.php 2023-01-04 18:40:47 -07:00
Xander Luedtke 65c1e7f4b8
Merge branch 'itflow-org:master' into docker 2023-01-04 16:06:23 -07:00
Johnny f7e3d63a65
Merge pull request #552 from chandachewe10/master 
SHOWING REVENUES IN EACH PARTICULAR MONTH COLUMN
 2023-01-04 16:28:42 -05:00
chandachewe10 27154883ed SHOWING REVENUES IN EACH PARTICULAR MONTH COLUMN 2023-01-04 09:04:09 +00:00
Xander Luedtke 9f832cb527 Adding REPO_BRANCH 2023-01-03 22:36:20 -07:00
Xander Luedtke 252deefdcd initial docker commit 2023-01-03 18:22:36 -07:00
Johnny 09bb1d4636
Merge pull request #550 from wrongecho/code-audit-pt2 
Ticketing cleanups
 2023-01-03 17:17:22 -05:00
Marcus Hill 56899e60cf Move ticket merge javascript to separate file 2023-01-03 20:43:51 +00:00
Marcus Hill f23d7a5263 Commented unused code. Converted to 4 spaces 2023-01-03 20:39:14 +00:00
Marcus Hill 7e81882bff Separate out time tracking and collision detection JS into separate javascript files 2023-01-03 20:30:39 +00:00
Marcus Hill a780df5205 Change spacing to 4 spaces; general refactor/tidy up 2023-01-03 20:20:54 +00:00
Marcus Hill d8410d95b2 Rem old commented code 2023-01-03 20:00:01 +00:00
johnnyq c324fbbfff Update more UI modals to nicer look 2023-01-02 22:21:12 -05:00
Johnny 893f4405ff
Merge pull request #547 from wrongecho/code-audit 
Misc changes from code security audit
 2023-01-02 21:16:17 -05:00
Marcus Hill b70052b864 - Validate user email before sending welcome message 
- Remove old code from edit_user - we now enforce admin role properly
- Users may only edit their own profiles - enforced via session id rather than role
- Rem ticket views deletion comment - ticket views are cleaned up daily via cron
- Require CSRF Token when adding/removing 2FA and backing up master key
 2023-01-02 21:06:51 +00:00
johnnyq 637712aa71 Eworked year selector on the dashboard 2023-01-02 16:03:52 -05:00
Marcus Hill 1b96f8659e Rem comment - we set this info in the session at login and enforce roles there, and will be updating overall site role enforcement 2023-01-02 19:40:09 +00:00
Marcus Hill 9eea00bccf Change stripslashes to htmlentities 2023-01-02 19:29:00 +00:00
Marcus Hill a66b6052df Change stripslashes to strip_tags for better html sanitization 2023-01-02 19:28:24 +00:00
Marcus Hill 24f825ca08 SQL Escape tech username in session. The username is added to most log entries meaning that a simple apostrophe in the name breaks all logging for the user 2023-01-02 19:22:21 +00:00
Marcus Hill 019776f538 Change manual admin role verification to use the function 2023-01-02 19:10:00 +00:00
Marcus Hill 7688356a5f Remove commented calendar CSS from header as it's loaded by itself on the relevant pages 2023-01-02 19:06:12 +00:00
Marcus Hill a3a4dafaf5 Add item name to shared file view logs 2023-01-02 18:47:06 +00:00