Union Events Timeline issue - #157

Open

pantp wants to merge 38 commits into

Commits on Sep 24, 2019

update gitignore
jlyon1
committed
ab0e742
add adpage type, adpage column
jlyon1
committed
386d0b6
add an ad block with target link
jlyon1
committed
f58a3e2
lint
jlyon1
committed
37964cf
remove unused types and migrations
jlyon1
committed
752ec77
migrations
jlyon1
committed
523d3ff
database
jlyon1
committed
f7c4316
lint
jlyon1
committed
cbb4a5b
remove something that shoudlnt be there
jlyon1
committed
2fc68e6

Commits on Sep 25, 2019

remove unused fields
jlyon1
committed
15ac843
undo
jlyon1
committed
d6705ce
make link not reqd
jlyon1
committed
7755c3e
optional link, add label
jlyon1
committed
d3f0884
migrations
jlyon1
committed
7841da3

Commits on Sep 27, 2019

Started work on a marquee banner. Right now it shows moving text and has basic outline. Needs to be styled better.
Pragati Pant
committed
93e7bbd
Made the banner text stop on hover to make more readable. Removed border.
Pragati Pant
committed
542308e

Commits on Oct 8, 2019

Finished with rotating marquee.
Pragati Pant
committed
ea605a5
Ran black formatting.
Pragati Pant
committed
2428103

Commits on Oct 18, 2019

initial work on union timeline issue/new custom models added
Pragati Pant
committed
f834ce8

Commits on Oct 25, 2019

Data for timeline is inputted and saved correctly
Pragati Pant
committed
1f1fb98

Commits on Oct 29, 2019

Added a small photo to each event.

Pragati Pant
authored and
Pragati Pant
committed
d9b7ed9
Trying to format photos to expand when clicked on
Pragati Pant
committed
48485df

Commits on Oct 31, 2019

Trying to make the photo expandable.
Pragati Pant
committed
cd60beb

Commits on Nov 6, 2019

Trying to make photos expandable
Pragati Pant
committed
ce7f46a

Commits on Nov 13, 2019

Trying to add custom styling to text toolbar.
Pragati Pant
committed
a25ac02

Commits on Dec 11, 2019

not done, will continue work during break
Pragati Pant
committed
f0a2561

Commits on Feb 25, 2020

Not using bootstrap tooltip anymore. Using custom CSS tooltip.
Pragati Pant
committed
ae179a2

Commits on Feb 28, 2020

Have extra p tags, but almost close to having definitions for timeline.
Pragati Pant
committed
80852b2
Fixed merge conflict.
Pragati Pant
committed
ffa145a
Fixed migrations and CSS styling.
Pragati Pant
committed
f4b97e7

Commits on Mar 3, 2020

Added more text to check. Need to have better css styling.
Pragati Pant
committed
2fe0f4b

Commits on Apr 8, 2020

Added authors to timeline page.

Pragati Pant
authored and
Pragati Pant
committed
fd3fd9d
Fixing photo size.

Pragati Pant
authored and
Pragati Pant
committed
51596d4
Fixed author if statement.

Pragati Pant
authored and
Pragati Pant
committed
c21504e
Fixed black formatting.

Pragati Pant
authored and
Pragati Pant
committed
b3a69ad

Commits on Apr 15, 2020

Merge branch 'master' of github.com:thepoly/pipeline into timeline

Pragati Pant
authored and
Pragati Pant
committed
f10e819
Fixed migrations after pulling from master

Pragati Pant
authored and
Pragati Pant
committed
20ac69e

Commits on Apr 29, 2020

Attempted to move union timeline to News section.

Pragati Pant
authored and
Pragati Pant
committed
79b8370