Ibra#18

Open

ibrahimSouleiman wants to merge 118 commits intopja35:masterfrom

Commits on Sep 26, 2017

:white_check_mark: bug id sign/decline contract corrected
TiagoCortinhal
committed
:white_check_mark: bug id sign/decline contract corrected
TiagoCortinhal
committed
Fix redirect to login if user is logged out
TiagoCortinhal
committed
correcting bugs
TiagoCortinhal
committed
Removed the .idea folder
TiagoCortinhal
committed
Removed SXP File
TiagoCortinhal
committed
minimal .gitignore
TiagoCortinhal
committed

Commits on Sep 27, 2017

fixing error
TiagoCortinhal
committed
Merge pull request #2 from GiInfo/httptunnel_error
GiInfo
authored
after correcting compiling error. missing class error appear
TiagoCortinhal
committed
Merge pull request #3 from GiInfo/missing_lib
GiInfo
authored

Commits on Sep 28, 2017

ignoring 4 tests that do not impact running. should be corrected in the future
TiagoCortinhal
committed
ignoring 4 tests that do not impact running. should be corrected in the future
TiagoCortinhal
committed
ignoring 4 tests that do not impact running. should be corrected in the future
TiagoCortinhal
committed
ignoring 4 tests that do not impact running. should be corrected in the future
TiagoCortinhal
committed
ignoring 4 tests that do not impact running. should be corrected in the future
TiagoCortinhal
committed
Merge pull request #4 from GiInfo/ignoring_failing_test_for_jenkins
GiInfo
authored

Commits on Nov 12, 2017

Commits on Nov 13, 2017

Erreur de gradle
ibrahim
committed
Merge branch 'ContratForm' of https://github.com/GiInfo/SXP into ContratForm
ibrahim
committed

Commits on Nov 14, 2017

messages for 2+ users
TiagoCortinhal
committed

Commits on Nov 15, 2017

Code Commenter
ibrahim
committed

Commits on Nov 17, 2017

reordering modalities done
Mimi-Siku
committed

Commits on Nov 18, 2017

add forum to contract

massinissaYousfi
authored and
Yousfi Massinissa
committed
clean up the front-end code
Mimi-Siku
committed
Clean the front code
Mimi-Siku
committed

Commits on Nov 19, 2017

Merge pull request #7 from GiInfo/two_and_more_messages
GiInfo
authored
Merge pull request #8 from GiInfo/add_form_to_+2
TiagoCortinhal
authored
Revert "Merge pull request #4 from GiInfo/ignoring_failing_test_for_jenkins"
TiagoCortinhal
committed
Merge branch 'master' into ContratForm2
TiagoCortinhal
committed
local libs
TiagoCortinhal
committed
Merge pull request #11 from GiInfo/two_and_more_messages
GiInfo
authored
merge corrected
TiagoCortinhal
committed
Merge branch 'master' into ContratForm2
TiagoCortinhal
authored
Merge pull request #10 from GiInfo/ContratForm2
TiagoCortinhal
authored
corrected conflicts
TiagoCortinhal
committed
Merge pull request #12 from GiInfo/correct_miss_conflicts
GiInfo
authored
missed the subscribe
TiagoCortinhal
committed
Merge pull request #13 from GiInfo/correct_miss_conflicts_2
GiInfo
authored
correction apres le 1er merge
ibrahim
committed
After 1ere merge
ibrahim
committed
Merge branch 'master' of https://github.com/GiInfo/SXP
ibrahim
committed
Merge branch 'master' into tampon
GiInfo
authored
Merge branch 'master' into tampon
GiInfo
authored

Commits on Nov 20, 2017

Merge pull request #14 from GiInfo/tampon
TiagoCortinhal
authored

Commits on Nov 22, 2017

order messages by categories. message for :
Yousfi Massinissa
committed
missing parties wish from Contract and ContractEntity
TiagoCortinhal
committed
Merge pull request #15 from GiInfo/missing_partiesWish
GiInfo
authored
adding is missing userconnected to contract.js
TiagoCortinhal
committed
Merge pull request #16 from GiInfo/isUserConnected
TiagoCortinhal
authored
order messages by categories. message for :
Yousfi Massinissa
committed
Merge branch 'master' into separe_messages_to_categories
massinissaYousfi
authored
Merge pull request #17 from GiInfo/separe_messages_to_categories
TiagoCortinhal
authored
correcting missing forum from contract
TiagoCortinhal
committed
Merge pull request #18 from GiInfo/correcting_missing_forum
GiInfo
authored
missing nicks
TiagoCortinhal
committed
Merge pull request #19 from GiInfo/correcting_missing_forum
GiInfo
authored
parties OK
Mimi-Siku
committed

