Skip to content

Closedbeta #1

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
promilo wants to merge 62 commits into
base: master
Choose a base branch
from
Open

Closedbeta #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
32e6913
Working, but lots of cleanup to do.
dannyyiu Dec 26, 2014
6e44c71
Merge prep
dannyyiu Dec 28, 2014
b34b822
- Finished merging Danny's branch with David's master branch changes
sinkpoint Dec 28, 2014
fc2b828
- corrected blog template format
sinkpoint Dec 28, 2014
f7f63d9
- moved the media folder outside of static
sinkpoint Dec 28, 2014
c0d36e7
- small change to home template to show proper blog image
sinkpoint Dec 28, 2014
fe8a227
- added font size to admin tiny-mce
sinkpoint Dec 28, 2014
c55bcbc
- corrected post template
sinkpoint Dec 28, 2014
7610b12
- moved blog post image to body
sinkpoint Dec 31, 2014
64771ad
Meta tags
dannyyiu Dec 31, 2014
d854160
- actually commented out the comment box
sinkpoint Jan 1, 2015
d1ffc5d
Merge branch 'dqc-scinapsis' of https://github.com/dannyyiu/scinapsis…
sinkpoint Jan 1, 2015
0568757
- remove "test" for multi post captions
sinkpoint Jan 1, 2015
fd8c74b
- fix title spelling error
dannyyiu Jan 1, 2015
4b7223a
- add fb, linkedin, and og title
dannyyiu Jan 1, 2015
d6377bb
- fix og:title meta
dannyyiu Jan 1, 2015
1cc99cb
- contact page typo fix
dannyyiu Jan 1, 2015
d4f06e9
- "coming soon" date
dannyyiu Jan 2, 2015
a15046f
- corrected tag post template
sinkpoint Jan 6, 2015
45fe65d
- update chages as of jan 25, 2015
sinkpoint Jan 26, 2015
ee18eaa
- Changes as of Jan 29, 2014
sinkpoint Jan 30, 2015
d98bc49
- corrected header not correctly displayed
sinkpoint Jan 30, 2015
aa12e5c
-added scientifc advisors
sinkpoint Feb 5, 2015
6f2025a
- added search app
sinkpoint Feb 6, 2015
d768485
- added the search project
sinkpoint Apr 17, 2015
3f7d143
- working search filters
sinkpoint Apr 20, 2015
63aeb83
userprofile app creation
jasottt Apr 20, 2015
a7ad152
UserProfile Table and model created
jasottt Apr 21, 2015
e282ebc
- added wsgi.py for search
sinkpoint Apr 21, 2015
ba39b53
- added static to url.py for debug deployment
sinkpoint Apr 21, 2015
73d035c
- correct urls.py
sinkpoint Apr 21, 2015
795d2fa
added profile image display at base
jasottt Apr 23, 2015
a34522d
simple functional profile page
jasottt Apr 24, 2015
24e67ea
Profile image upload
jasottt Apr 26, 2015
218e204
commit urls.py
jasottt Apr 26, 2015
b23b559
html validation
jasottt Apr 26, 2015
7279ba2
- search index now display authors
sinkpoint Apr 28, 2015
14dfe58
Merge remote-tracking branch 'origin/user-profile' into dqc-scinapsis
sinkpoint Apr 30, 2015
534d809
- add user template files
sinkpoint Apr 30, 2015
3c2f16e
- index pagination retains GET params
sinkpoint May 3, 2015
34618ff
- added new blog site slideshow content
sinkpoint May 4, 2015
c6ad16a
- internal testing alpha1
sinkpoint May 11, 2015
be64241
- pre closed beta blog edits
sinkpoint May 24, 2015
ae29620
- config files for uwsgi+ngnix
sinkpoint May 24, 2015
083847b
- search redirects to coming soon
sinkpoint May 25, 2015
21b9c7f
some server side changes to closed beta
May 26, 2015
86a1909
- removed social login
sinkpoint May 26, 2015
a33ca0f
- changed login screen text
sinkpoint May 26, 2015
02e565b
- changed search bar layout for mobile
sinkpoint May 26, 2015
f1040a9
- login base header spacing
sinkpoint May 26, 2015
afb5ab1
- added user account creation utilities
sinkpoint May 27, 2015
4b3bab1
- closed beta account passwords
May 27, 2015
d28e0d4
- close beta bug fixes
sinkpoint May 28, 2015
afa1703
- hide profile from top links- hide profile from top links- hide prof…
sinkpoint May 28, 2015
fdc4165
- extra accounts after closedbeta event
sinkpoint May 29, 2015
72bdffd
- add send email to created accounts
sinkpoint May 30, 2015
5249d53
- email accounts script
sinkpoint May 30, 2015
9948c2f
- created accounts email template
sinkpoint May 30, 2015
455dde5
working sendmail
May 30, 2015
f96ca07
- html email template for gmail
sinkpoint May 30, 2015
5ba079b
- changed about page sci advisor
sinkpoint May 30, 2015
5a9d436
added type suggestion in the search function using the typeadhead.js …
ewianda Jun 27, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
11 changes: 9 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@ __pycache__/
bin/
build/
develop-eggs/
dist/
#dist/
eggs/
lib/
lib64/
parts/
sdist/
var/
migrations-/
*.egg-info/
.installed.cfg
*.egg
Expand Down Expand Up @@ -49,4 +50,10 @@ coverage.xml
# Sphinx documentation
docs/_build/

.DS_Store
.DS_Store
.idea

#project specific
*/media/*
settings.py
*dev.*
135 changes: 135 additions & 0 deletions scinapsis/art_assets/Scinapsis-logo-print-colour-h.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added scinapsis/art_assets/logo_header.psd
View file
Open in desktop
Binary file not shown.
Binary file added scinapsis/art_assets/profile.psd
View file
Open in desktop
Binary file not shown.
179 changes: 179 additions & 0 deletions scinapsis/art_assets/search_bg_side1.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading