Commit Graph

661 Commits

Author SHA1 Message Date
Julian Lam
72e77772db Merge branch 'master' into develop 2017-02-24 12:46:40 -05:00
Julian Lam
995f8296a4 linting 2017-02-24 12:03:47 -05:00
Julian Lam
e71bd7a27f Merge branch 'master' into styleguide 2017-02-24 11:45:04 -05:00
barisusakli
048eb8a320 some helper tests 2017-02-24 18:06:23 +03:00
barisusakli
04b07e292c thumb tests 2017-02-24 17:34:34 +03:00
barisusakli
ca1fe557c7 topic controller tests 2017-02-24 16:26:19 +03:00
barisusakli
3a87f2566a more group tests 2017-02-24 15:05:00 +03:00
barisusakli
b7d5bc7dc8 more group tests 2017-02-24 12:54:16 +03:00
Peter Jaszkowiak
dd2b930824 Resolve merge conflicts, minify only .js files 2017-02-23 18:31:49 -07:00
Peter Jaszkowiak
ee9d7584e4 Fix test, misc 2017-02-23 17:29:08 -07:00
Barış Soner Uşaklı
35ff71c37d more tests 2017-02-23 23:06:00 +03:00
Julian Lam
c09f994b0a Merge remote-tracking branch 'origin/master' into develop 2017-02-23 14:24:15 -05:00
Julian Lam
a9f144230e Merge branch 'master' into develop 2017-02-23 13:57:46 -05:00
Barış Soner Uşaklı
743f758f75 set origin header to url 2017-02-23 21:29:28 +03:00
Barış Soner Uşaklı
c168ed43d4 up build timeout 2017-02-23 21:25:50 +03:00
Julian Lam
672d7352bb Merge branch 'master' into develop 2017-02-23 12:32:03 -05:00
barisusakli
09d0ce4778 post tests 2017-02-23 17:02:54 +03:00
barisusakli
2dac3d2292 closes #5465, blacklist tests 2017-02-22 14:53:44 +03:00
barisusakli
5c01c7b1c7 delayed notification test 2017-02-22 13:35:05 +03:00
Julian Lam
62e0f5f883 Merge remote-tracking branch 'origin/master' into develop 2017-02-21 11:21:51 -05:00
Barış Soner Uşaklı
89380824f8 navigation test 2017-02-21 17:00:54 +03:00
barisusakli
f2a795a9b7 fix tests 2017-02-21 15:18:01 +03:00
barisusakli
799f688503 closes #5463 , invitation tests 2017-02-21 15:08:17 +03:00
barisusakli
4ee7edad64 test uploadProfileImageFromUrl 2017-02-20 21:58:35 +03:00
barisusakli
ef90702049 closes #5459 2017-02-20 21:28:02 +03:00
Peter Jaszkowiak
23540afaeb Resolve merge conflicts 2017-02-18 19:14:39 -07:00
Peter Jaszkowiak
93f38d4f30 ESlint no-multi-assign
and max-nested-callbacks, no-mixed-requires, max-statements-per-line
2017-02-18 18:06:28 -07:00
Peter Jaszkowiak
4bb49a7171 ESlint no-unused-vars 2017-02-18 15:05:36 -07:00
Peter Jaszkowiak
c18808fdeb ESlint no-useless-concat, no-mixed-spaces-and-tabs 2017-02-18 14:42:15 -07:00
Peter Jaszkowiak
fdf4f873bf ESlint eqeqeq
and require-jsdoc, no-negated-condition
2017-02-18 14:36:16 -07:00
Peter Jaszkowiak
09e868ce5f ESlint no-useless-escape, no-else-return 2017-02-18 14:27:26 -07:00
Peter Jaszkowiak
896c8c7343 ESlint object-curly-spacing 2017-02-18 12:30:49 -07:00
barisusakli
7842c3411c remove logs 2017-02-18 20:52:45 +03:00
barisusakli
b33d34f7cf refactor user/picture.js 2017-02-18 20:27:58 +03:00
Peter Jaszkowiak
1493afee2a ESlint indent 2017-02-18 02:38:03 -07:00
Peter Jaszkowiak
3b0dd2d1ef ESlint padded-blocks 2017-02-18 02:32:24 -07:00
Peter Jaszkowiak
feb8405f95 ESlint eol-last 2017-02-18 02:30:48 -07:00
Peter Jaszkowiak
f3a8256f35 ESlint strict 2017-02-18 02:23:47 -07:00
Peter Jaszkowiak
a038c66549 ESlint quotes 2017-02-18 01:56:23 -07:00
Peter Jaszkowiak
604358ecc4 ESlint keyword-spacing, no-multi-spaces 2017-02-18 01:52:56 -07:00
Peter Jaszkowiak
2e031f3759 ESlint comma-spacing 2017-02-18 01:31:47 -07:00
Peter Jaszkowiak
277a7fb8b4 ESlint key-spacing, no-trailing-spaces 2017-02-18 01:27:46 -07:00
Peter Jaszkowiak
34e233fe1d ESlint spaced-comment 2017-02-18 01:25:46 -07:00
Peter Jaszkowiak
532951c24f ESlint space-in-parens, block-spacing 2017-02-18 01:21:34 -07:00
Peter Jaszkowiak
3361a72725 ESlint no-plusplus
and no-empty, space-unary-ops
2017-02-18 01:12:18 -07:00
Peter Jaszkowiak
d7526b5e44 ESlint array-bracket-spacing
and object-property-newline
2017-02-18 00:04:34 -07:00
Peter Jaszkowiak
52f2028206 ESlint no-multiple-empty-lines 2017-02-17 22:08:23 -07:00
Peter Jaszkowiak
b09b3aef7f ESlint no-undef, remove global comments 2017-02-17 22:03:55 -07:00
Peter Jaszkowiak
2ba46808a1 ESlint one-var, fix comma-dangle 2017-02-17 20:20:42 -07:00
Peter Jaszkowiak
bc1d70c126 ESlint comma-dangle 2017-02-17 19:31:21 -07:00