Skip to content

Tampon#15

Open
ibrahimSouleiman wants to merge 55 commits intopja35:masterfrom
GiInfo:tampon
Open

Tampon#15
ibrahimSouleiman wants to merge 55 commits intopja35:masterfrom
GiInfo:tampon

Conversation

@ibrahimSouleiman
Copy link

@ibrahimSouleiman ibrahimSouleiman commented Nov 19, 2017

Les modication apporte apres le 1er merge , j'ai donc corrige la creation d'un contrat

TiagoCortinhal and others added 30 commits September 26, 2017 20:01
✅ bug id sign/decline contract corrected
7bcfd07
✅ bug id sign/decline contract corrected
3262b30
Fix redirect to login if user is logged out
469ddc6
correcting bugs
718dee1
Removed the .idea folder
32793b1
Removed SXP File
59e9741
minimal .gitignore
f20a261
fixing error
e38ebb2
@GiInfo
Merge pull request #2 from GiInfo/httptunnel_error
3d8f722 
Httptunnel error
after correcting compiling error. missing class error appear
4136f84
@GiInfo
Merge pull request #3 from GiInfo/missing_lib
7c9cd70 
after correcting compiling error. missing class error appear
ignoring 4 tests that do not impact running. should be corrected in t…
68b688d 
…he future
ignoring 4 tests that do not impact running. should be corrected in t…
d12efda 
…he future
ignoring 4 tests that do not impact running. should be corrected in t…
59d23b1 
…he future
ignoring 4 tests that do not impact running. should be corrected in t…
b466122 
…he future
ignoring 4 tests that do not impact running. should be corrected in t…
430654c 
…he future
@GiInfo
Merge pull request #4 from GiInfo/ignoring_failing_test_for_jenkins
8978fdf 
ignoring several tests
correcting isuserconnected and using sessionstorage. Adding partiesWi…
5a25870 
…sh to persistant
update header contracts and color a different state of contract
34a9f2c
@massinissaYousfi
Merge pull request #5 from GiInfo/traceWishes_and_isUserConnected
1e55f77 
correcting isuserconnected and using sessionstorage. Adding partiesWi…
@TiagoCortinhal
Merge branch 'master' into massi
6d63156
@TiagoCortinhal
Merge pull request #6 from GiInfo/massi
73da50a 
update header contracts and color a different state of contract
Melani commit
92dd0de
Update Corrige
c4060fe
@Mimi-Siku
Try searching parties
8a76e9b
Avant Fusion Travail Melanie avec la mienne
126c5b2
@Mimi-Siku
better exchanges clauses
61a0863
avant step2
d378363
@Mimi-Siku
adding error messages when submitting
630361d
Erreur de gradle
e4ae54c
ibrahim and others added 25 commits November 13, 2017 17:01
Merge branch 'ContratForm' of https://github.com/GiInfo/SXP into Cont…
cab9667 
…ratForm
messages for 2+ users
6ec5aa1
Code Commenter
461d855
@Mimi-Siku
reordering modalities done
44f13ea
@massinissaYousfi
add forum to contract
7288ff0
@Mimi-Siku
clean up the front-end code
f5eb490
@Mimi-Siku
Clean the front code
302ba94
@GiInfo
Merge pull request #7 from GiInfo/two_and_more_messages
a0b2556 
 messages for 2+ users
@TiagoCortinhal
Merge pull request #8 from GiInfo/add_form_to_+2
7786b50 
add forum to contract
Revert "Merge pull request #4 from GiInfo/ignoring_failing_test_for_j…
799bcf3 
…enkins"

This reverts commit 8978fdf, reversing
changes made to 7c9cd70.
Merge branch 'master' into ContratForm2
30d0413
local libs
b5afc93
@GiInfo
Merge pull request #11 from GiInfo/two_and_more_messages
2e7713f 
local libs
merge corrected
e75c0a4
@TiagoCortinhal
Merge branch 'master' into ContratForm2
3e26c1f
@TiagoCortinhal
Merge pull request #10 from GiInfo/ContratForm2
7ae583c 
Contrat form2
corrected conflicts
f058183
@GiInfo
Merge pull request #12 from GiInfo/correct_miss_conflicts
7ad977e 
corrected conflicts
missed the subscribe
e1ad963
@GiInfo
Merge pull request #13 from GiInfo/correct_miss_conflicts_2
ed13ef6 
missed the subscribe
correction apres le 1er merge
5aa4fcb
After 1ere merge
12db52d
Merge branch 'master' of https://github.com/GiInfo/SXP
6a9bcc5
@GiInfo
Merge branch 'master' into tampon
72a9458
@GiInfo
Merge branch 'master' into tampon
f677f78
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.

5 participants

@ibrahimSouleiman @GiInfo @massinissaYousfi @TiagoCortinhal @Mimi-Siku