Maxim Sokhatsky 10 лет назад
Родитель
Сommit
223270bbc1

+ 0 - 1
.travis.yml

@@ -5,4 +5,3 @@ notifications:
   email: 
     - maxim@synrc.com
 install: "make"
-script: "make ct"

BIN
apps/web/priv/static/doc/Kakaranet-Scene.sketch/Data


+ 4 - 5
apps/web/priv/static/doc/Kakaranet-Scene.sketch/metadata

@@ -5,18 +5,17 @@
 	<key>app</key>
 	<string>com.bohemiancoding.sketch3</string>
 	<key>build</key>
-	<integer>7892</integer>
+	<integer>8054</integer>
 	<key>commit</key>
-	<string>a6af16d03e62e9b34da1be1098affa7b56d9838b</string>
+	<string>b2079fe10151ad0eef6cc553b7369ec78d67b9b5</string>
 	<key>fonts</key>
 	<array>
-		<string>Exo2-Regular</string>
-		<string>Exo2-Bold</string>
+		<string>.LucidaGrandeUI</string>
 		<string>LucidaGrande-Bold</string>
 		<string>ZapfDingbatsITC</string>
 	</array>
 	<key>length</key>
-	<integer>3020801</integer>
+	<integer>3020774</integer>
 	<key>version</key>
 	<integer>37</integer>
 </dict>

+ 1 - 0
apps/web/src/logallow.erl

@@ -4,6 +4,7 @@
 log_modules() -> [
 %    wf_core,
     n2o_bullet,
+    routes,
 %    okey_bot,
     game_session,
 %    bullet_handler,

+ 1 - 1
apps/web/src/okey.erl

@@ -72,7 +72,7 @@ user() ->
 
 player_name(PI) -> auth_server:player_name(PI).
 
-main() -> #dtl{file="index", bindings=[{title,<<"N2O">>},{body,[]}]}.
+main() -> []. %#dtl{file="index", bindings=[{title,<<"N2O">>},{body,[]}]}.
 
 patch_users() ->
     [ begin


+ 1 - 1
otp.mk

@@ -18,7 +18,7 @@ relx     := "{release,{$(RELEASE),\"$(VER)\"},[$(RELEASE)]}.\\n{include_erts,tru
 test: eunit ct
 compile: get-deps
 delete-deps get-deps compile update-deps:
-	rebar $@
+	./mad $@
 clean:
 	rm -f .applist
 	rebar $@

+ 12 - 3
rebar.config

@@ -2,7 +2,16 @@
 {lib_dirs,["apps"]}.
 {deps_dir,"deps"}.
 {deps, [
-    {shen,   ".*", {git, "git://github.com/5HT/shen",           {tag,"1.5.0"}}},
-    {active, ".*", {git, "git://github.com/synrc/active",       {tag,"0.8"}}},
-    {avz,    ".*", {git, "git://github.com/synrc/avz",          {tag,"1.4.0"}}}
+    {shen,   ".*", {git, "git://github.com/5HT/shen",           {tag, "1.5.0"} }},
+    {n2o,    ".*", {git, "git://github.com/synrc/n2o",          {tag, "1.8.0"} }},
+    {erlydtl,".*", {git, "git://github.com/evanmiller/erlydtl", {tag, "0.8.0"} }},
+    {cowboy, ".*", {git, "git://github.com/extend/cowboy",      {tag, "0.9.0"} }},
+    {gproc,  ".*", {git, "git://github.com/uwiger/gproc.git",   {tag, "0.3"}   }},
+    {fs,     ".*", {git, "git://github.com/synrc/fs",           {tag, "0.8"}   }},
+    {sh,     ".*", {git, "git://github.com/synrc/sh",           {tag, "0.8"}   }},
+    {active, ".*", {git, "git://github.com/synrc/active",       {tag, "0.8"}   }},
+    {mad,    ".*", {git, "git://github.com/synrc/mad",          {tag, "0.8"}   }},
+    {rest,   ".*", {git, "git://github.com/synrc/rest",         {tag, "1.5.0"} }},
+    {kvs,    ".*", {git, "git://github.com/synrc/kvs",          {tag, "1.5.0"} }},
+    {avz,    ".*", {git, "git://github.com/synrc/avz",          {tag, "1.5.0"} }}
 ]}.