Gustavo Cortez
|
e24a88dca1
|
Merge branch 'master' into feature/05-new-design
Conflicts:
js/services/video.js
|
2014-04-30 16:14:36 -03:00 |
|
Gustavo Cortez
|
fa2d40bdad
|
Initial page. Signin.
|
2014-04-30 16:11:55 -03:00 |
|
Ryan X. Charles
|
d30ff4ee68
|
Merge pull request #237 from matiu/feature/autheticated-encrption-AES/CCM-Mode-5
Feature/autheticated encrption aes/ccm mode 5
|
2014-04-30 13:48:13 -04:00 |
|
Matias Alejo Garcia
|
c688e0a7b3
|
fix tests
|
2014-04-30 14:31:19 -03:00 |
|
Matias Alejo Garcia
|
6cf8988eae
|
fix "hello" for authenticated peers
|
2014-04-30 14:28:33 -03:00 |
|
Matias Alejo Garcia
|
8c72476857
|
fix index
|
2014-04-30 14:14:43 -03:00 |
|
Ryan X. Charles
|
60b49fee1b
|
use svg for logo so it looks god on retina display
|
2014-04-30 14:10:04 -03:00 |
|
Matias Alejo Garcia
|
2e44a8c047
|
fix tpl-default
|
2014-04-30 14:08:30 -03:00 |
|
Matias Alejo Garcia
|
404e244b03
|
fix index
|
2014-04-30 14:05:07 -03:00 |
|
Matias Alejo Garcia
|
c624f45d25
|
rm bitcore
|
2014-04-30 13:57:55 -03:00 |
|
Matias Alejo Garcia
|
79b72f8eec
|
fix css
|
2014-04-30 13:57:13 -03:00 |
|
Matias Alejo Garcia
|
ab12832126
|
remove unused keyCache
|
2014-04-30 13:35:50 -03:00 |
|
Matias Alejo Garcia
|
d3151cc88b
|
same key for everyone
|
2014-04-30 13:02:40 -03:00 |
|
Matias Alejo Garcia
|
2dc59de87e
|
add random key for network encryption
|
2014-04-30 12:58:40 -03:00 |
|
Matias Alejo Garcia
|
add1b084cc
|
fix json
|
2014-04-30 11:07:44 -03:00 |
|
Matias Alejo Garcia
|
adb459887e
|
add sjcl bundle to the repo to fix its bower dist
|
2014-04-30 11:04:59 -03:00 |
|
Bechi
|
7a872956b4
|
item tx new style
|
2014-04-30 11:04:49 -03:00 |
|
Matias Alejo Garcia
|
f4f5209af7
|
add cache for keys
|
2014-04-30 11:04:40 -03:00 |
|
Matias Alejo Garcia
|
65698e7e45
|
add cache for keys
|
2014-04-30 11:04:33 -03:00 |
|
Matias Alejo Garcia
|
50d37aa22e
|
implements authenticated encryption
|
2014-04-30 11:04:16 -03:00 |
|
Matias Alejo Garcia
|
e9dbf341fc
|
Merge pull request #225 from maraoz/fix/routes
fix routes
|
2014-04-30 07:36:51 -03:00 |
|
Manuel Araoz
|
58b7204cd5
|
fix routes
|
2014-04-30 00:21:24 -03:00 |
|
Matias Alejo Garcia
|
99555dfa55
|
Merge pull request #216 from maraoz/misc/various
small changes
|
2014-04-29 23:41:12 -03:00 |
|
Matias Alejo Garcia
|
f4eb3e9087
|
Merge pull request #220 from ryanxcharles/feature/svg-logo
use svg for logo so it looks good on retina display
|
2014-04-29 23:18:14 -03:00 |
|
Matias Alejo Garcia
|
ba6f15b432
|
Merge pull request #221 from maraoz/UI/footer-video
Video is now in footer, peers tab removed
|
2014-04-29 23:17:53 -03:00 |
|
Matias Alejo Garcia
|
4e8a354bdb
|
Merge pull request #223 from cmgustavo/feature/03-new-design
Fixes transaction list
|
2014-04-29 19:49:39 -03:00 |
|
Gustavo Cortez
|
3a81f391e5
|
Fixes transaction list
|
2014-04-29 19:43:38 -03:00 |
|
Manuel Araoz
|
d0c408553d
|
merge conflicts
|
2014-04-29 19:31:59 -03:00 |
|
Manuel Araoz
|
93620fa6c0
|
remove peer tab
|
2014-04-29 19:30:27 -03:00 |
|
Manuel Araoz
|
fb8a52fd6a
|
basic video footer
|
2014-04-29 19:30:27 -03:00 |
|
Manuel Araoz
|
a9eb53e90f
|
various style and wording fixes
|
2014-04-29 19:30:26 -03:00 |
|
Ryan X. Charles
|
8dbaea557b
|
use svg for logo so it looks god on retina display
|
2014-04-29 18:25:41 -04:00 |
|
Manuel Araoz
|
e14654cd80
|
small changes
|
2014-04-29 17:44:35 -03:00 |
|
Gustavo Maximiliano Cortez
|
1f2d050700
|
Merge pull request #215 from bechi/feature/item-tx-ns
Feature/item tx ns
|
2014-04-29 17:40:00 -03:00 |
|
Bechi
|
64cde1378e
|
fix conflict
|
2014-04-29 16:39:54 -03:00 |
|
Bechi
|
b3506b80cd
|
item tx new style
|
2014-04-29 16:34:40 -03:00 |
|
Matias Alejo Garcia
|
3ab70993cc
|
Merge pull request #214 from cmgustavo/feature/02-new-design
Feature/02 new design
|
2014-04-29 15:29:58 -03:00 |
|
Gustavo Cortez
|
cf2a010307
|
Addresses TAB: if no address, show only button.
|
2014-04-29 15:17:14 -03:00 |
|
Gustavo Cortez
|
50ebb2757b
|
Fixes header. Mobile support
|
2014-04-29 14:24:26 -03:00 |
|
Manuel Aráoz
|
b13287870f
|
Merge pull request #211 from cmgustavo/feature/01-new-design
New design: footer and header schemas
|
2014-04-29 11:59:05 -03:00 |
|
Gustavo Cortez
|
b523c9373e
|
New design: footer and header schemas
|
2014-04-29 11:56:37 -03:00 |
|
Mario Colque
|
0e63d8a220
|
Merge pull request #209 from cmgustavo/bug/01-css-templates
Little fixes: html and templates config support.
|
2014-04-29 10:56:25 -03:00 |
|
Gustavo Cortez
|
0010c0f688
|
Little fixes: html and templates config support.
|
2014-04-29 09:52:28 -03:00 |
|
Manuel Aráoz
|
8509820f00
|
Merge pull request #208 from bechi/feature/header-ns
header new style
|
2014-04-28 17:33:55 -03:00 |
|
Bechi
|
7bde3815ca
|
header new style
|
2014-04-28 17:23:01 -03:00 |
|
Gustavo Maximiliano Cortez
|
e28831e01a
|
Merge pull request #205 from martindale/npm-managed-tests
Allow NPM to Manage Tests
|
2014-04-28 16:32:38 -03:00 |
|
Manuel Aráoz
|
383bc4e136
|
Merge pull request #207 from cmgustavo/bug/02-travis
Bug/02 travis
|
2014-04-28 15:30:02 -03:00 |
|
Gustavo Cortez
|
4a35a8b016
|
git instead https.
|
2014-04-28 15:28:01 -03:00 |
|
Gustavo Cortez
|
306e8bc27a
|
Fix: travis.yml and package.json
|
2014-04-28 15:24:27 -03:00 |
|
Manuel Aráoz
|
46a5edf9f7
|
Merge pull request #206 from matiu/feature/rm-encryption-and-signing
removes encryption and signing. Relays on webrtc DTS. Keep authenticatio...
|
2014-04-28 15:20:28 -03:00 |
|