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

[FEATURE] Highlight new/changed orders (RT-3278) #2531

Open
wants to merge 540 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
540 commits
Select commit Hold shift + click to select a range
cf70c20
Merge pull request #2405 from vhpoet/develop
yongsoo Apr 6, 2015
8f7fb1d
[FIX] Remove trailing comma in object
mynetx Apr 6, 2015
8b430af
[FIX] buttons.less media query and selector
mynetx Apr 6, 2015
f5925e2
Merge pull request #2406 from jublonet/issue/gulp-jshint-fixes
vhpoet Apr 6, 2015
eadec4b
[TASK] RTJ: Banners (RT-3341)
yongsoo Apr 7, 2015
2dd3ac7
Merge pull request #2407 from yongsoo/rt3341
vhpoet Apr 7, 2015
656c7ea
[FEATURE] Dismiss locale popup on Esc (RT-3280)
mynetx Apr 6, 2015
7e2e38f
Hotfix 1.4.0-3
vhpoet Apr 7, 2015
fb5165d
[FEATURE] Gulp: Build jade and js files independently
vhpoet Apr 8, 2015
c05830c
[TASK] Remove unused callback.html
vhpoet Apr 8, 2015
1c11ce5
[FIX] Trade: clean ticker on change (RT-3336)
darkdarkdragon Apr 9, 2015
ee77a8d
[TEST] e2e tests for placing orders (RT-3327)
darkdarkdragon Apr 11, 2015
24d3981
[TASK] Top menu icons disappear on a certain page width with an unfun…
Mesrop Apr 13, 2015
8fdad0d
Update ripple-lib
vhpoet Apr 13, 2015
6120892
[TASK] Amount: Use scale instead of product_human
vhpoet Apr 13, 2015
068cbb7
Merge pull request #2416 from vhpoet/release
yongsoo Apr 13, 2015
1c9cd87
Hotfix 1.4.0-4
vhpoet Apr 13, 2015
69b52ca
[TEST] e2e tests for send tab
darkdarkdragon Apr 14, 2015
2881d2e
[TASK] Gulp: only compile affected templates
vhpoet Apr 14, 2015
00bd408
[TASK] Gulp: Compile translated templates
vhpoet Apr 14, 2015
58a8bb3
[FIX] Replace ng-switch on to ng-switch
vhpoet Apr 15, 2015
3001003
[TASK] Separate layout from index.jade
vhpoet Apr 15, 2015
4d8d457
[FIX] Gulp: Task order
vhpoet Apr 15, 2015
9a2d159
[TASK] Show loading while waiting for the template
vhpoet Apr 15, 2015
01bff5e
[TASK] Gulp: Generate only one app.js file
vhpoet Apr 15, 2015
1ab9de9
[TASK] rpTransactionStatus: laod template dynamically
vhpoet Apr 15, 2015
3378198
[TASK] Remove index.html
vhpoet Apr 15, 2015
f0fcbbc
[TEST] app-en.js -> app.js
vhpoet Apr 15, 2015
7a396d0
[TASK] Move language detection to web.js
vhpoet Apr 16, 2015
e2ae52d
[TEST] fix karma tests (RT-3361)
darkdarkdragon Apr 16, 2015
7b8f53b
Merge pull request #5 from darkdarkdragon/develop-RT-3361
vhpoet Apr 16, 2015
ac9df7e
Merge pull request #2419 from vhpoet/pr/150408152459
mrajvanshy Apr 16, 2015
8ca393b
Merge pull request #2418 from darkdarkdragon/develop-e2e-send
mrajvanshy Apr 16, 2015
1b7888b
Merge pull request #2415 from Mesrop/develop-RT-3349-13-04-15
mrajvanshy Apr 16, 2015
06810f0
Merge branch 'release' into develop
vhpoet Apr 16, 2015
eb30f11
[FIX] fix lang global var
darkdarkdragon Apr 16, 2015
d717aae
[TASK] Trade: confirmation is changing the size of the order containe…
Mesrop Apr 16, 2015
80a010f
Issuer on balances incorrect
kureus Apr 17, 2015
4e2d042
Merge pull request #2414 from darkdarkdragon/develop-RT-3327
Apr 20, 2015
1e6797d
[FIX] move banners to new place
darkdarkdragon Apr 20, 2015
19be809
Merge pull request #2433 from darkdarkdragon/develop-banners-fix
Apr 20, 2015
a2904f8
Merge pull request #2421 from darkdarkdragon/develop-js-lang-fix
Apr 20, 2015
3cf46d4
Merge pull request #2410 from darkdarkdragon/develop-RT-3336
yongsoo Apr 20, 2015
91f21f5
[TEST] fix e2e login test
darkdarkdragon Apr 20, 2015
2a5e78a
[TEST] add debug output to serve:dist
darkdarkdragon Apr 20, 2015
094ad7a
Merge pull request #2437 from darkdarkdragon/develop-fix-login-test-2
Apr 20, 2015
905fad8
[FIX] fix travis build
darkdarkdragon Apr 21, 2015
edadef1
Merge pull request #2444 from darkdarkdragon/develop-travis-serv-fix-css
Apr 21, 2015
382458e
[FIX] Btc2ripple: show appropriate error(RT-3334)
darkdarkdragon Apr 20, 2015
c06822f
[FIX] fix sending without confirmation (RT-3337)
darkdarkdragon Apr 20, 2015
167a69d
[FIX] fix version string inside html
darkdarkdragon Apr 19, 2015
5117ce5
[FIX] Trade: reset widgets (RT-3279)
darkdarkdragon Apr 19, 2015
ce60580
[FIX] trade: fix error checking
darkdarkdragon Apr 19, 2015
39e9426
[FIX] keychain: use the $templateRequest(RT-3358)
darkdarkdragon Apr 17, 2015
69d9b41
[FIX] Trade: "modify order" load html (RT-3359)
darkdarkdragon Apr 17, 2015
03b4689
[FIX] app.controller: load myOrders.html(RT-3356)
darkdarkdragon Apr 17, 2015
a49edc3
[FIX] Advanced trade: fix values calculations
darkdarkdragon Apr 14, 2015
1638c46
[FIX] fix "-0.00" balance (RT-3344)
darkdarkdragon Apr 10, 2015
6fac518
[FIX] Trade: fix trade pairs order edit (RT-3343)
darkdarkdragon Apr 9, 2015
f42d422
[FIX] Network fee warning when max fee set to 1 XRP (RT-3326)
mrajvanshy Apr 20, 2015
2704844
[TEST] fix e2e tests
darkdarkdragon Apr 22, 2015
035a474
Merge pull request #2446 from darkdarkdragon/develop-sauce-fix-tests
Apr 22, 2015
b80476a
Merge pull request #2445 from mrajvanshy/fix/fee
yongsoo Apr 22, 2015
139e65d
Merge pull request #2443 from darkdarkdragon/develop-RT-3334
yongsoo Apr 22, 2015
1659493
Merge pull request #2441 from darkdarkdragon/develop-RT-3337
yongsoo Apr 22, 2015
9787e4d
Merge pull request #2431 from darkdarkdragon/develop-html-version-fix
yongsoo Apr 22, 2015
6feeefc
Merge pull request #2429 from darkdarkdragon/develop-js-err-check-fix
yongsoo Apr 22, 2015
675690a
[FIX] Incoming trust: Remove button now shows properly, rippling is d…
yongsoo Apr 22, 2015
d783dcf
Merge pull request #2447 from yongsoo/rt3371
vhpoet Apr 22, 2015
be025f4
[FIX] Jade usage problems
vhpoet Apr 22, 2015
085edd5
[TASK] Add gulp-jade-l10n-extractor
vhpoet Apr 22, 2015
a776c0f
[FIX] BTC: Show "loading" (RT-3340)
darkdarkdragon Apr 20, 2015
c75fb56
[TASK] Update messages.pot
vhpoet Apr 23, 2015
f4609fd
[TASK] Gulp: Don't run dev on dist
vhpoet Apr 23, 2015
6c9122a
Merge pull request #2442 from darkdarkdragon/develop-RT-3340
vhpoet Apr 23, 2015
df04023
Merge pull request #2430 from darkdarkdragon/develop-RT-3279
vhpoet Apr 23, 2015
05514e8
Merge pull request #2426 from darkdarkdragon/develop-RT-3359
vhpoet Apr 23, 2015
4e12524
Merge pull request #2427 from darkdarkdragon/develop-RT-3358
mrajvanshy Apr 23, 2015
49db230
Merge pull request #2424 from kureus/patch-1
mrajvanshy Apr 23, 2015
6ef4402
Merge pull request #2425 from darkdarkdragon/develop-RT-3356
mrajvanshy Apr 23, 2015
64a0c29
Merge pull request #2420 from Mesrop/develop-RT-2834-16-04-15
mrajvanshy Apr 23, 2015
d77d55f
Merge pull request #2448 from vhpoet/pr/150422133911
yongsoo Apr 23, 2015
0bb057b
Trust: DefaultRipple flag enable and disable (RT-3353)
yongsoo Apr 23, 2015
fc58810
Merge pull request #2452 from yongsoo/rt3353
vhpoet Apr 23, 2015
43eddc1
[FIX] addressPopover: use $templateRequest (RT-3357)
darkdarkdragon Apr 17, 2015
2fadfab
[FIX] fix my orders template loading
darkdarkdragon Apr 23, 2015
b9b7a51
Gateways: UI changes breaking Fund into two separate pages (RT-3372)
yongsoo Apr 23, 2015
9efff74
Merge pull request #2455 from yongsoo/rt3372
vhpoet Apr 23, 2015
d7166b9
[FIX] My orders: do not reload orderbook(RT-3364)
darkdarkdragon Apr 23, 2015
fed7c23
[FIX] Contacts: show ripple names (RT-3125)
darkdarkdragon Apr 24, 2015
94c177c
[FIX]Contacts: use standard notification(RT-2915)
darkdarkdragon Apr 24, 2015
db0eaa2
[FIX] Add spacing in cancel order modal (RT-3362)
darkdarkdragon Apr 27, 2015
3901e00
[FIX] Send: alert about min btc size (RT-3360)
darkdarkdragon Apr 27, 2015
2f44d1b
[FIX] Trust: fix e-notation in edit (RT-3250)
darkdarkdragon Apr 27, 2015
5fd19d1
[FIX] Save last trade page (RT-3259)
darkdarkdragon Apr 27, 2015
ab0a0e7
Merge pull request #2459 from darkdarkdragon/develop-RT-3360
yongsoo Apr 27, 2015
a832ee3
[FIX] Rename some settings tabs (RT-3381)
darkdarkdragon Apr 27, 2015
b06eec2
[FIX] Option to edit the send_max (RT-3205)
darkdarkdragon Apr 27, 2015
6e5d9ea
[FIX] Trust: fix not to trust unfunded (RT-2957)
darkdarkdragon Mar 18, 2015
c2c4d26
[FIX] optimize rpDest validator
darkdarkdragon Mar 18, 2015
679480a
[FIX] handle change to async validators (RT-3204)
darkdarkdragon Apr 28, 2015
44483d6
Merge pull request #2463 from darkdarkdragon/develop-RT-3381
Apr 28, 2015
985b650
[TASK] Container size should not change for confirmation page (RT-3382)
Mesrop Apr 28, 2015
b5872c8
[TASK] Trade confirmation page: Order Value (max) field should show c…
Mesrop Apr 28, 2015
e6a07e2
[TASK] Add contact button after send has wrong background/border (RT-…
Mesrop Apr 28, 2015
96965b9
[FIX] History: show price for orders (RT-1385)
darkdarkdragon Apr 9, 2015
b90af5d
[FIX] Custom gateways: do not show Add (RT-3340)
darkdarkdragon Apr 28, 2015
6af1f93
Merge pull request #2470 from darkdarkdragon/develop-RT-3340-2
vhpoet Apr 28, 2015
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
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
7018fb7
Navbar template: Remove double quotes in l10n string
mynetx May 20, 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
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
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
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
4330476
[FEATURE] Highlight new/changed orders (RT-3278)
darkdarkdragon May 30, 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