Skip to content

Merge Develop to Master #53

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

Open
Hjkun77 wants to merge 67 commits into
base: master
Choose a base branch
from
Open

Merge Develop to Master #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
3decf95
community(feat): make separate component for Books in Resources section
bfgonzalez Jan 3, 2019
7b22165
community(style): remove unecessary imports resulting from directory …
bfgonzalez Jan 3, 2019
55fa388
resources(feat): create separate components for Articles and Podcasts
bfgonzalez Jan 3, 2019
a90cb46
resources(feat): add respective placeholder text for Articles component
bfgonzalez Jan 3, 2019
bef8518
resources(feat): add respective placeholder images and text for Podcasts
bfgonzalez Jan 3, 2019
8cc2821
Merge pull request #38 from UXSoc/community-resources
Hjkun77 Jan 3, 2019
a7a8796
community(feat): incorporate conditional rendering for Events section
bfgonzalez Jan 3, 2019
e84be6e
community(fix): fix positioning for RedirectButton in Events section
bfgonzalez Jan 3, 2019
43e22a1
Merge pull request #39 from UXSoc/community-events
Hjkun77 Jan 11, 2019
b8dcbfc
community(feat): incorporate mobile responsiveness (#40)
bfgonzalez Jan 11, 2019
9a7402d
home(fix): fix positioning of journey button (#41)
bfgonzalez Jan 13, 2019
a43b046
community(feat): add footer (#42)
bfgonzalez Jan 13, 2019
2241bc8
Debug uxsoc-website
Hjkun77 Jan 13, 2019
08f50db
Debugging
Hjkun77 Jan 13, 2019
044b75e
work(feat): incorporate mobile responsiveness (#43)
bfgonzalez Jan 20, 2019
51f76be
About and Navigation fix
Hjkun77 Jan 20, 2019
2eaf496
work(fix): fix positioning of images in case studies section (#45)
bfgonzalez Jan 20, 2019
2041c38
community(fix): fix positioning of event image and RedirectButton (#44)
bfgonzalez Jan 20, 2019
681f165
Debug code
Hjkun77 Jan 20, 2019
adf1f44
Debug fix
Hjkun77 Jan 20, 2019
f93c7ad
work(fix): fix responsiveness for services and case studies sections …
bfgonzalez Jan 20, 2019
6db4953
Update Content and Fix Bugs
Hjkun77 Jan 20, 2019
330951b
home(feat): update images and fix responsiveness (#47)
bfgonzalez Jan 20, 2019
2ac0f41
Carousel operational (#48)
Hjkun77 Jan 23, 2019
a6542af
community(feat): update assets and fix positioning of RedirectButton …
bfgonzalez Jan 24, 2019
3f1a8e6
Work carousel (#50)
Hjkun77 Jan 24, 2019
f63c0b1
Community refactor css
Hjkun77 Jan 24, 2019
c846cb9
community(feat): use flexbox instead of grid for element positioning …
bfgonzalez Jan 25, 2019
af3ff9c
Refactor codes & styles from different components
Hjkun77 Jan 26, 2019
2b7ae28
"Fix code"
Hjkun77 Jan 28, 2019
495a1d0
Metadata
Hjkun77 Jan 28, 2019
4210069
Develop
Hjkun77 Jan 28, 2019
24a95ca
Metaimage
Hjkun77 Jan 28, 2019
ac9937d
Comment out work
Hjkun77 Jan 28, 2019
79b8ad1
Fixed
Hjkun77 Jan 28, 2019
80d3e42
Metaimage
Hjkun77 Jan 28, 2019
b1e6c04
Develop
Hjkun77 Jan 29, 2019
9f09d33
Fixed images in work
Hjkun77 Jan 29, 2019
99187b4
OG:Image fix and Animations
Hjkun77 Jan 29, 2019
61f7458
Fixing metadata
Hjkun77 Jan 29, 2019
5f08dd0
Change community
Hjkun77 Jan 30, 2019
5456886
Merge branch 'master' into develop
Hjkun77 Jan 30, 2019
56902eb
Remove scroll animation
Hjkun77 Jan 30, 2019
45be7b6
Fixed illustration and carousel center
Hjkun77 Jan 30, 2019
1ead69a
Google Analytics
Hjkun77 Jan 31, 2019
192b6ab
Google Analytics
Hjkun77 Jan 31, 2019
a3da036
Refactor styles and neltify-forms
Hjkun77 Feb 1, 2019
23ff85f
redirects
Hjkun77 Feb 1, 2019
e7219e4
Redirect
Hjkun77 Feb 1, 2019
992a68d
Netlify.toml
Hjkun77 Feb 1, 2019
2447ea1
Netlify.toml
Hjkun77 Feb 1, 2019
705b3eb
Redirects
Hjkun77 Feb 1, 2019
95ca24d
Rubik bug fix
Hjkun77 Feb 1, 2019
dacc746
redirect
Hjkun77 Feb 1, 2019
9bd7a2a
redirect
Hjkun77 Feb 1, 2019
b3ceaa1
remove _redirects
Hjkun77 Feb 1, 2019
d550a81
redirects
Hjkun77 Feb 1, 2019
0ef2f64
Fix
Hjkun77 Feb 1, 2019
bd12884
HD Github
Hjkun77 Feb 1, 2019
27b6eae
Refactor code
Hjkun77 Feb 1, 2019
1bd30fe
HD Logo
Hjkun77 Feb 1, 2019
53dfabb
footer(fix): fix resolution of facebook and twitter logos (#59)
bfgonzalez Feb 2, 2019
ab198fa
burger-menu(feat): add initial code for burger menu animation (#60)
bfgonzalez Feb 7, 2019
32c7928
New Events: UXUni and UXCrawl
Hjkun77 Feb 10, 2019
d1baee4
New articles
Hjkun77 Feb 10, 2019
d943894
Update events 11/10/2019
Hjkun77 Nov 10, 2019
9f66ea9
fixed issues on mobile text align and spacing (#61)
cobbie Mar 1, 2020
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
212 changes: 208 additions & 4 deletions 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.

9 changes: 7 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,18 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"animate.css": "^3.7.0",
"react": "^16.5.2",
"react-anchor-link-smooth-scroll": "^1.0.11",
"react-animate-on-scroll": "^2.1.5",
"react-dom": "^16.5.2",
"react-ga": "^2.5.7",
"react-helmet": "^5.2.0",
"react-meta-tags": "^0.7.3",
"react-router": "^4.3.1",
"react-router-dom": "^4.3.1",
"react-scripts": "2.0.4",
"reactstrap": "^6.5.0"
"reactstrap": "^6.5.0",
"styled-components": "^4.1.3"
},
"scripts": {
"start": "react-scripts start",
Expand Down
1 change: 1 addition & 0 deletions public/_redirects
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/* /index.html 200
Loading
Loading