Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/issue 11/add privacy and imprint units #566

Open
wants to merge 463 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
463 commits
Select commit Hold shift + click to select a range
fff4e16
- fix hiddenstring usage in crypto
rubenarslan Jul 2, 2021
c16cd77
log when runs loop
rubenarslan Jul 2, 2021
d738b5c
differentiate queue lists by fixed time stamps
cyriltata Jul 5, 2021
287bbb5
add filter by email
cyriltata Jul 5, 2021
dbffb34
make fractional pauses work
rubenarslan Jul 5, 2021
0e9e7b4
move queue to unit sessions table
cyriltata Jul 6, 2021
8491257
select sessions with non-NULL expiration
cyriltata Jul 9, 2021
694526c
run queue according to specified session type
cyriltata Jul 14, 2021
1e104d6
fix typo
rubenarslan Jul 14, 2021
4cac533
show queueing in user detail
rubenarslan Jul 14, 2021
fff5411
re-add fractional pauses from develop
rubenarslan Jul 14, 2021
bb9e642
Merge branch 'feature/refactor-queue' of https://github.com/rubenarsl…
rubenarslan Jul 14, 2021
d024bb2
at least let unit methods come before unitsession methods
rubenarslan Jul 16, 2021
bf02ce5
make it easier to obtain user_id
rubenarslan Jul 16, 2021
b30cfd1
first steps towards logging
rubenarslan Jul 19, 2021
0c2de04
order queue items randomly to avoid delays due to holdovers
rubenarslan Jul 19, 2021
a21adac
order queue randomly and don't cast to number (add ===)
rubenarslan Jul 19, 2021
451411a
more session logging
rubenarslan Jul 19, 2021
da62fd7
make errors in R actually error out so they get logged
rubenarslan Jul 19, 2021
0abe4b0
queue migration script
cyriltata Jul 19, 2021
27d3ddc
execute with php
cyriltata Jul 19, 2021
a0f2e62
solve it via the DB instead
rubenarslan Jul 19, 2021
b1b586e
Merge branch 'feature/refactor-queue' of https://github.com/rubenarsl…
rubenarslan Jul 19, 2021
7597c56
fix statement order
rubenarslan Jul 19, 2021
25e00b8
set pauses to execute
cyriltata Jul 19, 2021
c1fa047
update from old queue table only if session is not ended
cyriltata Jul 19, 2021
ea76740
typo
cyriltata Jul 19, 2021
9e88822
echo out row count
cyriltata Jul 19, 2021
05c02ea
surface result/result_log in user overview/detail
rubenarslan Jul 19, 2021
bef3de7
Merge branch 'feature/refactor-queue' of https://github.com/rubenarsl…
rubenarslan Jul 19, 2021
3c70e1c
log survey and extend user overview
rubenarslan Jul 20, 2021
f3ee916
make kai happy with his humongous study from hell
rubenarslan Jul 20, 2021
1d310b9
Merge branch 'feature/refactor-queue' into develop
rubenarslan Jul 20, 2021
6864b5f
bump version
rubenarslan Jul 20, 2021
758367b
Merge tag 'v0.19.0' into develop
rubenarslan Jul 20, 2021
baaebe6
Merge branch 'release/v0.19.0'
rubenarslan Jul 20, 2021
5a8ebf4
don't remove queued items if the run is cron_active=0
rubenarslan Jul 20, 2021
af02b33
add index to unit_sessions_table
cyriltata Jul 20, 2021
292f407
if reference unit session does not match current unit session in run …
cyriltata Jul 20, 2021
a469be3
- log manual pushes
rubenarslan Jul 20, 2021
64928c1
Merge branch 'hotfix/v0.19.1' of https://github.com/rubenarslan/formr…
rubenarslan Jul 20, 2021
f4a8be6
Merge tag 'v0.19.1' into develop
rubenarslan Jul 20, 2021
c218497
Merge branch 'hotfix/v0.19.1'
rubenarslan Jul 20, 2021
de25f79
use mysql's NOW() function
cyriltata Jul 20, 2021
682503a
don't duplicate rows in user overview
rubenarslan Jul 20, 2021
84369a7
Merge branch 'hotfix/v0.19.2' of https://github.com/rubenarslan/formr…
rubenarslan Jul 20, 2021
9180d29
limit to cron_active in the query
rubenarslan Jul 20, 2021
b89a50b
Merge tag 'v0.19.2' into develop
rubenarslan Jul 20, 2021
bdde492
Merge branch 'hotfix/v0.19.2'
rubenarslan Jul 20, 2021
25764cb
no more dupes in overview even if there are unclosed unit sessions
rubenarslan Jul 23, 2021
085f186
check items should default to zero and we can make R compatibility a …
rubenarslan Jul 23, 2021
ac18c8c
log more to make it easier for users to find problems
rubenarslan Aug 9, 2021
bd12ca5
rewrite is.na to typeof undefined on the fly to make it easier to ref…
rubenarslan Aug 10, 2021
16727dd
- improve unit session logging
rubenarslan Aug 11, 2021
e0e7d05
proper error message when body empty
rubenarslan Aug 11, 2021
27aa33b
cyril comments
rubenarslan Aug 11, 2021
f079f96
Merge tag 'v0.19.3' into develop
rubenarslan Aug 11, 2021
39f6d74
Merge branch 'hotfix/v0.19.3'
rubenarslan Aug 11, 2021
afad7df
typos
rubenarslan Aug 12, 2021
19f2871
always set emails to sent, even if they don't have a session_id (e.g.…
rubenarslan Aug 12, 2021
d529935
simplify testing without subdomains
rubenarslan Aug 13, 2021
ff76e2b
get an overview over user details as superadmin
rubenarslan Aug 13, 2021
db83c90
use a column in run sessions to track current unit sessions to make i…
rubenarslan Aug 16, 2021
baf240c
- better logging and logic in External
rubenarslan Aug 16, 2021
4f6f0b1
bump version
rubenarslan Aug 16, 2021
b6361fc
Merge tag 'v0.19.4' into develop
rubenarslan Aug 17, 2021
2738cfd
Merge branch 'release/v0.19.4'
rubenarslan Aug 17, 2021
20f4754
switch them over live
rubenarslan Aug 17, 2021
b372ffa
Merge tag 'v0.19.5' into develop
rubenarslan Aug 17, 2021
8cab085
Merge branch 'hotfix/v0.19.5'
rubenarslan Aug 17, 2021
aedb9fb
go back to working external module.
rubenarslan Aug 17, 2021
c94dcb1
revert external
rubenarslan Aug 17, 2021
cae99bd
Merge tag 'v0.19.6' into develop
rubenarslan Aug 17, 2021
1584a14
Merge branch 'hotfix/v0.19.6'
rubenarslan Aug 17, 2021
0bca2c2
fix arg order
rubenarslan Aug 19, 2021
66a793a
- log more
rubenarslan Aug 23, 2021
8aac973
- don't remove items from queue when there was a mismatch (UnitSessio…
rubenarslan Aug 23, 2021
d36c760
make it easier to debug the queue
rubenarslan Aug 23, 2021
9149db6
unstick skips
rubenarslan Aug 23, 2021
8dc9f75
we don't use the cron log anymore
rubenarslan Aug 23, 2021
cd83c65
add the possibility to rollback a failed transaction
cyriltata Aug 24, 2021
68c17cb
remove ugly logging
rubenarslan Aug 24, 2021
9fb26f2
Revert "remove ugly logging"
rubenarslan Aug 24, 2021
ccd6d8c
make it easier to check timing
rubenarslan Aug 24, 2021
3f40377
circumvent opencpu if it's just relative to pause entry
rubenarslan Aug 24, 2021
1f1646e
ugly logs gone again
rubenarslan Aug 24, 2021
e697dac
Merge branch 'hotfix/v0.19.7'
cyriltata Aug 24, 2021
4b1767b
Merge branch 'hotfix/v0.19.7' into develop
cyriltata Aug 24, 2021
e314f7e
remove remaining references to sessions_queue
rubenarslan Aug 26, 2021
7b55667
check if smtp instance is connected when getting the mailer object fo…
cyriltata Aug 31, 2021
35baa3c
truncate result data to fit in column
cyriltata Aug 31, 2021
6a46247
initiate mailer before sending emails
cyriltata Aug 31, 2021
f0e1bf7
retrofix patch
rubenarslan Sep 1, 2021
73d45dc
let external save results in unit_sessions table, give run access to …
rubenarslan Sep 1, 2021
00d46d3
respect higher limit
rubenarslan Sep 1, 2021
c030c75
try resending email once if the connection broke
rubenarslan Sep 2, 2021
f879051
pass mailer to sendMail() function to enture that attached files are …
cyriltata Sep 2, 2021
906ba98
call getSMTPConnection() within the loop to get a new mailer if it wa…
cyriltata Sep 2, 2021
8ad4370
Merge branch 'hotfix/v0.19.8'
rubenarslan Sep 2, 2021
03faff1
Merge tag 'v0.19.8' into develop
rubenarslan Sep 2, 2021
5b84966
Merge commit 'e314f7e67aec7d570010f670b5c1f53f9b95ec24'
rubenarslan Sep 2, 2021
62e87fc
refactor Page Unit
cyriltata Sep 6, 2021
708bfae
refactor adding Page Unit in run
cyriltata Sep 6, 2021
f12224a
refactor creating a Shuffle unit in admin
cyriltata Sep 6, 2021
9b920c7
refactor adding Pause and Wait modules in admin
cyriltata Sep 6, 2021
7442d8d
refactor Branches
cyriltata Sep 6, 2021
f6617ce
refactor study survey creation and assigning a study to a survey unit
cyriltata Sep 13, 2021
d71823c
move Pagination file to lib
cyriltata Sep 13, 2021
7510782
refactor testing survey and implement execution of unit sessions in r…
cyriltata Sep 13, 2021
f563024
refactor execution of run session by adding and looping over unit ses…
cyriltata Sep 15, 2021
b12e9e6
add button to restart new run session after logout
cyriltata Sep 15, 2021
295835d
complete survey execution and moving on
cyriltata Sep 15, 2021
55ef847
remove comment
cyriltata Sep 15, 2021
ab4b062
refactor execution of unit session on Pause and Branches
cyriltata Sep 16, 2021
83d67b9
refactor executing the unitSession on the Email unit
cyriltata Sep 16, 2021
2b5f186
refactor execution of unitsession over External and Shuffle
cyriltata Sep 16, 2021
263b405
fix queues
cyriltata Sep 16, 2021
54e8476
fix run import
cyriltata Sep 17, 2021
b07e519
move computation of surver items to renderer
cyriltata Sep 17, 2021
c3dcf30
move processing of survey items to render and add method to get outpu…
cyriltata Sep 17, 2021
797624c
queue fixes
cyriltata Sep 17, 2021
c755066
fix syntax error
cyriltata Sep 17, 2021
c733c9e
remove unit not needed class
cyriltata Sep 17, 2021
bee41c4
make intepretation of run session easier
cyriltata Sep 17, 2021
c567ef2
group files
cyriltata Sep 17, 2021
acf62ab
implement new renderer for pages study
cyriltata Sep 17, 2021
583575e
check emptyness
cyriltata Sep 17, 2021
d29e224
move item class
cyriltata Sep 17, 2021
8f3bb9e
move site class
cyriltata Sep 18, 2021
55bfcd1
don't show system messages to users unless one is debugging
cyriltata Sep 18, 2021
8df6eef
refactor tests for run units
cyriltata Sep 18, 2021
1b99852
fix basic functionality for paged surveys
cyriltata Sep 18, 2021
86a3924
Fix argument type error
cyriltata Sep 19, 2021
8833129
Do logging of unit sesion execution only when enabled
cyriltata Sep 19, 2021
123c04b
add spam protection: end run session if it loops over 20 units withou…
cyriltata Sep 20, 2021
e057b1c
get rid of unecessary class property
cyriltata Sep 21, 2021
996f19d
bake in recent patches
rubenarslan Jan 15, 2022
9282272
default to utf8mb4 charset
rubenarslan Jan 16, 2022
04a2ade
Merge branch 'feature/refactor-session-execution' into develop
rubenarslan Jan 16, 2022
0b3a3b2
make mysql charset configurable
rubenarslan Jan 16, 2022
236491b
domain for studies on subdomains configurable
rubenarslan Jan 16, 2022
a9e996f
make encoding configurable
rubenarslan Jan 16, 2022
402660b
used inconsistent word
rubenarslan Jan 16, 2022
ceb0cbe
ugh
rubenarslan Jan 16, 2022
800eb43
missing default arg
rubenarslan Jan 16, 2022
4ebfb1f
remove reference to fdb
rubenarslan Jan 16, 2022
bc8bc88
remove auto_incs
rubenarslan Jan 16, 2022
7bb580e
more admin levels prep
rubenarslan Jan 16, 2022
e09cc3b
allow changing brand name
rubenarslan Jan 16, 2022
b2db092
remove matthias
rubenarslan Jan 17, 2022
fba8182
rm matthias pci
rubenarslan Jan 17, 2022
91478a9
Fix typo
fkohrt Jan 21, 2022
fe1d5d9
log uncessarily only in DEBUG mode
cyriltata Jan 31, 2022
74a3888
avoid stripping slashes on all requests. Function should be called on…
cyriltata Jan 31, 2022
df567b0
Merge branch 'hotfix/v0.19.9'
cyriltata Jan 31, 2022
7aac9ed
Merge branch 'hotfix/v0.19.9' into develop
cyriltata Jan 31, 2022
70f4136
update version
cyriltata Jan 31, 2022
85389e2
Merge branch 'hotfix/v0.19.10'
cyriltata Jan 31, 2022
bb9a959
Merge branch 'hotfix/v0.19.10' into develop
cyriltata Jan 31, 2022
1dcba9f
assign right extension to survey name
cyriltata Mar 29, 2022
ec735b5
Bump async from 2.6.3 to 2.6.4 in /webroot/assets
dependabot[bot] Apr 29, 2022
2f51ca7
Bump grunt from 1.4.0 to 1.5.3 in /webroot/assets
dependabot[bot] May 26, 2022
ee6e207
Merge branch 'feature/configurability' into develop
cyriltata Jun 14, 2022
d4709a5
assign address from right option
cyriltata Jun 14, 2022
f811ac8
upgrade to PHP 8
cyriltata Jun 14, 2022
47b296b
fix PHP 8 warnings
cyriltata Jun 14, 2022
131ef32
Merge remote-tracking branch 'origin/dependabot/npm_and_yarn/webroot/…
cyriltata Jun 14, 2022
cd05705
Merge remote-tracking branch 'origin/dependabot/npm_and_yarn/webroot/…
cyriltata Jun 14, 2022
086cd2c
fix deprecation notices
cyriltata Jun 14, 2022
9b56e44
fix php8.1 deprecation warnings
cyriltata Jul 6, 2022
d01e4f6
Closes #476
cyriltata Jul 7, 2022
c017b65
process automatic items with errors again to avoid infilnite loops
cyriltata Jul 7, 2022
ada04da
use another cookie for admins to avoid conflict when testing
cyriltata Jul 7, 2022
2b90804
Merge branch 'feature/php8-compatibility' into develop
cyriltata Aug 30, 2022
d907ebe
do not destroy admin sessin when ending study
cyriltata Aug 30, 2022
4f57608
save new google id if link changed
cyriltata Aug 30, 2022
6396d73
fix null deprecation warnings
cyriltata Aug 30, 2022
7d65e98
move repository links to footer
cyriltata Aug 30, 2022
e0edccb
fix deprecation warnings
cyriltata Aug 30, 2022
5ea5a68
configure content settings and show/hide menu items
cyriltata Aug 30, 2022
ee0e0f2
add setting to disable / enable signups
cyriltata Aug 30, 2022
69aa6de
use the right settings in the footer
cyriltata Aug 30, 2022
f6e254d
use old settings name for publications
cyriltata Aug 31, 2022
a3c00af
hide content if logo not present
cyriltata Aug 31, 2022
7bfbe37
specify ip addresses that can still access application during mainten…
cyriltata Aug 31, 2022
6a2e8e3
fix settings name
cyriltata Aug 31, 2022
2bece0f
redirect when filling out a survey and you are queueingg
cyriltata Sep 2, 2022
b3e67b1
add meaning ful error message for compulsory get items
cyriltata Sep 2, 2022
6e279ba
conffigure to overriding curl options for opencpu requests
cyriltata Sep 3, 2022
a0b92e3
Release v0.20.0
cyriltata Sep 3, 2022
0c61584
Merge branch 'release/v0.20.0'
cyriltata Sep 3, 2022
6f5ed96
Merge branch 'release/v0.20.0' into develop
cyriltata Sep 3, 2022
46ca284
use valid array concatenation to preserve keys
cyriltata Sep 3, 2022
ef412a9
Release v0.20.1
cyriltata Sep 3, 2022
64576c0
Merge branch 'hotfix/v0.20.1'
cyriltata Sep 3, 2022
3e6d6fe
Merge branch 'hotfix/v0.20.1' into develop
cyriltata Sep 3, 2022
3d5fe19
fix deprecation warninngs
cyriltata Sep 3, 2022
be68e76
for ended run sessions in queue, end the corresponding unit session a…
cyriltata Sep 3, 2022
9bdbdd0
fix deprecation notices
cyriltata Sep 3, 2022
082d56b
Fix deprecation warnings
cyriltata Sep 4, 2022
3ee19f9
Merge branch 'hotfix/v0.20.2'
cyriltata Sep 4, 2022
cbbf79c
Merge branch 'hotfix/v0.20.2' into develop
cyriltata Sep 4, 2022
5b1e5f7
reset survey expiry once participant starts filling
cyriltata Sep 7, 2022
0ea3868
check expiration before checking if unit session is ended, check runT…
cyriltata Sep 7, 2022
2983c93
fix deprecation warnings
cyriltata Sep 7, 2022
f227cc2
Merge branch 'hotfix/v0.20.3'
cyriltata Sep 7, 2022
f9fbd3f
Merge branch 'hotfix/v0.20.3' into develop
cyriltata Sep 7, 2022
b88418d
develop version
cyriltata Sep 7, 2022
7aa72a4
retry transaction in case of deadlock or lock wait timeout
cyriltata Sep 13, 2022
ea8dd71
use survey context to generate feedback, fix deprecation warnings
cyriltata Sep 13, 2022
7f44a5b
get IP address behind a proxy
cyriltata Sep 13, 2022
663fa2d
check if unit sessions and run unit indeed exists before execution (q…
cyriltata Sep 13, 2022
784cc2e
Release v0.20.4
cyriltata Sep 13, 2022
fb539a1
Merge branch 'release/v0.20.4'
cyriltata Sep 13, 2022
47291d5
Merge branch 'release/v0.20.4' into develop
cyriltata Sep 13, 2022
d953d6d
check existence of study before reusing ID
cyriltata Sep 13, 2022
4b71566
fix bug to get email subject
cyriltata Oct 13, 2022
c5a92c1
add search form to user management, include max for random item
cyriltata Oct 20, 2022
e7d441f
add button to delete user and associated data in admin
cyriltata Oct 20, 2022
87e8ee8
JS minify
cyriltata Oct 20, 2022
3a41347
log statement only after retries have failed
cyriltata Oct 21, 2022
836dff4
Bump version
cyriltata Oct 21, 2022
ad40d8f
Merge branch 'release/v0.20.5'
cyriltata Oct 21, 2022
ab97b62
Display warning message for orphan run units
cyriltata May 2, 2023
a8604e5
version bump
cyriltata May 2, 2023
e307658
Merge branch 'hotfix/v0.20.6'
cyriltata May 2, 2023
e5de6be
Set allowed_classes to only 'User' class in unserialize call
Jun 27, 2023
919c699
fix: the variable name check is not doing what the error message tell…
red-freak Aug 29, 2023
406c339
Merge pull request #504 from red-freak/master
rubenarslan Aug 29, 2023
891defd
Merge pull request #502 from DeSerFix-bot/master
rubenarslan Aug 31, 2023
a275dec
Merge pull request #478 from fkohrt/patch-1
rubenarslan Aug 31, 2023
80e0bd9
Added docker files
Epd02 Nov 8, 2023
c62c4ed
Merge pull request #1 from timed-and-secured-assets/gruppe-1
Epd02 Nov 8, 2023
204ff4f
removed credentials
Epd02 Nov 8, 2023
d6650fe
Merge pull request #2 from timed-and-secured-assets/gruppe-1
Epd02 Nov 8, 2023
d8328c0
fixed gitignore not ignoring database files
Epd02 Nov 22, 2023
18f39f6
Added Filetype check for uploading surveys
Epd02 Nov 22, 2023
2a3aa45
Merge branch 'upload' of github.com:timed-and-secured-assets/formr.or…
Epd02 Nov 22, 2023
4fa8868
Merge pull request #4 from timed-and-secured-assets/upload
Epd02 Dec 15, 2023
6c0a5b2
feat: add privacy run unit
l4zs Jan 21, 2024
6bc8c0a
fix: return $output when privacy accepted
l4zs Jan 21, 2024
74c44b5
feat: add tos and imprint to privacy unit; create pages for privacy p…
l4zs Jan 23, 2024
094f8c6
refactor: move privacy texts to run settings; add sql patch;
l4zs Jan 25, 2024
1fc4a3c
refactor: add log messages; add info to set privacy texts when not se…
l4zs Jan 25, 2024
2e4fc7c
fix: privacy text preview url
l4zs Jan 30, 2024
ccb3a85
refactor: add info texts for privacy settings
l4zs Jan 31, 2024
f9ded43
feat: add confirmation on privacy unit removal
l4zs Jan 31, 2024
e185696
feat: add warning when setting privacy texts but no unit present
l4zs Jan 31, 2024
9a922ba
feat: require privacy and imprint when run publicness > 0
l4zs Jan 31, 2024
98284de
Rename patch
l4zs Feb 15, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,11 @@ formr-package/man
webroot/assets/img
tests/test.php
nohup.out
webroot/*.html
webroot/assets/*.mp4
webroot/assets/*.html

webroot/assets/bower_components
webroot/assets/lib/bower_components

/bin/migra.php
/*.key
docker/db/*
Loading