Skip to content

Master Release 3 #161

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.

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 20 commits into from
Jun 18, 2020
Merged

Master Release 3 #161

merged 20 commits into from
Jun 18, 2020

Conversation

Mrnikbobjeff
Copy link
Contributor

Pull Request template

Please, go through these steps before you submit a PR.

  1. Make sure that:

    a. You have done your changes in a separate branch. Branches MUST have descriptive names that start with either the fix/ or feature/ prefixes. Good examples are: fix/signin-issue or feature/issue-templates.

    b. You have a descriptive commit message with a short title (first line).

    c. You have only one commit (if not, squash them into one commit).

    d. Running tests doesn't throw any error. If it does, fix them first and amend your commit (git commit --amend).

    e. You have tracked ALL applicable time working in clockify!

  2. After these steps, you're ready to open a pull request.

    a. Your pull request MUST NOT target the master branch on this repository. You probably want to target develop instead.

    b. Give a descriptive title to your PR.

    c. Provide a description of your changes.

    d. Put closes #XXXX in your comment to auto-close the issue that your PR fixes (if such).

IMPORTANT: Please review the CONTRIBUTING.md file for detailed contributing guidelines.

PLEASE REMOVE THIS TEMPLATE BEFORE SUBMITTING

schmidtjonas and others added 20 commits June 12, 2020 18:33
* removed trunk

* also changed main.yml
* fix for linter

* replaced ui package

Co-authored-by: Jonas Schmidt <[email protected]>
* fixed linux installation instructions

* added FFI installation instruction

* detailled instruction 2, removed instruction 5

* Update Windows installation instructions

* Fixed image link

* Removed duplicate text

Co-authored-by: sspangenberg <[email protected]>
Co-authored-by: Niklas Schilli <[email protected]>
* added tccchats

* added tccrequest

* fixed tdparams

* fixes

* Fixed UI problems

* Now properly sorting chatsList

* Started refactoring loading of Chats. This is only a Backup commit if squeak crashes!

* Now cleanly handling loading of Chats with ChatsHandler. But order not working yet

* removed accidental halt

* addChat is now part of ChatsHandler

* Added BackButton, in case that User enters wrong phone number and want to go a step back

* Merged Dev into this branch

Co-authored-by: Jonas Schmidt <[email protected]>
* small fixes

* removed debugging code

* added tccchats

* added tccrequest

* fixed tdparams

* fixes

* Fixed UI problems

* Now properly sorting chatsList

* Started refactoring loading of Chats. This is only a Backup commit if squeak crashes!

* Now cleanly handling loading of Chats with ChatsHandler. But order not working yet

* removed accidental halt

* addChat is now part of ChatsHandler

* Added BackButton, in case that User enters wrong phone number and want to go a step back

Co-authored-by: Jonas Schmidt <[email protected]>
Co-authored-by: Jonas Schmidt <[email protected]>
Co-authored-by: Jonas Schmidt <[email protected]>
* added tccchats

* added tccrequest

* fixed tdparams

* fixes

* Fixed UI problems

* Now properly sorting chatsList

* Started refactoring loading of Chats. This is only a Backup commit if squeak crashes!

* Now cleanly handling loading of Chats with ChatsHandler. But order not working yet

* removed accidental halt

* addChat is now part of ChatsHandler

* added send message methods in core without ui wip

* merge

* random merge

* merge fix

* Fixed identation

* Satisfiying linterTests - categorized all uncategorized

* Removed Legacy Stuff

Co-authored-by: Jonas Schmidt <[email protected]>
Co-authored-by: Frederik Wollny <[email protected]>
Co-authored-by: Jonas Schmidt <[email protected]>
* Can now selected and deselct chats - hiding and showing inputField for sending Message to this chat

* Added Welcome Message and Listeners

* Send Button and TextInput added, needs to be connected to Core now

* Connected UI to chat sending

* Linter Tests satisfied now :)

* classified class-side methods
* started editing linting rules

* refactoring linter tests

* some linter fixes

* formatting linter

* no more testing for ffi methods

* wip linting

* custom linter tests yay

* better custom linter tests

* more linter tests

* class comments and scoped environment for faster testing

* some fixes

* linter fixes

* refactoring

* refactored to make all linter tests happy

* final linting changes

* removed two tests
* added TCUApp newWithTCCTestApp for automatic test db login

* Refactored so that TestApp and TestAuthHandler inherits from parent. They are now located in TCT Package

* Added LoginWithTestData method for TCCApp to use our registered TestData and directly be logged In

* Satisfying Linter now :)

Co-authored-by: Frederik Wollny <[email protected]>
Moved logout button to the top right corner
* displaying messages and fixed logout button

* changed structure for chatlist and added better redrawing logic

* fixed linting problems

Co-authored-by: Rohan Sawahn <[email protected]>
@Mrnikbobjeff Mrnikbobjeff merged commit de06b7e into master Jun 18, 2020
@schmidtjonas schmidtjonas deleted the feature/GH-159 branch June 18, 2020 12:30
LinqLover added a commit that referenced this pull request Oct 7, 2020
Choose ours version for all conflicts. I hope this was right because since #161 was 7 weeks older than #300.
@LinqLover LinqLover mentioned this pull request Oct 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants