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.

Sign up for GitHub

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

Jump to bottom

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

Open
wants to merge 463 commits into
base: master
Choose a base branch
from
Open

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

wants to merge 463 commits into from

Conversation

rubenarslan
Copy link
Owner

No description provided.

rubenarslan and others added 30 commits July 2, 2021 21:47
@rubenarslan
- fix hiddenstring usage in crypto
fff4e16 
- error out earlier in cases of infinite loops
@rubenarslan
log when runs loop
c16cd77
@cyriltata
differentiate queue lists by fixed time stamps
d738b5c
@cyriltata
add filter by email
287bbb5
@rubenarslan
make fractional pauses work
dbffb34
@cyriltata
move queue to unit sessions table
0e9e7b4
@cyriltata
select sessions with non-NULL expiration
8491257
@cyriltata
run queue according to specified session type
694526c
@rubenarslan
fix typo
1e104d6
@rubenarslan
show queueing in user detail
4cac533
@rubenarslan
re-add fractional pauses from develop
fff5411
@rubenarslan
Merge branch 'feature/refactor-queue' of https://github.com/rubenarsl…
bb9e642 
…an/formr.org into feature/refactor-queue

# Conflicts:
#	application/Library/UnitSessionQueue.php
@rubenarslan
at least let unit methods come before unitsession methods
d024bb2
@rubenarslan
make it easier to obtain user_id
bf02ce5
@rubenarslan
first steps towards logging
b30cfd1
@rubenarslan
order queue items randomly to avoid delays due to holdovers
0c2de04
@rubenarslan
order queue randomly and don't cast to number (add ===)
a21adac
@rubenarslan
more session logging
451411a
@rubenarslan
make errors in R actually error out so they get logged
da62fd7
@cyriltata
queue migration script
0abe4b0
@cyriltata
execute with php
27d3ddc
@rubenarslan
solve it via the DB instead
a0f2e62
@rubenarslan
Merge branch 'feature/refactor-queue' of https://github.com/rubenarsl…
b1b586e 
…an/formr.org into feature/refactor-queue
@rubenarslan
fix statement order
7597c56
@cyriltata
set pauses to execute
25e00b8
@cyriltata
update from old queue table only if session is not ended
c1fa047
@cyriltata
typo
ea76740
@cyriltata
echo out row count
9e88822
@rubenarslan
surface result/result_log in user overview/detail
05c02ea
@rubenarslan
Merge branch 'feature/refactor-queue' of https://github.com/rubenarsl…
bef3de7 
…an/formr.org into feature/refactor-queue
cyriltata and others added 29 commits October 21, 2022 11:10
@cyriltata
Bump version
836dff4
@cyriltata
Merge branch 'release/v0.20.5'
ad40d8f
@cyriltata
Display warning message for orphan run units
ab97b62
@cyriltata
version bump
a8604e5
@cyriltata
Merge branch 'hotfix/v0.20.6'
e307658
Set allowed_classes to only 'User' class in unserialize call
e5de6be
@red-freak
fix: the variable name check is not doing what the error message tell…
919c699 
…s the user
@rubenarslan
Merge pull request rubenarslan#504 from red-freak/master
406c339 
fix: the variable name check is not doing what the error message tells the user
@rubenarslan
Merge pull request rubenarslan#502 from DeSerFix-bot/master
891defd 
Set allowed_classes to only 'User' class in unserialize call
@rubenarslan
Merge pull request rubenarslan#478 from fkohrt/patch-1
a275dec 
Fix typo
@Epd02
Added docker files
80e0bd9
@Epd02
Merge pull request #1 from timed-and-secured-assets/gruppe-1
c62c4ed 
Added docker files
@Epd02
removed credentials
204ff4f
@Epd02
Merge pull request #2 from timed-and-secured-assets/gruppe-1
d6650fe 
removed credentials
@Epd02
fixed gitignore not ignoring database files
d8328c0
@Epd02
Added Filetype check for uploading surveys
18f39f6
@Epd02
Merge branch 'upload' of github.com:timed-and-secured-assets/formr.or…
2a3aa45 
…g into upload
@Epd02
Merge pull request #4 from timed-and-secured-assets/upload
4fa8868 
Merge branch "upload"
@l4zs
feat: add privacy run unit
6c0a5b2
@l4zs
fix: return $output when privacy accepted
6bc8c0a
@l4zs
feat: add tos and imprint to privacy unit; create pages for privacy p…
74c44b5 
…ages; embed links to privacy pages in every survey pages footer;
@l4zs
refactor: move privacy texts to run settings; add sql patch;
094f8c6
@l4zs
refactor: add log messages; add info to set privacy texts when not se…
1fc4a3c 
…t; add preview link for privacy texts;
@l4zs
fix: privacy text preview url
2e4fc7c
@l4zs
refactor: add info texts for privacy settings
ccb3a85
@l4zs
feat: add confirmation on privacy unit removal
f9ded43
@l4zs
feat: add warning when setting privacy texts but no unit present
e185696
@l4zs
feat: require privacy and imprint when run publicness > 0
9a922ba
@l4zs
Rename patch
98284de
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@rubenarslan @cyriltata @fkohrt @red-freak @Epd02 @l4zs