einhornimmond
|
363e04fbe5
|
put back depracted email tasks because I don't exactly know if I broke something if I remove it completly (especially model/session.cpp)
|
2021-03-30 18:42:07 +02:00 |
|
einhornimmond
|
f8d174049c
|
Merge branch 'master' into fix_lineendings
|
2021-03-30 18:29:04 +02:00 |
|
einhornimmond
|
5337543be1
|
Merge branch 'fix_lineendings' of github.com:gradido/gradido into fix_lineendings
|
2021-03-30 18:27:18 +02:00 |
|
einhornimmond
|
3339ce9d38
|
change fileformat back to utf-8 with BOM, for visual studio source files which contain ä,Ä,ö,Ö,ü,Ü or ß in strings must be in format utf-8-BOM
|
2021-03-30 18:26:48 +02:00 |
|
einhornimmond
|
41b1a18072
|
change fileformat back to utf-8 with BOM, for visual studio source files which contain ä,Ä,ö,Ö,ü,Ü or ß in strings must be in format utf-8-BOM
|
2021-03-30 17:52:03 +02:00 |
|
|
|
f09a0017f9
|
lineendings login_server
|
2021-03-30 17:06:41 +02:00 |
|
|
|
d4d9a22164
|
lineendings community server
|
2021-03-30 17:05:16 +02:00 |
|
|
|
45557a55c0
|
lineendings misc
|
2021-03-30 17:03:21 +02:00 |
|
|
|
8d530caf9a
|
lineendings nginx
|
2021-03-30 17:02:39 +02:00 |
|
|
|
b64f4748da
|
lineendings config
|
2021-03-30 17:01:27 +02:00 |
|
|
|
d2ca4fc42e
|
Merge pull request #84 from gradido/vue_with_nginx
Vue with nginx
|
2021-03-30 16:58:01 +02:00 |
|
|
|
62c34430e1
|
v0.9.4
|
2021-03-30 16:48:01 +02:00 |
|
einhornimmond
|
3358a25d4a
|
Merge branch 'master' into vue_with_nginx
|
2021-03-30 16:34:16 +02:00 |
|
einhornimmond
|
02d087a52b
|
Merge branch 'master' into vue_with_nginx
|
2021-03-30 16:32:02 +02:00 |
|
einhornimmond
|
2e178360f1
|
Merge pull request #103 from gradido/build_on_run
Build on run
|
2021-03-30 16:10:28 +02:00 |
|
einhornimmond
|
ce4aa2438c
|
fix linting errors
|
2021-03-30 16:04:09 +02:00 |
|
einhornimmond
|
65fccdd4fa
|
add space for linting, was that right?
|
2021-03-30 12:47:02 +02:00 |
|
einhornimmond
|
0fbf76857f
|
swap " with '
|
2021-03-30 12:32:27 +02:00 |
|
|
|
ed8ec023c8
|
Merge pull request #110 from gradido/new_version_0.9.3
new version 0.9.3
|
2021-03-30 11:26:01 +02:00 |
|
|
|
5e6f43b6fb
|
new version 0.9.3
|
2021-03-30 02:05:46 +02:00 |
|
Moriz Wahl
|
322a12318b
|
Merge pull request #102 from gradido/content-footer-tests
feat: Frontend tests for Content Footer
|
2021-03-29 21:15:10 +02:00 |
|
einhornimmond
|
0ea20f2e7a
|
Merge branch 'master' into vue_with_nginx
|
2021-03-29 19:10:13 +02:00 |
|
einhornimmond
|
8535730f94
|
make VUE_PATH as env-variable and use "/" as default if no .env exist
|
2021-03-29 19:08:30 +02:00 |
|
einhornimmond
|
90d8b60cc4
|
Update docker-compose.yml
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
|
2021-03-29 17:53:00 +02:00 |
|
einhornimmond
|
246b6487ba
|
Update docker-compose.override.yml
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
|
2021-03-29 17:52:53 +02:00 |
|
einhornimmond
|
8c153ff255
|
Merge branch 'master' into build_on_run
|
2021-03-29 17:51:04 +02:00 |
|
einhornimmond
|
0da5279175
|
build login-server on docker-compose up in a docker volume so it rebuild only neccessary parts if some c++ files have changed
|
2021-03-29 17:47:55 +02:00 |
|
Moriz Wahl
|
232d697941
|
tests for ContentFooter
|
2021-03-29 16:35:54 +02:00 |
|
einhornimmond
|
1f002f4ed0
|
update debug docker to use dependencies container pushed to docker hub
|
2021-03-29 16:10:36 +02:00 |
|
Moriz Wahl
|
de08bfe459
|
get tests workig including boostrap vue and element UI
|
2021-03-29 15:45:11 +02:00 |
|
einhornimmond
|
be549b7501
|
create docker container for build and offer protoc v3.9.1 to prevent rebuilding protoc every time
|
2021-03-29 15:30:03 +02:00 |
|
einhornimmond
|
cbdc573825
|
Merge pull request #96 from gradido/check_session_state
add check session state json function and doc
|
2021-03-29 12:06:18 +02:00 |
|
einhornimmond
|
edd7797da8
|
add check session state json function and doc
|
2021-03-26 14:12:51 +01:00 |
|
staging new
|
55ebd2ce96
|
Merge branch 'backport_balance_recalculation' into vue_with_nginx
|
2021-03-26 12:49:46 +01:00 |
|
Dario Rekowski on RockPI
|
9ed48da44c
|
fix temporaer calculating error
|
2021-03-26 11:46:35 +00:00 |
|
root
|
fdb46d5545
|
fix merge conflict
|
2021-03-26 12:27:55 +01:00 |
|
Dario Rekowski on RockPI
|
eda1b2ad7b
|
fix bug in user search (wrong action)
|
2021-03-26 11:04:21 +00:00 |
|
Dario Rekowski on RockPI
|
6ea10e2572
|
remove calls to removed DRMakeStringHash function
|
2021-03-26 10:49:00 +00:00 |
|
Dario Rekowski on RockPI
|
0bcc782388
|
remove make string hash function which is not working in php
|
2021-03-26 10:36:05 +00:00 |
|
Dario Rekowski on RockPI
|
8fc5d65f22
|
Merge branch 'master' into backport_balance_recalculation
|
2021-03-26 10:02:49 +00:00 |
|
Alexander Friedland
|
ee98433acc
|
Merge pull request #86 from gradido/new-work-activity
activity page stap 2
|
2021-03-26 11:01:17 +01:00 |
|
Dario Rekowski on RockPI
|
61b15beaf5
|
insert updateBalance method from stage2, ignore decay for the time beeing
|
2021-03-26 10:00:07 +00:00 |
|
Alexander Friedland
|
6becd2192b
|
Merge pull request #88 from gradido/fix-final-video-session
qrcode scanner fixed, datum in activitäten fixed, sprache not null fixed
|
2021-03-26 05:59:40 +01:00 |
|
|
|
b3a1481495
|
Merge pull request #83 from gradido/migrate_db_docker
add additional docker container which is running skeema on startup to…
|
2021-03-26 01:33:43 +01:00 |
|
|
|
9cd99d5c95
|
lint fixes
|
2021-03-26 01:22:50 +01:00 |
|
ogerly
|
814db309a4
|
qrcode scanner fixed, datum in activitäten fixed, sprache not null fixed
|
2021-03-25 20:34:14 +01:00 |
|
root
|
7f294ef28d
|
remove error by notification email send failure
|
2021-03-25 14:07:40 +01:00 |
|
root
|
8d993140e0
|
Merge branch 'new-work-activity' into vue_with_nginx
|
2021-03-25 13:58:30 +01:00 |
|
root
|
70b83aa4bf
|
Merge branch 'master' into vue_with_nginx
|
2021-03-25 13:50:04 +01:00 |
|
ogerly
|
52a049d861
|
activity page stap 2
|
2021-03-25 13:47:17 +01:00 |
|
