Resolve merging conflict#1

Open

inlibra-cpa wants to merge 64 commits into

inlibra-cpa:masterfrom

jimenezmiguela:master

Commits on Mar 16, 2022

Work on Help_Find Front, bootstrap, part 2 completed

Student
authored and
Student
committed
Merge pull request #3 from jimenezmiguela/bootstrap
jimenezmiguela
authored

Commits on Mar 24, 2022

Changed searched field to drop down list on FBI, Twitter and Newsdata search pages
olegkolyaka78
committed
Work on FBI API data transfer to database

Student
authored and
Student
committed
Fix routing issue in Help_Find, 'ajax#session' #10

Student
authored and
Student
committed

Commits on Mar 26, 2022

Bug fix, Fix routing issue in Help_Find, 'ajax#session' bug, needed /before route.

Student
authored and
Student
committed
Merge pull request #8 from jimenezmiguela/data
jimenezmiguela
authored
Merge branch 'master' into searchFieldtoDropDownList
jimenezmiguela
authored

Commits on Mar 28, 2022

Create PR template for project.
mechamanny
committed

Commits on Apr 2, 2022

Create User Session: Toggle Password Visibility

Student
authored and
Student
committed
Logon User Session: Toggle Password Visibility

Student
authored and
Student
committed

Commits on Apr 4, 2022

Commits on Apr 5, 2022

fix, unbreak fbi data to database (broken by menu merge).

Student
authored and
Student
committed
Fix Bug: Create User Session, Toggle Password Visibility.

Student
authored and
Student
committed

Commits on Apr 6, 2022

Merge pull request #36 from jimenezmiguela/Bug-Fix-Create-User-Session-Toggle-Password-Visibility
jimenezmiguela
authored

Commits on Apr 8, 2022

Commits on Apr 9, 2022

Commits on Apr 15, 2022

break apart FBI operations from ajax_operations.js

Student
authored and
Student
committed
Merge pull request #40 from jimenezmiguela/break-apart-ajax_operations.js-into-separate-files-classes
jimenezmiguela
authored
Break apart Twitter operations from ajax_operations.js

Student
authored and
Student
committed

Commits on Apr 16, 2022

Merge pull request #42 from jimenezmiguela/break-apart-twitter-operations-from-ajax_operations.js
jimenezmiguela
authored

Commits on Apr 19, 2022

switch to PostgreSQL from SQLite3
inlibra-cpa
committed

Commits on Apr 20, 2022

Break apart Newsdata operations from ajax_operations.js completed.

Student
authored and
Student
committed
Fixed storing record by row number on FBI page
olegkolyaka78
committed

Commits on Apr 21, 2022

Merge pull request #48 from jimenezmiguela/break-apart-newsdata-operations-from-ajax_operations.js
jimenezmiguela
authored

Commits on Apr 22, 2022

Fixed
olegkolyaka78
committed
Break apart missing people and status reports perations from ajax_operations.js

Student
authored and
Student
committed

Commits on Apr 23, 2022

Merge pull request #52 from jimenezmiguela/break-apart-status-reports-operations-from-ajax_operations.js
jimenezmiguela
authored

Commits on Apr 29, 2022

new navbar
inlibra-cpa
committed

Commits on May 3, 2022

Merge pull request #54 from jimenezmiguela/new_navbar
inlibra-cpa
authored

Commits on May 4, 2022

improved views
inlibra-cpa
committed

Commits on May 5, 2022

Commits on May 10, 2022

Some changes
olegkolyaka78
committed

Commits on Oct 6, 2022

add Render

Student
authored and
Student
committed
Merge pull request #58 from jimenezmiguela/newRender
jimenezmiguela
authored