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.

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

Merge Develop into master #43

Open
wants to merge 79 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
c8c74f5
Added local password authentication
johnyu95 Nov 7, 2018
6bd0443
Changed default password
johnyu95 Nov 7, 2018
82a1a26
Merge branch 'develop' into feature/IN-118
johnyu95 Nov 8, 2018
25d4b9e
Set default password using config variable
johnyu95 Nov 8, 2018
37a131a
Merge branch 'develop' into feature/IN-118
joelbcastillo Nov 19, 2018
5fb5fcf
Allowing system to use LDAP or Local Auth
joelbcastillo Nov 19, 2018
cd9a27d
Removed unused code and updated login view function
johnyu95 Nov 19, 2018
b6c8e70
Merge pull request #37 from nycrecords/feature/IN-118
johnyu95 Nov 19, 2018
d34db3e
SAML setup for Intranet
joelbcastillo Nov 21, 2018
b3d767d
Update .env.exampllle
joelbcastillo Nov 21, 2018
3f59662
Add session timeout dialogue
joelbcastillo Nov 23, 2018
f58e135
Update session lifetime initialization
joelbcastillo Nov 23, 2018
bb5e5cf
Add docs for SAML
joelbcastillo Nov 23, 2018
58a17bf
Add maintenance mode
joelbcastillo Nov 28, 2018
b3a5c12
Merge pull request #38 from nycrecords/feature/IN-119
johnyu95 Nov 28, 2018
ece6a0e
Fixing go-live changes
joelbcastillo Nov 30, 2018
565817d
Removed tinymce paste plugin option
johnyu95 Nov 30, 2018
4d640a8
Added My Desk quick link
johnyu95 Nov 30, 2018
443d5bc
Added cyber security card to IT support
johnyu95 Nov 30, 2018
beeb25b
Adjusted home page spacing
johnyu95 Nov 30, 2018
fb1ffb3
Force lower case email when logging in
johnyu95 Dec 5, 2018
e4d49d7
Fixed typo in tags list
johnyu95 Dec 5, 2018
baa4ac9
Added orientation video page
johnyu95 Dec 12, 2018
7589673
Merge pull request #39 from nycrecords/feature/IN-114
johnyu95 Dec 12, 2018
ef2c04a
Fixed timestamp
johnyu95 Dec 12, 2018
e0aca70
Fix bug with app dev intake form
joelbcastillo Dec 13, 2018
01c8fbf
Merge remote-tracking branch 'origin/develop' into bugfix/IN-125
joelbcastillo Dec 13, 2018
57497bc
Merge pull request #40 from nycrecords/bugfix/IN-125
johnyu95 Dec 19, 2018
21f086c
Deleted posts shouldn't be access by URL
MunifNagi Sep 27, 2019
3702e1b
Redircting users to the last page before session expired
MunifNagi Oct 9, 2019
e911c8f
prompt countdown timer for session expiration
MunifNagi Oct 9, 2019
42e304b
Revert "prompt countdown timer for session expiration"
MunifNagi Oct 10, 2019
992d092
show countdown timer while creating posts
MunifNagi Oct 10, 2019
8eb79ae
Used 'base.js.html' file
MunifNagi Oct 10, 2019
d66a87e
Fixed a typo
MunifNagi Oct 10, 2019
004bdda
Feature/IN-127: Posts not being created on submission (#46)
joelbcastillo Oct 11, 2019
437e5d4
Feature/IN-123: Hide Deleted Posts (#44)
joelbcastillo Oct 11, 2019
8237a27
acs
MunifNagi Dec 27, 2019
9319f04
sls
MunifNagi Jan 7, 2020
f09e592
Error Correction
Danish11512 Jan 8, 2020
94fa0db
SAML NYC.ID Setup (#51)
joelbcastillo Jan 10, 2020
966c22d
Files added, changes made
Danish11512 Jan 13, 2020
bd9846e
Change file location
Danish11512 Jan 14, 2020
1329919
updated file location
Danish11512 Jan 14, 2020
33b11d2
Merge pull request #54 from nycrecords/ADSD-225
Danish11512 Jan 14, 2020
4486345
Intranet content refresh
johnyu95 Apr 11, 2022
8131cf2
Added Docker implementation to application
johnyu95 Apr 19, 2022
982d772
Removed unused code
johnyu95 Apr 21, 2022
040b6f7
Merge pull request #63 from nycrecords/johnyu95-intranet-content-refresh
zgary Apr 21, 2022
4f228b2
Fixed session timeout typo and added flash messages to index.html
johnyu95 Apr 21, 2022
3544845
Updated timeclock links
johnyu95 Apr 25, 2022
c346345
Updated documents to be served by send_file
johnyu95 Apr 26, 2022
1e10684
Updated IT Support page
johnyu95 Jun 29, 2023
f62198a
Merge pull request #72 from nycrecords/johnyu95-it-support-updates
johnyu95 Jul 12, 2023
9c3d248
Added backend VIEW and AJAX functions to monitor a given set of websites
HighPingg Aug 15, 2023
86a5416
Added monitor page front end WIP
vanessalei411 Aug 15, 2023
ce530c6
Linked together monitor frontend and backend
HighPingg Aug 15, 2023
fdd6e2e
Fixed issue where clicking on hyperlink also opened modal
HighPingg Aug 16, 2023
10b75d7
Changing database timestamps to use utc
HighPingg Aug 16, 2023
ba679e0
Display EST in frontend instead of GMT
HighPingg Aug 16, 2023
b6897eb
Added 12hr time zone.
vanessalei411 Aug 16, 2023
5be5814
Fixed issue with modal not updating on POST and refacting AJAX succes…
HighPingg Aug 17, 2023
34f9f95
Merge remote-tracking branch 'origin/Intranet-Monitor' into Intranet-…
HighPingg Aug 17, 2023
85748cb
Moved page refresh rate and request timeout to environment variable a…
HighPingg Aug 18, 2023
be2b4a7
Requiring super user role to access monitor page
HighPingg Aug 18, 2023
7349288
Made correction to image sizing and added warning signs.
vanessalei411 Aug 18, 2023
8668f9f
Uptime monitor code cleanup
johnyu95 Sep 5, 2023
827ecae
Merge pull request #73 from nycrecords/Intranet-Monitor
johnyu95 Sep 8, 2023
7ec4e41
Fixed Women's Activism link in footer
johnyu95 Sep 12, 2023
e9cf506
Merge branch 'develop' of https://github.com/nycrecords/intranet into…
johnyu95 Sep 12, 2023
f00e280
Fixed spacing for staff directory table
johnyu95 Feb 14, 2024
4904b19
Merge pull request #75 from nycrecords/johnyu95-staff-directory-update
johnyu95 Feb 14, 2024
0d52802
records management documents tab
Aug 5, 2024
8fe8e20
Removed unnecessary files
Aug 5, 2024
99d8324
Removed unnecessary files
Aug 5, 2024
068da52
Fixed documents page initial load and code cleanup
johnyu95 Aug 20, 2024
fed0dd4
Merge pull request #76 from nycrecords/addritab-records-management-do…
johnyu95 Aug 20, 2024
cf28e8a
Updated project intake form
johnyu95 Aug 26, 2024
1965163
Added project intake form to quick links
johnyu95 Sep 4, 2024
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
Prev Previous commit
Next Next commit
Fixed spacing for staff directory table
  • Loading branch information
johnyu95 committed Feb 14, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit f00e280d060a4a4a4df7aaebcdd1118718d7c7e2
2 changes: 1 addition & 1 deletion app/static/css/staff-directory.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.page-container {
width: 1300px;
width: 75%;
padding-bottom: 20px;
}

7 changes: 3 additions & 4 deletions app/templates/staff_directory.html
Original file line number Diff line number Diff line change
@@ -34,6 +34,7 @@ <h1 class="breadcrumb-header">Staff Directory</h1>
<div class="panel-body panel-body-style">
<table class="table table-bordered table-styles">
<tr>
<th class="staff-directory-column-header"></th>
<th class="staff-directory-column-header">First</th>
<th class="staff-directory-column-header">Last</th>
<th class="staff-directory-column-header">Division</th>
@@ -44,13 +45,12 @@ <h1 class="breadcrumb-header">Staff Directory</h1>
<tbody id="staff-directory-table">
{% for user in users %}
<tr>
<td class="col-sm-2">
<td>
<a class="popover-right popper" data-toggle="popover">
<img class="avatar-style"
src="{{ url_for('static', filename='img/employee_photos/' + user.email + '.jpg') }}"
onerror="this.src='/static/img/avatar.png'" alt="avatar">
</a>

<div class="popover-content hide">
<div class="row">
<div class="col-sm-4">
@@ -67,10 +67,9 @@ <h1 class="breadcrumb-header">Staff Directory</h1>
</div>
<div class="row popover-information">Phone: {{ user.phone_number }}</div>
<div class="row popover-information">Email: <a href="mailto:{{ user.email }}">{{ user.email }}</a></div>
<div class="row popover-information">Office: {{ user.room }}</div>
</div>
<span class="staff-directory-row">{{ user.first_name }}</span>
</td>
<td class="staff-directory-row">{{ user.first_name }}</td>
<td class="staff-directory-row">{{ user.last_name }}</td>
<td class="staff-directory-row">{{ user.division }}</td>
<td class="staff-directory-row">{{ user.title }}</td>