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

Jump to bottom

Merge development into main #17

Open
wants to merge 72 commits into
base: main
Choose a base branch
from
Open

Merge development into main #17

wants to merge 72 commits into from

Conversation

katherine-yu
Copy link
Collaborator

No description provided.

mingyi09 and others added 30 commits July 2, 2022 15:14
Set a basic structure for Add_event_page
7a2521f
@seokhakang9
Update eventInfo.html
000222f
@katherine-yu
Revert directory change in pom.xml
f9df9d4
Some UI changes to Add_event_page
4e89453
@seokhakang9
Update eventInfo.html
9bf5265 
Updated the title
Chang the google map api.
@katherine-yu
Fix API key script tag
68ff3c3
@mingyi09
Merge pull request #3 from marcusblake/add_event
9cfd7ce 
Set a basic structure for add_event_page
@seokhakang9
Merge pull request #4 from marcusblake/skang/event-info
aba458f 
Implement an event information page
@seokhakangcs
Skeleton Code for EventServlet
c6333c8
@danigallegdup
Home Page html
7684d03
@marcusblake
Merge pull request #7 from marcusblake/directory
0ba707e 
Revert directory change in pom.xml
@seokhakang9
Delete event-info.html
60db963
@seokhakang9
Merge pull request #10 from marcusblake/get-method-function
ef8798f 
Skeleton Code for EventServlet
@katherine-yu
Add server side code for directory page
5e61463
@katherine-yu
Merge branch 'development' into directory
9635485
@katherine-yu
Merge commit 'ef8798ffdfa1480bde012db2a81efde290088aad' into directory
038c224
@katherine-yu
Make school_id global in directory-page/script.js
8b01314
@katherine-yu
Add comments to directory-page/script.js
ce108d2
@danigallegdup
Merge pull request #11 from marcusblake/Home_page
e673c4e 
Home Page html
@katherine-yu
Start adding events
7128cb4
@katherine-yu
Merge commit 'e673c4e4a159cafe7d66c7c548e4fce45ffba95b' into directory
c7cbfbe
@danigallegdup
linked Home and Directory
1c239cc
@katherine-yu
Finish home page school listing
9b8cc1b
@katherine-yu
Change order of school names to alphabetical
8622182
@katherine-yu
Edit comments in script.js
9c65594
Set up POST request structure
f009af2
@katherine-yu
Implement event sorting
eb12785
@katherine-yu
Add functions for entity to class creation
594ca83
@katherine-yu
Set correct onclick href for 'add event' button
a153de8
@katherine-yu
Move getting school_id inside if case
672d2fd
Mingyi Li and others added 28 commits July 14, 2022 06:09
set up redirection
93f6332
@katherine-yu
Add functionality to delete old events
deb117e
set up redirection, requirement, and visibility of the form
1db9a9e
@katherine-yu
Add DatastoreGarbageCollector class and make deleting more efficient
d458510
@katherine-yu
Refactor event filtering
40d9002
@katherine-yu
Remove unnecessary import from EventServlet
d370be2
@katherine-yu
Make event filtering more efficient and simple
aa595e3
@katherine-yu
Move comment outside of function
4be65d4
set up place search box
4f29b6f
fix the error handling code
e5d318b
@katherine-yu
Formatting, remove nonexistent function from directory.html
e4ed4af
@katherine-yu
Remove print statements from DatastoreGarbageCollector.java
085b976
add Jsoup and marker position
09de5bf
reset page redirection
cbf3594
@mingyi09
Merge pull request #13 from marcusblake/add_event
f08e8ad 
set up doPost request, redirection, and map marker for add event page
@katherine-yu
Resolve merge conflicts with development branch
8297b6f
@katherine-yu
Implement directory event filtering, implement deleting stale events,…
03eca8f 
… simplify add event implementation (#16)

* Change method of getting to EventServlet

* Convert date input to UTC before submission

* Merge directory

* Formatting

* Remove print statement from EventServlet.java
@seokhakang9 @seokhakangcs @katherine-yu
Event info backend and home button (#14)
f27f1fe 
* Add implementation for EventServlet

* Finish event-info backend

* Add home button

Co-authored-by: Seokha_Kang <[email protected]>
Co-authored-by: Katherine Yu <[email protected]>
@katherine-yu
Merge development into directory
f356cf1
@katherine-yu
Edit style of pages
b16ffaf
@katherine-yu
Add newlines to end of files
dfab157
@katherine-yu
Left align school dropdown
54e8336
@katherine-yu
Change color of favicon to match theme
1d58c4a
@marcusblake
Merge pull request #18 from marcusblake/directory
7a2196e 
Style/CSS touchup
@katherine-yu
Enforce HTTPS connections
5fd7ed5
@katherine-yu
Change social event subject to empty string
e3de25f
@katherine-yu
Fix typo in event info page title
b9fa3e1
@danigallegdup
Merge pull request #19 from marcusblake/directory
e47b067 
Enforce HTTPS connections
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@danigallegdup danigallegdup danigallegdup approved these changes

At least 3 approving reviews are required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@katherine-yu @danigallegdup @seokhakang9 @mingyi09 @seokhakangcs @marcusblake