Commits on Nov 23, 2017

Merge pull request #20 from GiInfo/Contract-Form
massinissaYousfi
authored

Commits on Nov 24, 2017

switch to bootstrap and ajust messages
Yousfi Massinissa
committed

Commits on Nov 25, 2017

correct some bug in displaying messages
Yousfi Massinissa
committed

Commits on Nov 26, 2017

fixing forum
TiagoCortinhal
committed
minor corrections
TiagoCortinhal
committed
minor corrections
TiagoCortinhal
committed
minor corrections
TiagoCortinhal
committed
minor corrections
TiagoCortinhal
committed
correct display to messages , one in private message and the other in tab forum
Yousfi Massinissa
committed
Merge branch 'master' into messages_like_gmail_with_bootrap_instead_ngmaterial
GiInfo
authored
Merge pull request #21 from GiInfo/messages_like_gmail_with_bootrap_instead_ngmaterial
GiInfo
authored
correct display to messages , one in private message and the other in tab forum
Yousfi Massinissa
committed
Merge remote-tracking branch 'origin/messages_like_gmail_with_bootrap_instead_ngmaterial' into messages_like_gmail_with_bootrap_instead_ngmaterial
Yousfi Massinissa
committed
Merge pull request #22 from GiInfo/messages_like_gmail_with_bootrap_instead_ngmaterial
GiInfo
authored

Commits on Nov 27, 2017

no 2 users will have the same nick
TiagoCortinhal
committed
Merge pull request #23 from GiInfo/one_nick_one_user
GiInfo
authored
no 2 users will have the same nick
TiagoCortinhal
committed
Merge pull request #24 from GiInfo/one_nick_one_user
GiInfo
authored
Update README.md
TiagoCortinhal
authored
Merge pull request #25 from GiInfo/TiagoCortinhal-patch-1
GiInfo
authored
missing correcting from merge
TiagoCortinhal
committed
Merge pull request #26 from GiInfo/correcting_signature_put
GiInfo
authored

Commits on Nov 28, 2017

correcting contract bugs, fixing signatures and adding modified status
TiagoCortinhal
committed
Merge pull request #27 from GiInfo/correcting_contract_bugs
GiInfo
authored
split bug on viewContract
TiagoCortinhal
committed
Merge pull request #28 from GiInfo/correcting_contract_bugs
GiInfo
authored
adding parties wishes to contract prewview
TiagoCortinhal
committed
Merge pull request #29 from GiInfo/correcting_contract_bugs
GiInfo
authored
re-fixing... http put call
TiagoCortinhal
committed
Merge pull request #30 from GiInfo/correcting_contract_bugs
GiInfo
authored
fixing contract button colours. select users in messages colours
TiagoCortinhal
committed
Merge pull request #31 from GiInfo/correcting_contract_bugs
GiInfo
authored
fixing signatures
TiagoCortinhal
committed
Merge pull request #32 from GiInfo/correcting_contract_bugs
GiInfo
authored
fixing forum for all contracts even cancelled ones
TiagoCortinhal
committed
Merge pull request #33 from GiInfo/correcting_contract_bugs
GiInfo
authored
upgrading readme.md
TiagoCortinhal
committed
Merge pull request #34 from GiInfo/correcting_contract_bugs
GiInfo
authored

Commits on Nov 29, 2017

correct display to messages , one in private message and the other in tab forum
Yousfi Massinissa
committed
correcting typo
TiagoCortinhal
committed
Adding contract Title
TiagoCortinhal
committed
Adding contract Title
TiagoCortinhal
committed
Merge pull request #35 from GiInfo/improve_form_filter_color
GiInfo
authored
fixing welcome message duplication in forum
TiagoCortinhal
committed
order messages from most recent to most ancient
TiagoCortinhal
committed
Merge pull request #36 from GiInfo/fixing_forum_button
GiInfo
authored
Modification creation contrat
ibrahim
committed
Merge branch 'master' into Ibra
GiInfo
authored
Update Contracts.java
GiInfo
authored