Skip to content

Dev master conflicts #645

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

Merged
merged 73 commits into from
Oct 17, 2020
Merged

Dev master conflicts #645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
48659f0
Implements markdown and priview functionality
AuraOfDivinity Jul 10, 2020
e8c63e6
Parsing content within comment
AuraOfDivinity Jul 14, 2020
ebdd505
Merge branch 'development' into markdown-post
AuraOfDivinity Jul 14, 2020
ace827a
Merge pull request #513 from AuraOfDivinity/markdown-post
vaibhavdaren Jul 15, 2020
ca2f33c
Comment notifications (#501)
AuraOfDivinity Jul 15, 2020
a9f407e
Initial commit to Account page
AuraOfDivinity Jul 15, 2020
71f0320
Fixing conflicts
AuraOfDivinity Jul 18, 2020
56cbf80
Addition of Post Content Popup
AuraOfDivinity Jul 19, 2020
b9c51d8
Changes for Jitsi UI (#518)
nisarg1499 Jul 19, 2020
7467b41
fixing dev branch issues (#525)
AuraOfDivinity Jul 20, 2020
bc3493b
implemented user activity and fix inconsistencies (#527)
Rupeshiya Jul 21, 2020
bb0348f
Settings integrate and deploy configuration (#530)
Rupeshiya Jul 27, 2020
c526369
Insights (#529)
AuraOfDivinity Jul 27, 2020
3b8de03
Fixing modal issues (#531)
AuraOfDivinity Jul 27, 2020
c22c9ac
Requested changes
AuraOfDivinity Jul 30, 2020
2b1b70c
Fixing conflicts
AuraOfDivinity Jul 30, 2020
b534b91
Post Reactions
AuraOfDivinity Aug 3, 2020
2e6152a
Reactions Modal
AuraOfDivinity Aug 3, 2020
ec5f5c5
Requested changes
AuraOfDivinity Aug 5, 2020
d6a2b8b
Minor fixes
AuraOfDivinity Aug 5, 2020
ffa02e6
Requested changes
AuraOfDivinity Aug 6, 2020
65e0814
social links fix (#545)
Rupeshiya Aug 6, 2020
8b3ac65
fix issues (#555)
Rupeshiya Aug 6, 2020
0f99b07
Fixing proposal functionality issues (#553)
AuraOfDivinity Aug 6, 2020
3d03c8c
Fixed issues, modified project structure, check user profile (#558)
Rupeshiya Aug 6, 2020
afe593e
Fixing proposal functionality issues (#553)
AuraOfDivinity Aug 6, 2020
818073c
sync with dev
Rupeshiya Aug 7, 2020
c57ef6f
Merge branch 'development' into account-page
AuraOfDivinity Aug 7, 2020
eac6a39
Merge branch 'development' into reactions
AuraOfDivinity Aug 7, 2020
72b4709
Adding pagination to dashboard and minor changes. (#495)
AuraOfDivinity Aug 7, 2020
9bc2ca6
Initial commit to Account page (#521)
vaibhavdaren Aug 7, 2020
446a765
Merge branch 'development' into reactions
vaibhavdaren Aug 7, 2020
2e352ab
Merge pull request #556 from AuraOfDivinity/reactions
vaibhavdaren Aug 7, 2020
9b52019
Fixing issues caused by reactions PR
AuraOfDivinity Aug 7, 2020
1e3cd50
Merge pull request #561 from AuraOfDivinity/dev-fixes
vaibhavdaren Aug 7, 2020
9f7d203
Fixing Dashbiard navbar issues
AuraOfDivinity Aug 8, 2020
689a1df
Integrations UI
AuraOfDivinity Aug 9, 2020
8a10b02
Fixes #565
ksraj123 Aug 10, 2020
41789c6
Merge pull request #562 from AuraOfDivinity/dashboard-issues
vaibhavdaren Aug 10, 2020
b2e8bc5
Merge pull request #564 from AuraOfDivinity/Integrations-page
vaibhavdaren Aug 10, 2020
22f0316
Merge pull request #566 from ksraj123/Issue565
vaibhavdaren Aug 10, 2020
b73a906
pagination, login control, name control
Rupeshiya Aug 10, 2020
9e4df8f
Merge branch 'development' of https://github.com/codeuino/social-plat…
Rupeshiya Aug 11, 2020
c9e6e18
Integrating post edit share and delete functionalities
AuraOfDivinity Aug 12, 2020
992f9a0
fixing breakdown functions and inconsistencies
Rupeshiya Aug 12, 2020
8ee2387
Merge pull request #569 from Rupeshiya/pagination
vaibhavdaren Aug 12, 2020
86aee68
Updated Navbar
AuraOfDivinity Aug 12, 2020
b05a9ae
Community settings Icon changed
AuraOfDivinity Aug 12, 2020
327c416
User Integrations
AuraOfDivinity Aug 13, 2020
f1c6b72
Fixing conflicts
AuraOfDivinity Aug 13, 2020
d9c9f80
Merge pull request #571 from AuraOfDivinity/nav-panel
vaibhavdaren Aug 13, 2020
b8f7e9f
Minor fixes
AuraOfDivinity Aug 14, 2020
1f48f6a
Merge pull request #573 from AuraOfDivinity/dashboard-fixes
vaibhavdaren Aug 14, 2020
de8adc4
Requested changes
AuraOfDivinity Aug 14, 2020
a436f98
Merge branch 'development' into post-integrations
AuraOfDivinity Aug 14, 2020
9147237
Merge pull request #572 from AuraOfDivinity/user-integrations
vaibhavdaren Aug 14, 2020
48d0d88
Merge pull request #568 from AuraOfDivinity/post-integrations
vaibhavdaren Aug 14, 2020
1578089
user timeline
Rupeshiya Aug 14, 2020
82aae41
Merge branch 'development' of https://github.com/codeuino/social-plat…
Rupeshiya Aug 14, 2020
37e911a
Merge pull request #574 from Rupeshiya/user_activity
Rupeshiya Aug 14, 2020
4d1dd4f
endpoint
Rupeshiya Aug 15, 2020
6bed08d
Merge pull request #2 from Rupeshiya/end_point
Rupeshiya Aug 15, 2020
303b2a0
Merge pull request #575 from Rupeshiya/development
Rupeshiya Aug 15, 2020
cc57ac9
small fix for user profile
Rupeshiya Aug 17, 2020
131826d
Merge pull request #576 from Rupeshiya/small_fix
Rupeshiya Aug 17, 2020
58d7795
minor prop fix
Rupeshiya Aug 25, 2020
3db63c6
Merge pull request #587 from codeuino/minor_fix
Rupeshiya Aug 25, 2020
f4f82db
Updated ReadMe
AuraOfDivinity Aug 27, 2020
cbd05d3
Requested changes
AuraOfDivinity Aug 27, 2020
4ef554f
Feature Wikis
ksraj123 Aug 30, 2020
77d0286
Merge pull request #581 from ksraj123/feature-wikis
vaibhavdaren Aug 30, 2020
01e9575
Merge pull request #588 from AuraOfDivinity/updated-docs
vaibhavdaren Sep 7, 2020
8c61bd5
Fixing conflicts
AuraOfDivinity Oct 12, 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
2 changes: 1 addition & 1 deletion .env.production
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#.env.production
REACT_APP_API_ENDPOINT = "https://codeuino-donut-development.herokuapp.com"
REACT_APP_API_ENDPOINT = "https://gsoc-donut.herokuapp.com"
232 changes: 132 additions & 100 deletions README.md
View file
Open in desktop

Large diffs are not rendered by default.

Loading