Skip to content

Commit

Permalink
[GSoc] - Merged master to develop and preparing develop for GSoC bran…
Browse files Browse the repository at this point in the history
…ch merge (#900)

* setting up the router

* minor fixes

* removed unneccasry const keywords

* Hiding FAB on reaching end of list

* set newsfeed-set_url_page naigation

* Update tests regarding the navigation change

* Add Posts Model

* Implementing Posts Model

* Change in newsfeed.dart

* event_controller

* Group controller

* linter fix

* PR checks fix

* Flutter format

* ptch: flutter format linter

* refactored the code

* Revert "refactored the code"

This reverts commit 9a7ddb6.

* test

* controller add

* query update

* tile addition

* pagination

* flutter format

* ptch: Add & Implement EventsModal

* ptch: Add & Implement OrgMember

* script for automatically adding trailing commas

* added description to the funtions, added the script in pull-request.yml

* refac: fixes linting issues

* Logic correction and flutter formatting

* Added MVVM

* Added mdoel to the locator and debugging

* Flutter Format

* Fixing travis tests

* Add FutureBuilder Logic To Main.dart

* logic correction

* setted MVVM structure

* Attached viewModel

* reduced lines

* refactored and completed local device test.

* updated tests

* Add news_article+page_view_model.dart

* Implements the ViewModel

* ptch: Updated the Test

* ptch: flutter linting

* logic correction

* minor error fixing after merge conflict

* minor error fixing after merge conflict

* minor error fixing after merge conflict

* Flutter format

* Fixing errors

* Updated Tests

* ptch: Adding Comment Bug Fix

* ptch: flutter linitng

* ptch: test update

* Fixed code formatting

* bfix: fixes comment count not updating on newsfeed

* ptch: Change in Loader

* ptch: Change in Loader

* ptch: added default parameter in Loader

* logic correction

* upstream fetch

* Flutter format .

* conflict

* Url controller

* url page controller addn

* controller registration

* Unused files removal

* Adding test

* conflict resoved

* fixing tests

* Fixed errors

* Flutter format .

* Flutter Format

* Merge remote-tracking branch 'upstream/master' into newPagination

* flutter format .

* flutter format

* flutter format .

* Fixes #793

* flutter format .

* fixed changes

* flutter format

* Merge remote-tracking branch 'upstream/master' into provider-add

* flutter format .

* fixed formatting

* Fixed formatting

* Merge remote-tracking branch 'upstream/master' into provider-add

* Merge remote-tracking branch 'upstream/master' into provider-add

* Fixed travis build fail

* chore: fixes linting issue

* events update

* ptch: Flutter lint

* ptch: Replace the Column with Listview in Loader.dart

* controlller add

* flutter format .

* Image Handler

* Image Ui and Controller Connection

* Test Updates

* uniformisation

* Code style prttification

* app localization and language controller addition

* language

* logic correction with generalised approach rather than specific case-wise approach

* change of a minor error in pull-request.yml

* addition of justified docstrings and methodogy

* correction of a specific case in group_controller.dart's formatting

* increasing the legibility of the code

* removed usused import from post_cotroller.dart for resubmitting for the build

* Fix : Not able to close pop up in Join Organization Screen #815

Bug was caused due to Page context was used in close button instated new context of builder.

Fix:
Refactor : ctx -> dialogContext
Change : context -> dialogContext (line 142)

* undoing the change in pubspec.yaml for travis CI build

* Splash Screen Added

* travis ci fix

* fix

* http ^0.12.0+4

* fix

* dependency overide

* dependency overide

* dependency change

* compatible packages

* adding crypto 2.1.3

* crypto: 3.0.1

* To rerun travis ci

* Done : code formatting

* Red screen error resolved from the update profile page(Issue #824)

* [Fix] RenderFlex overflow in Member details Screen

* Merge branch 'functionality-to-crop-picture' of https://github.com/afaanshariff/talawa into functionality-to-crop-picture

* resolved merge conflicts

* resolved exceptions in image_service.dart

* resolved exceptions in image_service.dart

* Organisation setting bug fix

- Fixes bug #833
- Code reformatting of profile_page_viewModel.dart and profile_page.dart

* Updated CONTRIBUTING.md with new Branching Strategy

* Removed gitflow from CONTRIBUTING.md

* Fixed typo in CONTRIBUTING.md

* User will not able to delete others event

fix #832

* Simplification of LeaveOrg and OrgSetting Button

* Using snake case in file names

- Flutter SDK was showing Warning as the Camel case was used in the file names so the file was renamed as snake case.

* Organisations directory file size reduction

- dart file size reduction (under 300 lines) of files under  "lib/views/pages/organization" directory
- Code refactored and reformatted

* Users can't see an option to delete if they are not allowed

* Fixes #840

* Fixes #840

* Minor change : Ternary operators removed

* event_dialog file size reduction

- Widgets common between add_event_dialog.dart and edit_event_dialog.dart have been separated into file event_widgets.dart
- Data is passed as parameter
- Register form also reformatted

* Organization names are displayed in sorted order.

* File size reduction set_url_page.dart

* Reformatted

- Reformatted with flutter format
- URL Page Animation extracted and moved to other file

* Update register_form_test.dart

* Update pull_request_template.md

* String refactoring (#829)

* lang addition

* lng-add

* static string removal

* language changes

* chgs in main

* test update

* Language selector UI (#837)

* ui added

* adding lng widget

* bug fix

* test upd

* Edit Event page bug fix (#875)

* [Fix] Event list shows wrong data after deleting an event (#817)

* chore: fixes linting issue

* ptch: replaces event list with displayed events list

* Refactor of the toast widget and deletion of `snackbar.dart` (#813)

* Replacing extra widgets for toasts with Custom Toast and making it uniform

* removed snackbar.dart due to no implementation

* flutter format

* merge conflict resolved

Co-authored-by: rutvik11062000 <[email protected]>
Co-authored-by: Brandon Chung <[email protected]>
Co-authored-by: Astha Nayak <[email protected]>
Co-authored-by: raunak_k02 <[email protected]>
Co-authored-by: ahluwaliatikant <[email protected]>
Co-authored-by: StrangeNoob <[email protected]>
Co-authored-by: Sumitra Saksham <[email protected]>
Co-authored-by: afaanshariff <[email protected]>
Co-authored-by: Troy Anderson <[email protected]>
Co-authored-by: Shreyash Lata <[email protected]>
Co-authored-by: Sagar Utekar <[email protected]>
Co-authored-by: Peter Harrison <[email protected]>
Co-authored-by: AFFAN SHARIFF <[email protected]>
Co-authored-by: Aditya Birangal <[email protected]>
Co-authored-by: Sumitra Saksham <[email protected]>
Co-authored-by: Muskan Modi <[email protected]>
Co-authored-by: Muskan Modi <[email protected]>
Co-authored-by: Aman Anand <[email protected]>
Co-authored-by: DangaRanga <[email protected]>
Co-authored-by: Piyush Goel <[email protected]>
Co-authored-by: Raunak Kumar <[email protected]>
  • Loading branch information
22 people authored Jun 26, 2021
1 parent c7b1666 commit 92b173c
Show file tree
Hide file tree
Showing 255 changed files with 0 additions and 18,803 deletions.
12 changes: 0 additions & 12 deletions .github/FUNDING.yml

This file was deleted.

29 changes: 0 additions & 29 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

22 changes: 0 additions & 22 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

8 changes: 0 additions & 8 deletions .github/PR_TEMPLATE/pr-template.md

This file was deleted.

51 changes: 0 additions & 51 deletions .github/pull_request_template.md

This file was deleted.

22 changes: 0 additions & 22 deletions .github/workflows/countline.sh

This file was deleted.

16 changes: 0 additions & 16 deletions .github/workflows/countlines.yml

This file was deleted.

12 changes: 0 additions & 12 deletions .github/workflows/greetings.yml

This file was deleted.

13 changes: 0 additions & 13 deletions .github/workflows/issue.yml

This file was deleted.

20 changes: 0 additions & 20 deletions .github/workflows/linter.yml

This file was deleted.

Loading

0 comments on commit 92b173c

Please sign in to comment.