Skip to content

Commit 6af5e25

Browse files
agladyshagladysh
committed
Merge remote-tracking branch 'pk-admin/master'
2 parents db273cc + 4493aef commit 6af5e25

24 files changed

+1250
-138
lines changed

‎pk-admin/.gitignore‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
.\#*\#
55

66
.DS_Store
7+
._.DS_Store
78
.project
89
.settings
910
.directory
@@ -17,8 +18,9 @@
1718

1819
nohup.out
1920
*.log
21+
.idea
22+
*.iml
2023

21-
/lua-nucleo
22-
/lua-aplicado
23-
/pk-core
24-
/pk-engine
24+
*.kate_swp
25+
tmp/*
26+
*.kate_swps

‎pk-admin/pk-admin/code/exports.lua‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77

88
return
99
{
10+
REGISTRATION_FAILURE = { "pk-admin/webservice/html_answer_render.lua" };
1011
check_admin_account_params = { "pk-admin/webservice/db/admin_account.lua" };
12+
check_recaptcha = { "pk-admin/webservice/recaptcha.lua" };
1113
create_session_checker = { "pk-admin/webservice/db/admin_session.lua" };
1214
delete = { "pk-admin/webservice/db/object_tag.lua", "pk-admin/webservice/db/object_tag_type.lua" };
1315
delete_expired_admin_session_by_account_id = { "pk-admin/webservice/db/admin_session.lua" };
@@ -32,6 +34,10 @@ return
3234
make_object_tag_api = { "pk-admin/webservice/db/object_tag_api.lua" };
3335
make_serialized_list_api = { "pk-admin/webservice/db/serialized_list.lua" };
3436
may_create_one_admin_session = { "pk-admin/webservice/db/admin_session.lua" };
37+
render_index = { "pk-admin/webservice/html_answer_render.lua" };
38+
render_login_answer_ok = { "pk-admin/webservice/html_answer_render.lua" };
39+
render_login_answer_unregistered = { "pk-admin/webservice/html_answer_render.lua" };
40+
render_register_answer_failed = { "pk-admin/webservice/html_answer_render.lua" };
3541
try_ban_admin_account_by_id = { "pk-admin/webservice/db/admin_account.lua" };
3642
try_create_admin_account = { "pk-admin/webservice/db/admin_account.lua" };
3743
try_create_admin_session = { "pk-admin/webservice/db/admin_session.lua" };

‎pk-admin/pk-admin/code/globals.lua‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
--------------------------------------------------------------------------------
22
-- globals.lua: list of globals defined in pk-admin
3+
-- This file is a part of pk-admin library
4+
-- Copyright (c) Alexander Gladysh <[email protected]>
5+
-- Copyright (c) Dmitry Potapov <[email protected]>
6+
-- See file `COPYRIGHT` for the license
37
--------------------------------------------------------------------------------
48

59
local GLOBALS =

‎pk-admin/pk-admin/code/profile.lua‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
--------------------------------------------------------------------------------
22
-- profile.lua: exports profile
3+
-- This file is a part of pk-admin library
4+
-- Copyright (c) Alexander Gladysh <[email protected]>
5+
-- Copyright (c) Dmitry Potapov <[email protected]>
6+
-- See file `COPYRIGHT` for the license
37
--------------------------------------------------------------------------------
48

59
local tset = import 'lua-nucleo/table-utils.lua' { 'tset' }

‎pk-admin/pk-admin/webservice/db/admin_account.lua‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
--------------------------------------------------------------------------------
22
-- admin_account.lua: webservice database handlers for admin accounts
3+
-- This file is a part of pk-admin library
4+
-- Copyright (c) Alexander Gladysh <[email protected]>
5+
-- Copyright (c) Dmitry Potapov <[email protected]>
6+
-- See file `COPYRIGHT` for the license
37
--------------------------------------------------------------------------------
48
--
59
-- WARNING: To be used inside call().

‎pk-admin/pk-admin/webservice/db/admin_session.lua‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
--------------------------------------------------------------------------------
22
-- session.lua: webservice database handlers for admin sessions
3+
-- This file is a part of pk-admin library
4+
-- Copyright (c) Alexander Gladysh <[email protected]>
5+
-- Copyright (c) Dmitry Potapov <[email protected]>
6+
-- See file `COPYRIGHT` for the license
37
--------------------------------------------------------------------------------
48
--
59
-- WARNING: To be used inside call().

‎pk-admin/pk-admin/webservice/db/object_tag.lua‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
--------------------------------------------------------------------------------
22
-- object_tag.lua: webservice database handlers for object tags
3+
-- This file is a part of pk-admin library
4+
-- Copyright (c) Alexander Gladysh <[email protected]>
5+
-- Copyright (c) Dmitry Potapov <[email protected]>
6+
-- See file `COPYRIGHT` for the license
37
--------------------------------------------------------------------------------
48
--
59
-- WARNING: To be used inside call().

‎pk-admin/pk-admin/webservice/db/object_tag_api.lua‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
--------------------------------------------------------------------------------
22
-- object_tag_api.lua: api for work with object custom tag
3+
-- This file is a part of pk-admin library
4+
-- Copyright (c) Alexander Gladysh <[email protected]>
5+
-- Copyright (c) Dmitry Potapov <[email protected]>
6+
-- See file `COPYRIGHT` for the license
37
--------------------------------------------------------------------------------
48
--
59
-- WARNING: To be used inside call().

‎pk-admin/pk-admin/webservice/db/object_tag_type.lua‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
--------------------------------------------------------------------------------
22
-- object_tag_type.lua: webservice database handlers for object tag types
3+
-- This file is a part of pk-admin library
4+
-- Copyright (c) Alexander Gladysh <[email protected]>
5+
-- Copyright (c) Dmitry Potapov <[email protected]>
6+
-- See file `COPYRIGHT` for the license
37
--------------------------------------------------------------------------------
48
--
59
-- WARNING: To be used inside call().

‎pk-admin/pk-admin/webservice/db/object_tag_type_value.lua‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
--------------------------------------------------------------------------------
22
-- object_tag_type_value.lua: webservice database handlers for object tag type values
3+
-- This file is a part of pk-admin library
4+
-- Copyright (c) Alexander Gladysh <[email protected]>
5+
-- Copyright (c) Dmitry Potapov <[email protected]>
6+
-- See file `COPYRIGHT` for the license
37
--------------------------------------------------------------------------------
48
--
59
-- WARNING: To be used inside call().

0 commit comments

Comments
 (0)