Skip to content
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

Jump to bottom

request #43

Open
wants to merge 197 commits into
base: add-license-1
Choose a base branch
from
Open

request #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
197 commits
Select commit Hold shift + click to select a range
7b228dc
Merge pull request #2 from NearbyShops/add-license-1
SumeetMoray Apr 11, 2020
a80ef6f
Update README.md
SumeetMoray Apr 11, 2020
d217cfd
Safety Commit !
SumeetMoray Apr 11, 2020
0cfa79a
Merge remote-tracking branch 'origin/master'
SumeetMoray Apr 11, 2020
28ffba8
Delete LICENSE
SumeetMoray Apr 12, 2020
5034766
Create LICENSE
SumeetMoray Apr 14, 2020
e63634b
Merge pull request #5 from NearbyShops/add-license-2
SumeetMoray Apr 14, 2020
85d34d6
Update README.md
SumeetMoray Apr 14, 2020
0a51eaa
minor refinements !
SumeetMoray Apr 14, 2020
abdd6b9
Merge remote-tracking branch 'origin/master'
SumeetMoray Apr 14, 2020
82da0f6
Update README.md
SumeetMoray Apr 14, 2020
9d6c7e6
Update README.md
SumeetMoray Apr 14, 2020
f7264af
now prices can be set in decimal !
SumeetMoray Apr 15, 2020
da2c812
Merge remote-tracking branch 'origin/master'
SumeetMoray Apr 15, 2020
a319a11
added feature ... half quantity and quarter quantity !
SumeetMoray Apr 15, 2020
ef8ccdc
small refinements in viewholdershopitem layout !
SumeetMoray Apr 15, 2020
ad3af6e
few more refinements in shop item view holder !
SumeetMoray Apr 15, 2020
0f24ccc
Update README.md
SumeetMoray Apr 15, 2020
ccb43e3
lot of refinements !
SumeetMoray Apr 20, 2020
89ae928
Merge remote-tracking branch 'origin/master'
SumeetMoray Apr 20, 2020
5982549
improvements in ui design of place order screen and list item deliver…
SumeetMoray Apr 21, 2020
b483026
Refinements and updates in User Interface. Updates in Delivery Screen…
SumeetMoray Apr 23, 2020
e7e984d
Update README.md
SumeetMoray Apr 23, 2020
7595e8e
Update README.md
SumeetMoray Apr 23, 2020
cad91ed
minor refinements in transaction detail screen !
SumeetMoray Apr 23, 2020
bf09f50
Merge remote-tracking branch 'origin/master'
SumeetMoray Apr 23, 2020
7c0c540
added a docker compose file !
SumeetMoray Apr 24, 2020
f136829
Delete LICENSE
SumeetMoray Apr 25, 2020
7a85b9f
Update README.md
SumeetMoray Apr 25, 2020
382dadc
Fixed an error in activity_place_order.xml .
SumeetMoray Apr 25, 2020
6ed0cf8
Merge remote-tracking branch 'origin/master'
SumeetMoray Apr 25, 2020
56b1eb3
made few more updates in activity_place_order.xml file
SumeetMoray Apr 25, 2020
a941eb9
fixed a bug where we were able to add to cart an item which was out o…
SumeetMoray Apr 26, 2020
e506bf5
New Layout for delivery address !
SumeetMoray Apr 26, 2020
a51a28d
Easier Customization
abajorat Apr 25, 2020
1b3f6ad
Revert "Easier Customization"
abajorat Apr 25, 2020
1727681
Revert "Revert "Easier Customization""
abajorat Apr 25, 2020
1fe3341
Took out personal data
abajorat Apr 25, 2020
e493bdd
Create custom_settings_andre.xml
abajorat Apr 25, 2020
145bdac
Fixed wrong uploads
abajorat Apr 25, 2020
947d743
Added customization for multi_market_enabled
abajorat Apr 25, 2020
b2db69c
Put custom_settings into ignore
abajorat Apr 26, 2020
c35e269
Updated some string references
abajorat Apr 26, 2020
476b461
Merge pull request #1 from abajorat/master
abajorat Apr 26, 2020
e401dab
Spanish translation
asdrolf Apr 26, 2020
dae136d
Translate sp
asdrolf Apr 26, 2020
88df8b5
Translation sp
asdrolf Apr 26, 2020
d19207a
Update custom_settings.xml
asdrolf Apr 27, 2020
be99b60
Merge pull request #24 from abajorat/master
SumeetMoray Apr 27, 2020
148f49e
minor refinements !
SumeetMoray Apr 27, 2020
06ecfa4
Merge remote-tracking branch 'origin/master'
SumeetMoray Apr 27, 2020
0642908
refinements in delivery address layout !
SumeetMoray Apr 27, 2020
0f56ebb
Merge pull request #2 from abajorat/artur
abajorat Apr 27, 2020
470e0aa
Merge branch 'master' of https://github.com/abajorat/Nearby-Shops-And…
abajorat Apr 27, 2020
e9aeb6a
Changes back
abajorat Apr 27, 2020
0d82e7c
Fix for icon and spanish xml
abajorat Apr 28, 2020
6319a3a
changed default url to be compatible with multi market mode
abajorat Apr 28, 2020
7b71839
Merge pull request #26 from abajorat/master
abajorat Apr 28, 2020
b6840fc
new layouts for items in shop ! and added super admin !
SumeetMoray Apr 29, 2020
3d935e9
Merge remote-tracking branch 'origin/master'
SumeetMoray Apr 29, 2020
1b1025d
refinements in cart item layout and cart layout !
SumeetMoray Apr 30, 2020
6191ade
updates in edit market screen !
SumeetMoray Apr 30, 2020
d23403a
super admin can now enable / or disable a market !
SumeetMoray Apr 30, 2020
6ece5de
refinements in custom settings file !
SumeetMoray Apr 30, 2020
2371406
more refinements in custom settings !
SumeetMoray Apr 30, 2020
ad7fddc
fixed an error with item discount calculation !
SumeetMoray Apr 30, 2020
0683b1a
fixed an issue with location not getting updated automatically.
SumeetMoray May 1, 2020
51859df
added single vendor mode !
SumeetMoray May 1, 2020
cd3dd5c
added search bar to items in shop screen and other refinements !
SumeetMoray May 1, 2020
0fbc541
added new layout for cart items !
SumeetMoray May 3, 2020
d676bf1
few more refinements !
SumeetMoray May 3, 2020
6a6932a
few more refinements !
SumeetMoray May 3, 2020
01baeb6
removed google maps api key and other refinements !
SumeetMoray May 5, 2020
bc0decd
added feature to calculate savings over MRP in cart item list
SumeetMoray May 6, 2020
f764b0f
now savings over MRP is visible in the Order Details screen also !
SumeetMoray May 6, 2020
38d86ca
added custom settings to enable or disable login using phone or email !
SumeetMoray May 6, 2020
76de381
now people can switch between google maps or mapbox
SumeetMoray May 6, 2020
d2b7f84
added field discounted price in the edit item screen !
SumeetMoray May 6, 2020
274985e
lots of refinements !!!
SumeetMoray May 10, 2020
ffb991f
refinements in sds admin !
SumeetMoray May 12, 2020
3b7b29d
Create LICENSE
SumeetMoray May 12, 2020
7da0ac6
Merge pull request #30 from NearbyShops/add-license-2
SumeetMoray May 12, 2020
0ad6efc
Update README.md
SumeetMoray May 12, 2020
e96d3e5
Update README.md
SumeetMoray May 12, 2020
4c075bb
Update README.md
SumeetMoray May 13, 2020
a46bcfd
lot of refinements !
SumeetMoray May 17, 2020
a892fca
Merge remote-tracking branch 'origin/master'
SumeetMoray May 17, 2020
6780ac2
fixed the bug where the app was crashing on android 7.0
SumeetMoray May 18, 2020
b864da8
fixed an issue with list loading in paged list adapter !
SumeetMoray May 19, 2020
e8f3634
some changes in fcm configuration !
SumeetMoray May 20, 2020
d1cba45
fixed a bug with images not getting uploaded !
SumeetMoray May 21, 2020
654d61d
added horizontal market selection !
SumeetMoray May 22, 2020
f8eaa62
refinements
SumeetMoray May 22, 2020
0520d70
improvements in login layouts !
SumeetMoray May 22, 2020
fea6d85
added vendor suggestions and many other improvements ... fixed an iss…
SumeetMoray May 26, 2020
236c2e0
Delete LICENSE
SumeetMoray May 27, 2020
5699add
Update README.md
SumeetMoray May 27, 2020
9ac10ee
Create LICENSE
SumeetMoray May 27, 2020
87cbeda
Update README.md
SumeetMoray May 27, 2020
720f833
Update README.md
SumeetMoray May 27, 2020
059bd07
refinements in orders inventory ... and in the middle of removing and…
SumeetMoray May 29, 2020
e94247f
Merge remote-tracking branch 'origin/master'
SumeetMoray May 29, 2020
d38c39d
added a new image picker and cropping library !
SumeetMoray May 30, 2020
bda957f
fixed adjacent fragment refresh issue ... and added new docker-compos…
SumeetMoray May 31, 2020
470f30b
Delete LICENSE
SumeetMoray May 31, 2020
f74948b
Update README.md
SumeetMoray May 31, 2020
fb9593c
Update README.md
SumeetMoray May 31, 2020
9ba4345
minor api changes !
SumeetMoray Jun 24, 2020
625babf
refinements and improvements !
SumeetMoray Jun 24, 2020
ea11a88
Update docker-compose.yml
SumeetMoray Jul 31, 2020
e2bca6d
Update README.md
SumeetMoray Aug 12, 2020
d55952d
Update README.md
SumeetMoray Aug 13, 2020
c49d7ce
Update docker-compose.yml
SumeetMoray Aug 15, 2020
b4ad362
Update README.md
SumeetMoray Aug 19, 2020
dbdb894
Update docker-compose.yml
SumeetMoray Aug 21, 2020
c6027dd
Update custom_settings.xml
SumeetMoray Sep 29, 2020
05f60d5
Update README.md
SumeetMoray Nov 18, 2020
fcfde99
Update README.md
SumeetMoray Nov 23, 2020
d5f0ca3
Update README.md
SumeetMoray Nov 23, 2020
6a9a59c
Update README.md
SumeetMoray Nov 29, 2020
ec51aa7
Update docker-compose.yml
SumeetMoray Nov 29, 2020
0664f7d
Update README.md
SumeetMoray Nov 29, 2020
b0a78fe
added powered by, improved the profile screen and few other changes
SumeetMoray Dec 5, 2020
cc8102e
Update custom_settings.xml
SumeetMoray Dec 5, 2020
2da57f3
Revert "added powered by, improved the profile screen and few other c…
SumeetMoray Dec 6, 2020
de85bd7
reverted previous commit
SumeetMoray Dec 6, 2020
7dc7735
created a free version !
SumeetMoray Dec 13, 2020
19ac90a
created a free version !
SumeetMoray Dec 13, 2020
04a0ec6
Update README.md
SumeetMoray Dec 14, 2020
477191c
Update README.md
SumeetMoray Dec 15, 2020
d808ae2
Update README.md
SumeetMoray Dec 15, 2020
1441ae0
safety commit !
SumeetMoray Dec 16, 2020
a5931aa
safety commit !
SumeetMoray Dec 16, 2020
0095fc9
Update README.md
SumeetMoray Dec 16, 2020
6ce14aa
new test commit !
SumeetMoray Dec 16, 2020
5c73284
added extra option to hide cancel button and hide phone number from v…
SumeetMoray Dec 17, 2020
58d6d6d
added extra option to hide cancel button and hide phone number from v…
SumeetMoray Dec 17, 2020
510b1db
added extra option to hide cancel button and hide phone number from v…
SumeetMoray Dec 17, 2020
6174021
Revert "added extra option to hide cancel button and hide phone numbe…
SumeetMoray Dec 21, 2020
e2e0ddc
Revert "added extra option to hide cancel button and hide phone numbe…
SumeetMoray Dec 21, 2020
a4ea4c9
Revert "added extra option to hide cancel button and hide phone numbe…
SumeetMoray Dec 21, 2020
abda98d
Revert "new test commit !"
SumeetMoray Dec 21, 2020
e764d1b
Revert "Update README.md"
SumeetMoray Dec 21, 2020
363c507
Revert "safety commit !"
SumeetMoray Dec 21, 2020
1caddd5
Revert "safety commit !"
SumeetMoray Dec 21, 2020
974ce89
Revert "Update README.md"
SumeetMoray Dec 21, 2020
54333f9
Revert "created a free version !"
SumeetMoray Dec 21, 2020
239f291
Revert "reverted previous commit"
SumeetMoray Dec 21, 2020
973049f
Update README.md
SumeetMoray Jan 3, 2021
2be632f
Update README.md
SumeetMoray Jan 12, 2021
4bd9b45
added new code !
SumeetMoray Jan 12, 2021
0dbb93b
added new code !
SumeetMoray Jan 12, 2021
76bab26
set the proper market url !
SumeetMoray Jan 12, 2021
aed8694
Update README.md
SumeetMoray Jan 12, 2021
d29ec1b
new update and refinements in the flow of place order screen !
SumeetMoray Jan 14, 2021
8e81981
Merge remote-tracking branch 'origin/master'
SumeetMoray Jan 14, 2021
a621fc5
design refinements in items in shop screen !
SumeetMoray Jan 14, 2021
78610df
design refinements in items in shop screen !
SumeetMoray Jan 14, 2021
09c9460
design refinements !
SumeetMoray Jan 17, 2021
741c83b
design refinements !
SumeetMoray Jan 18, 2021
8cd3fd8
Create LICENSE
SumeetMoray Mar 9, 2021
07036c7
Update README.md
SumeetMoray Mar 9, 2021
c15fd6e
Update README.md
SumeetMoray Mar 9, 2021
c3e6621
Update README.md
SumeetMoray Mar 9, 2021
3b8caa8
Update README.md
SumeetMoray Mar 23, 2021
7b1b69e
Update README.md
SumeetMoray Mar 23, 2021
aa879f7
Update README.md
SumeetMoray Mar 27, 2021
9d611cf
Gradle: Update wrapper and scripts to 6.8.3
EwoutH Apr 12, 2021
689cb36
Merge pull request #39 from EwoutH/gradle-6.8.3
SumeetMoray Apr 15, 2021
735ae39
Update README.md
SumeetMoray May 27, 2021
ae3a063
Update README.md
SumeetMoray May 27, 2021
211e3e2
Delete app directory
SumeetMoray Jun 9, 2021
8b18117
Update README.md
SumeetMoray Jun 9, 2021
00c5e45
Update README.md
SumeetMoray Jun 9, 2021
b56415f
New Version Files !
SumeetMoray Oct 7, 2021
c2aacfa
New Version Files !
SumeetMoray Oct 7, 2021
3a50203
Update README.md
SumeetMoray Oct 7, 2021
11a67b5
Update README.md
SumeetMoray Oct 7, 2021
cf48818
Update README.md
SumeetMoray Oct 7, 2021
31fd249
Update README.md
SumeetMoray Oct 7, 2021
54ac6c8
many small feature updates !
SumeetMoray Oct 8, 2021
de32ec7
Merge remote-tracking branch 'origin/master'
SumeetMoray Oct 8, 2021
7ddbb79
changed app icon !
SumeetMoray Oct 8, 2021
fb00b4b
changed app icon !
SumeetMoray Oct 8, 2021
0a895ac
updated app url
SumeetMoray Oct 8, 2021
d05ec79
added bill generator
SumeetMoray Oct 8, 2021
be496c3
Country Code Picker in login screen is no longer limited to one count…
SumeetMoray Oct 13, 2021
1e234b2
updated docker compose file
SumeetMoray Oct 13, 2021
f8439dc
Update README.md
SumeetMoray Oct 14, 2021
776b7cc
Create LICENSE
SumeetMoray Oct 14, 2021
ba1d8fe
Merge pull request #40 from NearbyShops/add-license-2
SumeetMoray Oct 14, 2021
380b76b
Update README.md
SumeetMoray Oct 14, 2021
90c0cf0
Update README.md
SumeetMoray Oct 14, 2021
850fb8f
Update README.md
SumeetMoray Oct 14, 2021
0a22c85
Added new features ... improved shop profile screen ... fixed a bug w…
SumeetMoray Oct 15, 2021
ef6a5e0
fixed an issue
SumeetMoray Feb 4, 2022
0c5c5d5
updated gradle version !
SumeetMoray Feb 18, 2022
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
  •  
  •  
  •  
18 changes: 5 additions & 13 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
*.iml
.gradle
/local.properties
/.idea/caches
/.idea/libraries
/.idea/modules.xml
/.idea/workspace.xml
/.idea/navEditor.xml
/.idea/assetWizardSettings.xml
.DS_Store
/build
/captures
.externalNativeBuild
/build/
/app/build
/app/release
/.idea
/.gradle
6 changes: 6 additions & 0 deletions .idea/compiler.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/gradle.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 35 additions & 0 deletions .idea/jarRepositories.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

125 changes: 120 additions & 5 deletions .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading