Fixes #1865 : Adds the about us section #1868
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Can you give a preview link? |
|
@ParthS007 @gabru-md @yashLadha Please review. |
|
@rajvaibhavdubey LGTM, Please remove the Team section and its good to merge 👍 |
|
@ParthS007 @yashLadha @gabru-md I have made the requested changes. |
|
@ParthS007 @yashLadha @gabru-md Please Review. |
|
@yashLadha Please review. |
yashLadha
reviewed
Jan 8, 2019
frontend/app/routes/about.js
Outdated
|
|
||
| export default Route.extend({ | ||
| model() { | ||
| return 'badgeyayofficial@gmail.com'; |
There was a problem hiding this comment.
What is the use case when you statically type the email here instead of fetching it from the DB or from the frontend through local storage?
yashLadha
requested changes
Jan 8, 2019
The about us section has been added. Fixes #1865
|
@yashLadha PTAL, I have imported the mail id from the |
championpaddler
suggested changes
Jan 13, 2019
There was a problem hiding this comment.
@rajvaibhavdubey It will be better to add the dynamic email from admin content section like other social media links,so that it will be easier for admin to change them when required. What are your suggestions ?? @gabru-md @yashLadha
|
@sk9331657 Okay sure 👍 , Can u tell me a little bit about how to add it dynamically. |
Have a look at this pr . #1888 You will get idea to add link for email. |
championpaddler
added a commit
to championpaddler/badgeyay
that referenced
this pull request
May 3, 2019
* Fix-1908 (fossasia#1909) * Fix - 1846 (fossasia#1882) * Minor Fix in Settings.py (fossasia#1915) Corrected the mail address Fixes fossasia#1914 * Fixing Overlapping Color picker (fossasia#1910) * Fix-1912 Apply to all FOnt Color (fossasia#1913) * Download Badges overlapping removed and checkbox shifted (fossasia#1898) The download badges button overlapping has been fixed and the checkbox has been moved to a better position. Fixes fossasia#1897 * Fixes fossasia#1933 (fossasia#1937) On the login and signup page pressing enter no longer makes the password visible * Fix-1916 (fossasia#1917) * Fix-1918 (fossasia#1927) * Makign Passowrds Empty (fossasia#1931) * Add logo section both fronted and backed (fossasia#1905) * Add logo section both fronted and backed * fix * Changed footer (fossasia#1926) The other links for projects have been added and also the look of the footer has been changed a bit. Fixes fossasia#1860 * Without login , Create badges displays error messages (fossasia#1936) Without login create badges links now displays error messages `Please Login to continue`. Fixes fossasia#1934 * Fixes fossasia#1902 (fossasia#1903) Rectify the typographical errors in documentation of localvir.md * Adds the about us section. (fossasia#1868) The about us section has been added. Fixes fossasia#1865 * Fix-1992 & Fix-1900 (fossasia#1923) * Added Contact Section with Dynamic URl's (fossasia#1888) * Fix Preview (fossasia#1884) * Contact Us added in footer (fossasia#1940) * Fixes Badge overlapping (fossasia#1948) Badge overlapping has been fixed by modifying the z-index. Fixes fossasia#1947 * Added tests for logo section (fossasia#1946) Tests for the logo section have been added. Fixes fossasia#1945 * Route tests for contact section have been added (fossasia#1943) Fixes fossasia#1942 * Cross origin links are now safe (fossasia#1941) Added rel = noopener to the links which open in new tab. Fixes fossasia#1925 * Fix 1893 Retrieving Badges in My Badges Section (fossasia#1899) * Fix-1893 Fixing Fetching Of My Badges * Update generateBadges.py * Update generateBadges.py * Update generateBadges.py * "Fi Badge Model " - Add Font Color Columns (fossasia#1960) * Adds the option to use default logo (fossasia#1976) The option to use default logo has been added. * Updated overlay-welcome with latest instructions. (fossasia#1966) * Fixes fossasia#1871 : Realtime password Matching (fossasia#1873) Realtime password matching has been enabled Fixes fossasia#1871 * Urllib updated to 1.24.1 (fossasia#1955) Updated the urllib3 dependency Fixes fossasia#1952 * Profile Image is not responsive (fossasia#1958) Fixed the profile image responsiveness Fixes fossasia#1929 * Updated the user guide (fossasia#1962) Updated the user guide with the latest instructions. * Fixes 4.5" x 4" preview (fossasia#1979) The preview for 4.5"x4" has been fixed. Fixes fossasia#1968 * Fix Badge size preview interchange (fossasia#1983) The 4.5"x4" and 4"x3" preview was interchanged due to wrong values being passed in the mutateBadgeSize function. Fixes fossasia#1980 * Modify ISSUE_TEMPLATE to include issue description (fossasia#1995) * Fixed the features section on home page (fossasia#1991) * feature: import from eventyay attendees file and different background for multiple ticket types (fossasia#1984) * Enable Default Logo Option (fossasia#1982) * Enable Default Logo Option * Enable Default Logo Option * Updating Verify Email UI (fossasia#1974) * Included natives package (fossasia#1972) * Removed npm test error (fossasia#2000) * Removed duplicate key error (fossasia#1999) * Made the changes * Removed defaultlogoimage method * fix font size and font family working in create badges (fossasia#1957) * Python Decouple to import Firebase Database URLs (fossasia#2014) * Fixes fossasia#1902 Rectify the typographical errors in documentation of localvir.md * Issue - fossasia#2013 Python Decouple installed and added to requirements. Firebase Database URLs added to .env and imported using python decouple * fix/2001: add test for badge-background component (fossasia#2002) * add cut line in badge svgs (fossasia#1969) * * Fix for issue fossasia#2015 (fossasia#2019) Modify ResetPasswordToken in 'Forgot Password' - If ResetPasswordToken already exists then update it, else create a new one * Minor tweak in enter details input (fossasia#2018) * Minor improvements in localvir.md (fossasia#2009) * Minor improvements in localvir.md * Moved the command before step 3 and made it bold * Implemented Edit badge Functionality (fossasia#2028) * Edit badge functionality * Change submit button text to 'Save Changes' when editing badges * Signup action is now more secure (fossasia#2005) * Signup action is now more secure * Update .env.example * Issue fossasia#2022: (fossasia#2024) Rectify the error in User.getUser() in reset password * Issue 2025 (fossasia#2026) Add docstrings for Response class and its various functions. * Add existing username check to signup (fossasia#2031) * Tests added for edit badge section (fossasia#2046) * Fixes fossasia#1977 : The logo is not responsive (fossasia#2045) * Fixes fossasia#1977 : The logo is not responsive Fixed the logo responsiveness of the preview section * Update preview.hbs * Updating ReadME for Mac Users (fossasia#2051) * Updating ReadME for Mac Users
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1865
developmentbranch.Changes proposed in this pull request:
-The about us section for badgeyay has been added..
Screenshots