Skip to content
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

Feature/remote testing with saucelabs #2

Open
wants to merge 420 commits into
base: develop
Choose a base branch
from
Open

Feature/remote testing with saucelabs #2

wants to merge 420 commits into from

Conversation

gannetson
Copy link
Owner

No description provided.

aethemba and others added 30 commits July 3, 2014 10:45
@aethemba
refactored sending mails
06e9d63
@aethemba
Merge remote-tracking branch 'upstream/develop' into feature/CLUB-632
e4f5f8a
@aethemba
refactored sending welcome mail to signal
c95601d
@aethemba
updated social pipeline
1c83009
@aethemba
added check for last login
2fde504
@rollick
Merge pull request onepercentclub#1359 from onepercentclub/feature/CL…
d91e896 
…UB-632

Feature/club 632
@rollick
Bump BB commit for various fixes to user flow
798117b
@aethemba
add firstLogni check
36b68af
@aethemba
merge fix
0c69ab5
@rollick
Merge pull request onepercentclub#1360 from onepercentclub/feature/CL…
f1a989f 
…UB-631

Feature/club 631
reset FB login errors when leaving modal
b8bcca5
@gannetson
Disable front end tests on Travis for now.
597f4e9
@gannetson
Use FF as test browser in Travis
df5594e
@aethemba
Merge pull request onepercentclub#1361 from onepercentclub/feature/re…
6e43c8f 
…set-fb-error

Reset FB login errors when leaving modal
@gannetson
Dont use run next if not needed
c1005cb
@FransTwisk
Global, welcome and password reset emails
d137b59
@FransTwisk
Re-added SVG carousel item
80a51f7 
Accidentally removed in previous commit
@gannetson
Fix some tests for Chrome
bd37071
@MG84
Merge pull request onepercentclub#1354 from onepercentclub/feature/bu…
586b0be 
…gs-bunny

Feature/bugs bunny
@aethemba
extended permissions in settigs
7dcf40d
@gannetson
Revert "Feature/bugs bunny"
03337af
@gannetson
Merge pull request onepercentclub#1363 from onepercentclub/revert-135…
ce37a38 
…4-feature/bugs-bunny

Revert "Feature/bugs bunny"
@gannetson
Add token-authentication to DRF
ee94d66
@gannetson
CLUB-556. Send Campaigner just one mail after donation.
32c0866
@gannetson
CLUB-554. Up campaign description limit to 500 chars
6bc7d22
@gannetson
CLUB-492. Change dashboard funded to ended campaigns
fb0bb71
@gannetson
Google AdWords conversion logic + codes
a23458f 
CLUB-312, CLUB-313, CLUB-314, CLUB-315
@gannetson
Add some fields to macro micro xml
a37ddac 
CLUB-164
@gannetson
New Bb version
71b3875
@gannetson
Enable payouts for old projects
09d1e98
aethemba and others added 30 commits July 14, 2014 16:52
@aethemba
Update app_overrides.js
02920d1 
#resolve
add fab deploy option for setting the virtualenv directory and update…
3047860 
… testing/staging to use env-2.7
@gannetson
Change how failed login test are run
6d24bf7
@rollick
Merge pull request onepercentclub#1418 from onepercentclub/feature/fi…
033660d 
…x-project-create-and-member-tests

Feature/fix project create and member tests
@rollick
Set fab default env directory to env-2.7
5d45d06
@gannetson
Merge pull request onepercentclub#1419 from onepercentclub/feature/en…
040a201 
…v-2.7

Python 2.7 deploy option in fabric
@gannetson
Merge remote-tracking branch 'upstream/develop' into feature/remote-t…
48a04d9 
…esting-with-saucelabs

Conflicts:
	apps/members/tests/test_functional.py
	requirements/requirements.txt
@gannetson
Restore legacyauth requirement commit hash
2e58947
update supervisor to use env-2.7 directory for virtualenv
e311c5f
@gannetson
Merge pull request onepercentclub#1420 from onepercentclub/feature/en…
c40c1a7 
…v-2.7

Update supervisor to use env-2.7 directory for virtualenv
@rollick
Merge pull request onepercentclub#1417 from onepercentclub/feature/CL…
c305ed1 
…UB-699

[feature/CLUB-699] trigger the loading of a possible set next transition...
@gannetson
Change Faied login tests again. Remove another 1+1 test
f226d0c
@aethemba
Update requirements.txt
0f17b7c
@aethemba
Merge pull request onepercentclub#1421 from onepercentclub/feature/CL…
c043372 
…UB-624

[feature/CLUB-624] #resolve fixed the saving of state when updating stat...
@rollick
Update requirements.txt
3a07c02
@gannetson
Fix member failed login test for SauceLabs
e2eba6e
@rollick
Bump BB commit for requirement fixes
d911332
@gannetson
Brush up some tests
13c100e
@gannetson
Merge remote-tracking branch 'upstream/develop' into feature/remote-t…
9dea5d0 
…esting-with-saucelabs

Conflicts:
	requirements/requirements.txt
@gannetson
Try something else for login failure tests
49afa62
@gannetson
Disable donation tests when not connected to Docdata
5412e36
@gannetson
Try without the crawlable tests
14d2925
@gannetson
Wait, sleep, go!
cbd3811
@gannetson
Tweak some tests to help sl
d669270
@gannetson
Assert on logout and visit homepage so we get proper fails.
f245f91
@gannetson
Don't return plain True
10790a4
@gannetson
Skip donation tests on Travis
8f773b7
@gannetson
Skip member failed login tests enable doantion tests.
9c9f895
@gannetson
Fix typo
daffdf3
@gannetson
No skipping no tearDown
8b4a938
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
@gannetson @aethemba @rollick @FransTwisk @MG84