293 Commits

Author SHA1 Message Date
Dario Rekowski on RockPI
fe60808247
Merge branch 'stage1' of ssh://**REDACTED**/~/_cakephp/gradido_single_node into stage1 2021-03-13 18:41:30 +01:00
einhornimmond
91b490ea47
Merge branch 'stage1' of ssh://**REDACTED**/~/_cakephp/gradido_single_node into stage1 2021-03-13 18:41:30 +01:00
b6544b9e69
Merge pull request #3 from gradido/stage0
Stage0
2021-03-13 18:36:44 +01:00
af9212a2d8
Merge branch 'master' into stage0 2021-03-13 18:36:33 +01:00
89d4bcf98d
remove ssh:// (maybe thats the problem) 2021-03-13 18:15:45 +01:00
afca6dd048
fixed gitmodules 2021-03-13 18:07:24 +01:00
dea5f01561
fixed gitmodule urls 2021-03-13 18:01:08 +01:00
einhornimmond
93667eb832 update submodule, fix removed link 2021-03-13 15:01:52 +01:00
Dario Rekowski on RockPI
4e6e627da7 bring http://localhost/state-balances/ajaxListTransactions to live 2021-02-22 17:51:21 +00:00
Dario Rekowski on RockPI
98b5a0817e make code nicer 2021-02-22 14:24:04 +00:00
Dario Rekowski on RockPI
5124305c72 update ajaxGetBalance, use data from db, instead from session, fix tests, prepare for using decay 2021-02-22 14:22:21 +00:00
einhornimmond
5ce59b86d0 Merge pull request #1 from gradido/stage1 2021-02-19 16:03:46 +01:00
einhornimmond
c421212176 Merge branch 'stage1' of github.com:gradido/gradido_community_server into stage1 2021-02-19 15:59:36 +01:00
Dario Rekowski on RockPI
88d8a547cf successfully test state-balance/ajaxGetBalance 2021-02-19 14:57:19 +00:00
Dario Rekowski on RockPI
b900afed29 fix typing error> 2021-02-19 14:00:17 +00:00
Dario Rekowski on RockPI
0bc355dd99 add test data (3x creations, 1 transfer) to test fixtures 2021-02-19 13:36:44 +00:00
einhornimmond
7780bdc3c6 create tmp and logs folder and make it accessable, normally composer script does that, but it didn't seems to work inside docker 2021-02-17 20:27:22 +01:00
einhornimmond
4d2308eb8a change dockerfile to able to copy app.php from configs 2021-02-17 20:07:22 +01:00
einhornimmond
e4508f2be7 Merge branch 'stage1' of github.com:gradido/gradido_community_server into stage1 2021-02-17 16:44:41 +01:00
einhornimmond
f93b632ef5 correct nginx config 2021-02-17 16:44:22 +01:00
einhornimmond
84d60a111c Merge branch 'stage1' of github.com:gradido/gradido_community_server into stage1 2021-02-16 12:28:34 +01:00
einhornimmond
8c755f83ba Merge branch 'stage0' of ssh://**REDACTED**/~/_cakephp/gradido_single_node into stage1 2021-02-16 12:27:45 +01:00
einhornimmond
644ff4dbd0 remove constraint, because it don't work with mariadb 2021-02-16 10:41:20 +01:00
Dario Rekowski on RockPI
1f875f1c96 change call for csfr token to get 2021-02-16 09:19:54 +00:00
Dario Rekowski on RockPI
138ad755a2 add ajax call for getting csfr token 2021-02-16 08:57:24 +00:00
einhornimmond
f61fc5065a prevent warnings 2021-02-13 17:43:42 +01:00
einhornimmond
4de85b3e20 add configs for docker build 2021-02-13 17:23:59 +01:00
einhornimmond
32e178b43b rename insert sql file 2021-02-11 18:24:16 +01:00
Dario Rekowski on RockPI
b782d0f3ab update composer because of error from cakephp 2021-02-10 09:30:16 +00:00
Dario
41fe1cabe2 add error message, by error saving error message in state errors 2020-12-01 08:47:55 +01:00
Dario
406dc13412 Merge branch 'master' of ssh://**REDACTED**/~/_cakephp/gradido_single_node 2020-11-30 09:32:45 +01:00
root
b8a4409d6b update for better state-user/view 2020-11-30 09:31:31 +01:00
Dario Rekowski on RockPI
d5213e5466 update skeema file, removing skeema warnings 2020-10-26 14:43:18 +00:00
team-devstage
68a3400f51 update skeema files, adding roles, belong to samirs work 2020-10-26 15:39:59 +01:00
Dario Rekowski on RockPI
0a9a0ebed5 add visitor page 2020-10-20 10:23:20 +00:00
Dario Rekowski on RockPI
c0c3f40a41 update logos 2020-09-30 11:32:10 +00:00
Dario Rekowski on RockPI
af0a311fa7 fix bug with paging and searching 2020-08-07 08:09:33 +00:00
Dario Rekowski on RockPI
59031cc19a check in send coins if receiver was disabled 2020-08-07 07:29:22 +00:00
team-devstage
224714b16d show and make disabled editable, don't show disabled user in creation 2020-08-03 11:42:51 +02:00
team-devstage
507222ab1d add redirect to prevent blank page 2020-08-03 11:26:27 +02:00
team-devstage
1d91df0ab0 uncomment pending 2020-08-03 10:17:32 +02:00
Christine Slotty
a3d89bf087 Login Server Profile Update 2020-07-31 18:35:14 +02:00
team-devstage
9f80980480 add intval to change disabled bool to integer 2020-07-30 16:37:47 +02:00
team-devstage
10c92fd464 update sql files from christine to remove warnings by running skeema 2020-07-28 18:04:59 +02:00
team-devstage
fba758414c update sql files to remove all skeema warnings 2020-07-28 18:01:45 +02:00
Christine Slotty
d4f3fb3f3f Merge branch 'christine-profile' of ssh://**REDACTED**/~/php/cakePHP/gradido_community_server into christine-profile 2020-07-28 17:45:58 +02:00
Christine Slotty
4b37a90187 missing table; fixes/features 2020-07-28 17:45:46 +02:00
team-devstage
412b5e5c3b adding transaction types as insert script for running with setup script 2020-07-28 17:29:08 +02:00
Dario Rekowski on RockPI
767a6dd976 add bundle:css to websrc/package.json to bundle css without installing gulp globally 2020-07-28 14:46:30 +00:00
Christine Slotty
c216103520 User Search in create-multi 2020-07-21 17:14:40 +02:00