Skip to content
This repository has been archived by the owner on Sep 2, 2023. It is now read-only.

Don't merge this! Debugging travis tests #2546

Open
wants to merge 648 commits into
base: release
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
648 commits
Select commit Hold shift + click to select a range
8e4f97d
[FIX] Advanced Trade: remove one step (RT-3271)
darkdarkdragon Apr 29, 2015
150437d
Trust: Fix DefaultRipple flag setting
yongsoo Apr 29, 2015
f146ed8
Merge pull request #2473 from yongsoo/fix/defaultripple
vhpoet Apr 29, 2015
d83f919
Merge pull request #2461 from darkdarkdragon/develop-RT-3259
vhpoet Apr 29, 2015
9be7581
Merge pull request #2468 from Mesrop/release-RT-3366-28-04-15
yongsoo Apr 29, 2015
49a2bee
Merge pull request #2466 from Mesrop/release-RT-3382-28-04-15
yongsoo Apr 29, 2015
d572664
Merge pull request #2457 from darkdarkdragon/develop-RT-2915
yongsoo Apr 29, 2015
0499031
Merge pull request #2467 from Mesrop/release-RT-3383-28-04-15
mrajvanshy Apr 29, 2015
98cf0c4
Merge pull request #2465 from darkdarkdragon/develop-RT-3204
mrajvanshy Apr 29, 2015
ac080c2
Merge pull request #2458 from darkdarkdragon/develop-RT-3362
mrajvanshy Apr 29, 2015
41a14eb
Merge pull request #2456 from darkdarkdragon/develop-RT-3125
mrajvanshy Apr 29, 2015
d38072a
Merge pull request #2454 from darkdarkdragon/develop-myorders-fix
mrajvanshy Apr 29, 2015
473f1af
Merge pull request #2453 from darkdarkdragon/develop-RT-3364
mrajvanshy Apr 29, 2015
6d0d549
Merge pull request #2428 from darkdarkdragon/develop-RT-3357
mrajvanshy Apr 29, 2015
67fe91a
Merge pull request #2417 from darkdarkdragon/develop-fix-trade-input
mrajvanshy Apr 29, 2015
c5cd98e
Merge pull request #2460 from darkdarkdragon/develop-RT-3250
vhpoet Apr 29, 2015
20275c2
[FIX] Advanced trade: fix values calculations
darkdarkdragon Apr 14, 2015
a807753
[FIX] addressPopover: use $templateRequest (RT-3357)
darkdarkdragon Apr 17, 2015
8a13ba0
[FIX] fix my orders template loading
darkdarkdragon Apr 23, 2015
2c6febd
[FIX] My orders: do not reload orderbook(RT-3364)
darkdarkdragon Apr 23, 2015
de773ab
[FIX] Contacts: show ripple names (RT-3125)
darkdarkdragon Apr 24, 2015
131f31f
[FIX]Contacts: use standard notification(RT-2915)
darkdarkdragon Apr 24, 2015
1fce903
[FIX] Add spacing in cancel order modal (RT-3362)
darkdarkdragon Apr 27, 2015
d415df9
[FIX] Send: alert about min btc size (RT-3360)
darkdarkdragon Apr 27, 2015
7964f4b
[FIX] Trust: fix e-notation in edit (RT-3250)
darkdarkdragon Apr 27, 2015
615011c
[FIX] Save last trade page (RT-3259)
darkdarkdragon Apr 27, 2015
ef6f019
[FIX] handle change to async validators (RT-3204)
darkdarkdragon Apr 28, 2015
015e4c4
[FIX] Custom gateways: do not show Add (RT-3340)
darkdarkdragon Apr 28, 2015
bb381b7
Merge branch 'release' into develop
vhpoet Apr 29, 2015
b7b0a2e
just trigger travis build
darkdarkdragon Apr 29, 2015
f34fff1
Fix: SnapSwap link (RT-3314)
yongsoo Apr 29, 2015
26dcdee
[FIX] Trade: Show right numbers in trade confirmation
vhpoet Apr 30, 2015
5de3c34
Merge pull request #2476 from vhpoet/release
vhpoet Apr 30, 2015
517dbf6
[TASK] Gulp: Enable all languages
vhpoet Apr 30, 2015
2f29d8b
Merge pull request #2475 from yongsoo/fix/ss
vhpoet Apr 30, 2015
27933c9
Merge pull request #2477 from vhpoet/release
yongsoo Apr 30, 2015
ef57b6e
[FIX] wording fixes to btc page
Apr 30, 2015
18caca0
[TASK] Breakpoints in send cut off longer values when in tablet view …
Mesrop Apr 30, 2015
cc165e0
[TEST] fixes to e2e tests
darkdarkdragon May 1, 2015
71b157f
[FIX] Advanced Trade: fix edit order model
darkdarkdragon May 1, 2015
a6f9a55
[TEST] move e2e private tests to separate dir
darkdarkdragon May 1, 2015
b227b15
[FIX] Send: fix currencies constraints (RT-3393)
darkdarkdragon May 1, 2015
b68e369
Merge pull request #2482 from darkdarkdragon/release-RT-3393
MatthewPhinney May 1, 2015
f134e8e
Fix RT favicon on retina screens (RT-3394)
mrajvanshy May 4, 2015
04fd2ed
Fix UI for login page when using URIs (RT-2980)
mrajvanshy May 4, 2015
b1aca94
Trade: fix the wording on the confirmation page (RT-3399)
mrajvanshy May 4, 2015
783ab76
[TEST] more e2e tests fixes
darkdarkdragon May 4, 2015
cc0b67a
Merge pull request #2485 from mrajvanshy/fix/wording
vhpoet May 4, 2015
3a29ce5
Merge pull request #2484 from mrajvanshy/fix/uri
vhpoet May 4, 2015
d8184ec
[FIX] Editing defaultRipple settings (RT-3398)
darkdarkdragon May 4, 2015
fedf28d
Trust: Fix UI issue with incoming trust (RT-3373)
yongsoo May 4, 2015
8bac914
Merge pull request #2486 from yongsoo/fix/trust
vhpoet May 4, 2015
8baf05a
[FIX] move order notification (RT-3271)
darkdarkdragon May 4, 2015
b894ae5
[FIX] App: get languages list
vhpoet May 4, 2015
4f5f558
Merge pull request #2489 from vhpoet/release
mrajvanshy May 4, 2015
8e6a837
[TASK] Gulp: Don't generate l10n strings on dev
vhpoet May 4, 2015
da4f1a6
Merge pull request #2490 from vhpoet/release
mrajvanshy May 5, 2015
9ef45b5
Add Bitstamp to Ripple Trade-Fund-Gateways under USD and BTC (RM-3375)
mrajvanshy May 4, 2015
7cdb758
[FIX] History: force "to" date (RT-3374)
darkdarkdragon May 5, 2015
ed5aa2f
[TEST] join e2e tests
darkdarkdragon May 5, 2015
fc87b2a
Merge pull request #2494 from darkdarkdragon/develop-e2e-fix
May 5, 2015
388072a
[FIX] Trade: "My Orders" orderbooks (RT-3400)
darkdarkdragon May 5, 2015
363177c
[TEST] fixes to e2e tests
darkdarkdragon May 1, 2015
10eedd5
[TEST] move e2e private tests to separate dir
darkdarkdragon May 1, 2015
df8009b
[TEST] more e2e tests fixes
darkdarkdragon May 4, 2015
94dd1d7
[TEST] join e2e tests
darkdarkdragon May 5, 2015
9f32ada
Merge pull request #2496 from darkdarkdragon/release-e2e-fixe
May 5, 2015
566cfc9
[TEST] move back e2e tests for dev
darkdarkdragon May 5, 2015
49cf09a
[TEST] remove old unused e2e tests (RT-3405)
darkdarkdragon May 5, 2015
ed6a97e
Merge pull request #2498 from darkdarkdragon/release-e2e-fixes-02
May 5, 2015
a1c0d9e
Merge pull request #2499 from darkdarkdragon/develop-RT-3405
May 5, 2015
89ff8f7
[TEST] BRL e2e test fix
darkdarkdragon May 5, 2015
6a6b6d1
Merge pull request #2500 from darkdarkdragon/release-e2e-fixes-03
May 5, 2015
ae2dd6f
Merge pull request #2495 from darkdarkdragon/release-RT-3400
mrajvanshy May 6, 2015
3758174
[TEST] e2e TradeNonXRP test fix
darkdarkdragon May 6, 2015
2df35c3
Merge pull request #2501 from darkdarkdragon/release-e2e-fixes-04
May 6, 2015
f60d100
Merge pull request #2483 from mrajvanshy/release2
vhpoet May 6, 2015
f38fe30
Merge pull request #2491 from darkdarkdragon/develop-RT-3374
mrajvanshy May 6, 2015
49ef793
Merge pull request #2487 from darkdarkdragon/release-RT-3398
mrajvanshy May 6, 2015
dbb2bd1
Merge pull request #2481 from darkdarkdragon/develop-trade-pirce-edit…
mrajvanshy May 6, 2015
0be17b8
Merge pull request #2480 from Mesrop/release-RT-2719
mrajvanshy May 6, 2015
82effad
Merge pull request #2479 from ripple/annatonger-patch-1
mrajvanshy May 6, 2015
83dd28a
[TASK] Top menu icons disappear on a certain page width with an unfun…
Mesrop May 6, 2015
5467472
[TASK] Trust: Do not allow incoming lines with balance to disable rip…
yongsoo May 6, 2015
fe5b9a5
Merge pull request #2502 from yongsoo/task/rippling
vhpoet May 6, 2015
c4c190c
Merge pull request #2488 from mrajvanshy/add/bitstamp
vhpoet May 6, 2015
0c2fe9f
[TASK] Signup/Login form UI messed up (RT-3367)
Mesrop May 5, 2015
e3871ab
Merge pull request #2472 from darkdarkdragon/develop-RT-3271
mrajvanshy May 6, 2015
60a9f9c
Merge pull request #2492 from Mesrop/release-RT-3367-05-05-15
mrajvanshy May 6, 2015
4bf6c14
Merge pull request #2464 from darkdarkdragon/develop-RT-3205
mrajvanshy May 6, 2015
07ed1c8
Show full ripple addres in URIs
mrajvanshy May 6, 2015
e2fe9aa
[TEST] remove CustomXXX e2e tests
darkdarkdragon May 6, 2015
55d44a0
[TEST] e2e: more robust TradeNonXRP test
darkdarkdragon May 6, 2015
d3837b2
Merge pull request #2506 from darkdarkdragon/release-e2e-fixes-05
May 6, 2015
2499480
Remove Paxmoneta from Advanced trade tab dropdown (RT-3406)
mrajvanshy May 6, 2015
2ff52ed
Merge pull request #2505 from mrajvanshy/fix/uriaddress
vhpoet May 6, 2015
0704d50
Merge pull request #2507 from mrajvanshy/remove
vhpoet May 6, 2015
f9b93c5
Merge pull request #2413 from darkdarkdragon/develop-RT-3344
mrajvanshy May 6, 2015
5fdc721
[TEST] e2e: better TradeNonXRP and TradeXRP tests
darkdarkdragon May 7, 2015
6ddb3c9
Merge pull request #2508 from darkdarkdragon/release-e2e-fixes-07
May 7, 2015
5e835de
Merge pull request #2503 from Mesrop/release-RT-3349-06-05-15
yongsoo May 7, 2015
462a067
[FIX] Prevent lodash overwriting underscore RT-3407
h0vhannes May 7, 2015
b27640b
Merge pull request #2509 from h0vhannes/develop
mrajvanshy May 7, 2015
c12baef
Bump version to 1.4.1
vhpoet May 7, 2015
82486b2
Merge branch 'release' into develop
vhpoet May 7, 2015
36b2663
[FIX] Trade: Show loading for orderbooks(RT-3402)
darkdarkdragon May 5, 2015
3c20fd9
[FIX] center loading text (RT-3402)
darkdarkdragon May 6, 2015
f25e335
[TASK] Trust: Filter out and hide insignificant trustlines (RT-3373)
yongsoo May 8, 2015
1af2024
Merge pull request #2511 from yongsoo/fix/trustline
vhpoet May 8, 2015
1312a3d
Hotfix 1.4.1-1
vhpoet May 8, 2015
89b8b28
[FIX] btc2ripple right error message (RT-3412)
darkdarkdragon May 8, 2015
74792ce
Merge pull request #2512 from darkdarkdragon/develop-RT-3412
yongsoo May 11, 2015
f2e2d30
Merge pull request #2412 from darkdarkdragon/develop-RT-3343
vhpoet May 11, 2015
72699f6
[FIX] Wrong bitstamp text on BTC page (RT-3420)
mrajvanshy May 11, 2015
d3359d3
Merge pull request #2497 from darkdarkdragon/release-RT-3402
mrajvanshy May 11, 2015
31f287a
Merge pull request #2402 from jublonet/issue/3280-locale-popup-esc
mrajvanshy May 11, 2015
53acb3a
Merge pull request #2409 from darkdarkdragon/develop-RT-1385
mrajvanshy May 11, 2015
02a5513
Merge pull request #2513 from mrajvanshy/develop3
vhpoet May 11, 2015
057cc22
[FIX] USD and BTC gateway pages (RT-3422)
mrajvanshy May 11, 2015
36ccbcb
Merge pull request #2514 from mrajvanshy/develop3
vhpoet May 11, 2015
8c50d2b
[TASK] Readme: Add reddit user community link
vhpoet May 12, 2015
c6c8368
Merge pull request #2354 from darkdarkdragon/develop-RT-2957-fix-3
mrajvanshy May 12, 2015
fec1d24
Merge branch 'develop' into release
vhpoet May 12, 2015
15d11ce
Bump version to 1.4.2
vhpoet May 12, 2015
15576aa
[TASK] Update unfunded banner text
May 15, 2015
8d97544
Merge pull request #2515 from ripple/annatonger-patch-2
mrajvanshy May 15, 2015
649ace0
[FIX] Trust: Add removing... button when removing trustline in basic …
yongsoo May 16, 2015
399f71e
Update trade.jade
May 18, 2015
a3fd133
Merge pull request #2516 from yongsoo/fix/remove
vhpoet May 18, 2015
30071c6
[FIX] Broken Bitstamp link (RT-3437)
mrajvanshy May 18, 2015
208ff6c
Merge pull request #2518 from mrajvanshy/develop3
vhpoet May 18, 2015
e69f888
Update README: current URLs for issues and clients
mynetx May 19, 2015
f16dbaa
Update localizations
mynetx May 19, 2015
3898c4a
Update localization source file from templates
mynetx May 19, 2015
5b835c0
Update ripple-lib
vhpoet May 19, 2015
f3bfee9
[FIX] do not ask pass on unfunded (RT-3433)
darkdarkdragon May 20, 2015
7018fb7
Navbar template: Remove double quotes in l10n string
mynetx May 20, 2015
797abf1
[FIX] Trade: Track by BookDirectory not index
vhpoet May 20, 2015
67a58e6
Merge pull request #2523 from vhpoet/release
vhpoet May 20, 2015
8519dba
[FIX] Trade: show only Available XRP (RT-3389)
darkdarkdragon May 21, 2015
acccfa2
[FIX] Balance widget: 4 decimal places (RT-3390)
darkdarkdragon May 21, 2015
e230f85
Add Korean localization
mynetx May 27, 2015
2f3aced
Rename, update Brazilian Portuguese localization
mynetx May 27, 2015
da041f5
Update French localization
mynetx May 27, 2015
2df4cde
Merge pull request #2525 from darkdarkdragon/release-RT-3390
mrajvanshy May 27, 2015
9e862fe
Merge pull request #2524 from darkdarkdragon/release-RT-3389
yongsoo May 27, 2015
e385aac
Merge pull request #2519 from jublonet/issue/readme-urls
yongsoo May 27, 2015
7d37b6f
Merge pull request #2520 from jublonet/update-l10n
yongsoo May 27, 2015
bffa039
Merge pull request #2522 from darkdarkdragon/release-RT-3433
mrajvanshy May 28, 2015
76ac32b
[FEATURE] Add Bluzelle gateway for CAD (RT-3441)
darkdarkdragon May 28, 2015
3b9fbcb
[FIX] incoming trust line fix (RT-3392)
darkdarkdragon May 28, 2015
6a5267a
[TASK] Upload notice to Ripple Trade pausing ability to create new ac…
mrajvanshy May 28, 2015
51ab16c
Merge pull request #2528 from mrajvanshy/develop3
vhpoet May 28, 2015
56781f7
[FEATURE] Highlight new/changed orders (RT-3278)
darkdarkdragon May 29, 2015
1dcc60c
Merge pull request #2526 from darkdarkdragon/develop-RT-3441
mrajvanshy May 29, 2015
eae6ecc
[TEST] really turn off custom gateways tests
darkdarkdragon May 30, 2015
d6ed9ac
Merge pull request #2529 from darkdarkdragon/develop-RT-3278
mrajvanshy Jun 1, 2015
ac96b37
Merge pull request #2527 from darkdarkdragon/develop-RT-3392
yongsoo Jun 1, 2015
25ed59c
Merge pull request #2530 from darkdarkdragon/develop-e2e-fix-4
yongsoo Jun 1, 2015
58ceb4f
Bump version to 1.4.3
vhpoet Jun 1, 2015
deec00f
Merge branch 'develop' into release
vhpoet Jun 1, 2015
d2406e5
[FIX] Fix trade pairs edit (RT-3343)
darkdarkdragon Jun 2, 2015
b1b3727
[TASK] Remove sign up
vhpoet Jun 2, 2015
17001d8
Merge pull request #2534 from vhpoet/release
yongsoo Jun 2, 2015
740f942
Merge pull request #2533 from darkdarkdragon/develop-RT-3343-2
yongsoo Jun 2, 2015
777aee3
[TASK] Show login on first login
vhpoet Jun 2, 2015
fe9c259
Merge pull request #2535 from vhpoet/release
mrajvanshy Jun 2, 2015
b15ef82
[TASK] Update announcement
vhpoet Jun 2, 2015
29127fa
Merge pull request #2536 from vhpoet/release
mrajvanshy Jun 2, 2015
5ecf1cb
[TASK] Update announcement
vhpoet Jun 3, 2015
bccf420
Merge pull request #2537 from vhpoet/release
mrajvanshy Jun 3, 2015
63397be
Bump version to 1.4.4
vhpoet Jun 3, 2015
2ff2262
[FIX] fix json rewriter
darkdarkdragon Jun 3, 2015
4afcce2
Merge pull request #2538 from darkdarkdragon/json-rewriter-fix
vhpoet Jun 3, 2015
cafb460
Hotfix 1.4.4-1
vhpoet Jun 3, 2015
f00e5c8
[FEATURE] OAuth login: Initial commit
h0vhannes May 4, 2015
17c96c3
[FIX] ID Service: Add diff from previous version (resolve conflict)
h0vhannes May 4, 2015
0737526
[FIX] Login: Replace old login with the new OAuth Login
h0vhannes May 4, 2015
4807f54
[FIX] Blob: Blob validity check typo fix
h0vhannes May 5, 2015
d48ac63
[FIX] OAuth Login: Remove stuff related to registration
h0vhannes May 5, 2015
1d07767
[FIX] Blob: Fix blob init data checks
h0vhannes May 5, 2015
9039332
[FIX] Security: Remove redundant security settings and delete (IID-67)
h0vhannes May 19, 2015
f7a101c
[FIX] KYC: Remove KYC from Ripple Trade
h0vhannes May 19, 2015
7c662ba
[FIX] KYC: Remove 2FA from Ripple Trade
h0vhannes May 20, 2015
aafe410
[FIX] Login: Change RippleID description text on login page (IID-84)
h0vhannes May 19, 2015
0652089
[FIX] Login: Left align IDRipple description text (IID-82)
h0vhannes May 20, 2015
51c1b47
[FIX] Registration: Remove registration flow from Ripple Trade
h0vhannes May 21, 2015
efdc006
[FEATURE] Register: Add IDS registration link on front page
h0vhannes May 21, 2015
69cb3a5
[FIX] Migrate: Remove old account migration flow from Ripple Trade
h0vhannes May 21, 2015
1c8cd8e
[FIX] Styling fixes
h0vhannes May 21, 2015
8ebc9b5
[FIX] Remove logout from blob service
h0vhannes May 21, 2015
9b51cf7
[FIX] Remove recover account function from Ripple Trade
h0vhannes May 21, 2015
64f9128
[FIX] Remove redundant Auth related code
h0vhannes May 21, 2015
538a8a9
[FIX] Add typeof userBlob check to prevent unit tests failure
h0vhannes May 22, 2015
03d8fbf
[FIX] Update Login Selenium test to support new Auth flow
h0vhannes May 22, 2015
ba9d00e
[FIX] Login: Set unique id for Sign Up button
h0vhannes May 22, 2015
9636deb
[FIX] Travis: Add RTB URL to Travis config
h0vhannes May 25, 2015
f0f13dc
[FEATURE] Login: Remember me and redirect after login
h0vhannes May 26, 2015
439cb3e
[FIX] BlobService: Correct callback function names and empty functions
h0vhannes May 28, 2015
2880c77
[FEATURE] Login: Show loader while logging in authorized user
h0vhannes May 28, 2015
db6b091
[FIX] Selenium: Update LoginRT test in accordance with IDS changes
h0vhannes May 28, 2015
c1ac73e
[FEAT] Config: Default value for Ripple Trade Backend URL
h0vhannes May 29, 2015
532c588
[FIX] CSS: Remove unneeded css from tabs/notifications.less
h0vhannes May 29, 2015
61e4dd3
[FEATURE] Security: Add link to IDS site on security page (IID-100)
h0vhannes Jun 5, 2015
9d6cf4a
[FEATURE] Security: Disable ability to edit ripple name in RT (IID-102)
h0vhannes Jun 5, 2015
c830714
[FIX] Security: Align edit buttons on security tab
h0vhannes Jun 16, 2015
f600bbd
Merge pull request #2521 from h0vhannes/oauth
vhpoet Jun 16, 2015
94af9ce
Merge branch 'develop' into release
vhpoet Jun 16, 2015
97f648b
[FIX] Merge: Fix merge differences
h0vhannes Jun 16, 2015
111ed8c
Merge pull request #2539 from h0vhannes/release
vhpoet Jun 16, 2015
7dc6a2c
[FEAT] Logout: Auto logout from IDS on logout
h0vhannes Jun 18, 2015
9a17115
[FiX] Text: Edit text on RT settings page (IID-118)
h0vhannes Jun 20, 2015
f3c4773
[FiX] Text: Remove IDS reference from main page (IID-120)
h0vhannes Jun 20, 2015
575824b
[FiX] CSS: Remove migrate, register, recover related CSS
h0vhannes Jun 20, 2015
6650587
[FiX] Travis: Put new RTB address in Travis config
h0vhannes Jun 20, 2015
cfa07dd
[FiX] Travis: Wait until 'Connected to BrowserSync' disappears
h0vhannes Jun 21, 2015
b967ce9
[FEAT] Login: Remove "remember me" feature
h0vhannes Jun 22, 2015
7ac74af
[FIX] Login: Fix code style in login.controller.js
h0vhannes Jun 22, 2015
860f614
[FIX] ID Service: Fix code style in id.service.js
h0vhannes Jun 23, 2015
474ae77
[FIX] ID Service: Fix code style in id.service.js
h0vhannes Jun 23, 2015
3fd7f8c
Merge pull request #2540 from h0vhannes/release
vhpoet Jun 26, 2015
73d28c1
[FEAT] Logout: Logout URL for IDS autologout
h0vhannes Jun 27, 2015
b4340b5
[TASK] Add identity verification link to settings page (IID-129)
h0vhannes Jun 27, 2015
5bd2ae6
Merge pull request #2544 from h0vhannes/release
vhpoet Jun 29, 2015
481e5bb
Update banner when CIP launches (RT-3478)
mrajvanshy Jun 29, 2015
091bf89
Merge pull request #2545 from mrajvanshy/newBanner
vhpoet Jun 29, 2015
974e69c
[TASK] Update PP and ToU (RT-3481)
mrajvanshy Jun 29, 2015
4b85b71
Merge pull request #2547 from mrajvanshy/fix/tou
vhpoet Jun 30, 2015
c4c9c4f
[FIX] Change company name on ToU and Privacy Policy
mrajvanshy Jun 30, 2015
cb39130
Merge pull request #2549 from mrajvanshy/fix/tou
vhpoet Jun 30, 2015
ecba9ac
[TASK] Remove the sign up button
vhpoet Jun 30, 2015
4f007b6
Merge pull request #2550 from vhpoet/release
vhpoet Jun 30, 2015
9cac53d
Bump version to 1.5.0
vhpoet Jun 30, 2015
c466cdf
Remove auto-resolve to btc bridge in send field (RT-3482)
mrajvanshy Jun 30, 2015
d03ea82
Merge pull request #2553 from mrajvanshy/fix/btc
vhpoet Jun 30, 2015
ec3759a
[FIX] landing page styles
bsteinlo Jul 1, 2015
b8ec002
Merge pull request #2555 from bsteinlo/temp
MatthewPhinney Jul 1, 2015
ce43d0b
Bump version to 1.5.1
vhpoet Jul 2, 2015
58cc927
[FIX] Send: Do not add tilde (RT-3484)
darkdarkdragon Jul 2, 2015
9e5d281
[TASK] update banner text
Jul 2, 2015
3f1ae36
Merge pull request #2557 from darkdarkdragon/develop-RT-3484
vhpoet Jul 2, 2015
a7b96d5
Merge pull request #2558 from ripple/annatonger-patch-1
vhpoet Jul 2, 2015
437bacf
[FIX] Send: Do not add tilde (RT-3484)
darkdarkdragon Jul 2, 2015
eec3c18
Merge branch 'release' into develop
vhpoet Jul 2, 2015
ccdd592
Hotfix 1.5.1-1
vhpoet Jul 2, 2015
20d537b
Merge branch 'release' into develop
vhpoet Jul 2, 2015
e76a28d
[FIX] Testing travis
h0vhannes Jun 29, 2015
2fdfe9f
[FIX] Testing travis
h0vhannes Jun 29, 2015
74a6ee9
[FIX] Testing travis
h0vhannes Jun 30, 2015
10064d3
[FIX] Testing travis
h0vhannes Jul 13, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,17 @@ js/.DS_Store
npm-debug.log
.DS_Store
node_modules
test/sauce/node_modules/
build/
src/js/config.js
config.js
test/e2e/protractor.conf.js
analytics.js
res/nw/config.js
deps/js/ripple/
deps/js/angular/
deps/js/angular-route/
deps/js/angular-mocks/
deps/js/angular-messages/
deps/js/jquery/
deps/js/moment/
deps/js/spin.js/
Expand Down
44 changes: 22 additions & 22 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,33 @@ language: node_js
node_js:
- "0.10"
addons:
sauce_connect: true
hosts:
- ripp.site
#addons:
# sauce_connect: true
before_install:
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
- sudo apt-get update -qq
- curl http://nginx.org/keys/nginx_signing.key | sudo apt-key add -
- echo "deb http://nginx.org/packages/ubuntu/ precise nginx" | sudo tee -a /etc/apt/sources.list
- echo "deb-src http://nginx.org/packages/ubuntu/ precise nginx" | sudo tee -a /etc/apt/sources.list
- sudo apt-get update -qq
- sudo apt-get install nginx
- sudo mkdir -p /var/log/nginx/
- npm install -g grunt-cli
- npm install -g gulp
- echo "$TRAVIS_BUILD_DIR"
- echo "$SAUCE_USERNAME"
- cd test/sauce && npm install
- node launch_connect.js &
- $TRAVIS_BUILD_DIR/test/sauce/wait_for_browser_provider.sh
- cd $TRAVIS_BUILD_DIR
before_script:
- "cp test/travis/config-travis.js src/js/config.js"
- "cp test/travis/config-travis.js config.js"
- "cp test/travis/ripple-travis.txt ripple.txt"
- npm install -g bower
- bower install
- npm install -g se-interpreter
- sudo nginx -c "$TRAVIS_BUILD_DIR/test/travis/nginx.conf" &
- grunt connect:sauce &
- npm install -g darkdarkdragon/se-interpreter
- sudo ps aux
- sudo ls -l /proc/*/exe || true
script: "./test/travis-run.sh"
after_script:
- echo "nginx/error:"
- sudo cat /var/log/nginx/error.log
- echo "nginx/access:"
- sudo cat /var/log/nginx/access.log
- echo "config.js:"
- curl http://localhost:9001/config.js
- echo "ripple.txt:"
- curl http://localhost:9001/ripple.txt
- curl -i http://ripp.site:3000/config.js
- curl -i http://ripp.site:3000/ripple.txt
notifications:
email:
false
Expand All @@ -45,7 +40,12 @@ notifications:
on_start: false
env:
global:
- SAUCE_CONNECT_VERSION=4.3.8
- SAUCE_USERNAME=tonga
- secure: "VJFHj5fr46Qf7h34xa/W6FmGvknPH57eQLJoEjKlZUYn0EGx9EliCdENfzAbtr3e4GnNvQh6X2bLA/lB7TRzoD84oyGkllkMayevQm/dViJbUBQsl7HOa6VwUwugW+o7T3+vPM4y5qqFv1B/fs3Fthl+eKUatccy9qK4xra1Hso="

- SAUCE_ACCESS_KEY=1553f141-1258-4319-b20d-7743def99fbb
- secure: "g+bSaoKAx6YQTVof5kUBdWx/REaKzqzkP+CQqsU6Whx+rp9juOtJGNtfH++PaWP1hSslRJi2Ib+9+/EU6CXzLE6IlwLHcnBikexeeF28kEivwRqxosLERLQ0axk8VGw324kgUDG1DsJNKxZFPq+LlXkPcF5eVta+BcSz5BO2ygs="
- secure: "BIFtSHbHke2SfyhCTjnSVwkQ3g8aGGV9ZR+tTSFQmp5RVMPEPTy0eiLx4qk+D/UTnJztQSqrtecVvhIa1iHtkwqecyS3/Hjs5h3F9pHNVdL5njk+sMcI4qL63ijpSG3j41jG81SHiCUi86u0FpGtrYzUaSBVe/DWEKwyXmYMlrM="
- secure: "Evu2xM7r/up6jlpbMhG/tiDsXTNwsU9aoaiKieggQaSexWzQbMKB3xh/NqiGUYeKR8VVrmDxRmy1Ym5eTdK1Pca6JGXOEhUudI3xqMC/2ttXcUGwsLSpSoB1w5zOwg5O0CnSRGlwvCrh8jj2viIwbOWvCcTcf6QBsN6ro10UOJI="
- secure: "dT8RdQjiwlYtic/55lZFQLEJwawnk+6O4W7gJCYZ1/PBDO7KlKz+3u0ODLC3H9vgAqQBL2m2pPtn4uFPyL7n8hscuzBbMolv6pPlAcj+AzMEfINrHJoDAkHcRR8RtityB+X82uh/KVY2lKNjfZoiiFUZwUP0DmVfKJCBQYg+uwU="

# - secure: "VJFHj5fr46Qf7h34xa/W6FmGvknPH57eQLJoEjKlZUYn0EGx9EliCdENfzAbtr3e4GnNvQh6X2bLA/lB7TRzoD84oyGkllkMayevQm/dViJbUBQsl7HOa6VwUwugW+o7T3+vPM4y5qqFv1B/fs3Fthl+eKUatccy9qK4xra1Hso="
Loading