Skip to content

Merge Rubrics to dev #48

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
Open
sakshibasapure wants to merge 155 commits into
base: main
Choose a base branch
from
Open

Merge Rubrics to dev #48

sakshibasapure wants to merge 155 commits into from

Conversation

@sakshibasapure
Copy link

@sakshibasapure sakshibasapure commented Oct 20, 2023

No description provided.

shonilbhide and others added 30 commits October 12, 2023 18:24
@shonilbhide
Delete docs/dollar_bot/** directory
4bf7ed5 
Deleting as it created problems while cloning
@shonilbhide
Delete docs/dollar_bot/code directory
1b6c419
Issue3_bug : Code for handling null data for pdf
937f555
@rutuja-39
Merge pull request #5 from shonilbhide/Issue_3_Bug
18bd669 
PR changes from Issue3_bug to dev
@shonilbhide
changes for iss#1 to add feature foe new category
adbb669
@shonilbhide
Merge branch 'dev' of https://github.com/shonilbhide/dollar_bot into …
59453a5 
…issue_2
@shonilbhide
Merge pull request #10 from shonilbhide/issue_2
cccc3db 
Issue 2
@sakshibasapure
Issue_6_Enhancement: Code changes done to show category list after ad…
bf912a6 
…d command.
@sakshibasapure
Updated user.properties
c1ec38f
@agmalpur
Update history.md
e696f1f 
changing the documentation according to changes in issue#8
@agmalpur
Added Tabular format to display history
2d572b8
@shonilbhide
Merge pull request #14 from shonilbhide/Issue_8_Enhancement
e61d08e 
Issue 8 enhancement
@sakshibasapure
Merge pull request #12 from shonilbhide/Issue_6_Enhancement
c60c66f 
Merge code changes from Issue_6 to dev
@agmalpur
Issue_9_Enhancement: Registration of new users
0cdcb8a
@agmalpur
Merge pull request #17 from shonilbhide/Issue_9_Enhancement
c68edec 
Merge code changes from Issue_9_Enhancement to dev
@sakshibasapure
Issue_16_Enhancement: Added delete_expense feature
d08df8c
@sakshibasapure
Merge remote-tracking branch 'origin/dev' into Issue_16_Enhancement
23834c8
@sakshibasapure
Merge pull request #20 from shonilbhide/Issue_16_Enhancement
dfdc0bc 
Merge code changes from Issue_16_Enhancement to Dev
@sakshibasapure
Merge remote-tracking branch 'origin/main' into dev
1743b70
@shonilbhide
Adding Fn to add expeses as per issue18
23cf646
@shonilbhide
Refactoring return st bugs after merging
ff45348
@shonilbhide
Merge pull request #22 from shonilbhide/issue_#18
0fbd623 
Adding Fn to add expeses as per issue18
Issue15_Enhancement-modified generated pdf format
1a81087
Merge remote-tracking branch 'origin/dev' into Issue_15_Enhancement
f825ff3
@rutuja-39
Merge pull request #21 from shonilbhide/Issue_15_Enhancement
46e2e48 
PR code changes from Issue 15 enhancement to dev
@shonilbhide
fixing pdf exception bug
613ecf1
@agmalpur
Dev: Font family error resolved
aa48d09
@shonilbhide
Adding lowercase options for selecting users
1234cc4
@sakshibasapure
Merge pull request #25 from shonilbhide/issue_#18
098fa5c 
Adding lowercase options for selecting users
@agmalpur
Issue_19_Enhancement: Delete user functionality
124bb4d
rutuja-39 and others added 30 commits October 19, 2023 19:38
Issue-51-passing the exception
8703879
Merge remote-tracking branch 'origin/Issue_51_Documentation' into dev
25abf06
@shonilbhide
fixing csv_data bug
cd1d1f5
@sakshibasapure
Added RUBRICS.md for Proejct 2
00196b6
@sakshibasapure
Merge pull request #89 from shonilbhide/Rubrics
e949970 
Merge RUBRICS to dev
@shonilbhide
Update config.yml
b78c6fa
@shonilbhide
Merge pull request #90 from shonilbhide/shonilbhide-patch-1
dd0c687 
Shonilbhide patch 1
Issue71- documentation of add.py
04f5a78
@shonilbhide
changes to readme.md
6cb85c8
@shonilbhide
Merge branch 'dev' of https://github.com/shonilbhide/dollar_bot into dev
42f4df6
Merge remote-tracking branch 'origin/Issue_71_documentation' into dev
bf9d75a
@sakshibasapure
Rubrics added
7b9e152
@shonilbhide
readme.md changes
6085576
@sakshibasapure
Merge pull request #91 from shonilbhide/Rubrics
e08d00f 
MErge changes to Dev
Issue_87_Description of add_user added
039506e
@agmalpur
Merge pull request #88 from shonilbhide/Issue_87_Documentation
c2c14c8 
PR changes from Issue_87_Documentation to dev
@sakshibasapure
Added Video in Repo
404bb7e
@sakshibasapure
Code cleanup
469c4d1
@sakshibasapure
Merge branch 'Rubrics' of https://github.com/shonilbhide/dollar_bot i…
98f0c25 
…nto Rubrics
@sakshibasapure
Update code.md
71920ee
@sakshibasapure
Update graphing.md
35aadde
@sakshibasapure
Update helper.md
5a66487
@sakshibasapure
Update history.md
4e5dac8
@sakshibasapure
Create notifier.md
b720ede
@sakshibasapure
Added notify.md
d189c9a
@sakshibasapure
Create pdf.md
d277d3f
@sakshibasapure
Updated YouTube link
43020de
@sakshibasapure
Updated README.md
986879b
@sakshibasapure
Added function details
a70ba5b
@sakshibasapure
Merge branch 'Rubrics' of https://github.com/shonilbhide/dollar_bot i…
56cda5d 
…nto Rubrics
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@sakshibasapure @shonilbhide @rutuja-39 @agmalpur