Commit Graph

31254 Commits

Author SHA1 Message Date
David Anderson db85a4ed96
Merge pull request #2528 from BOINC/dpa_autologin3
web: add support for autoattach
2018-05-28 17:32:47 -07:00
David Anderson 80c2460920
Merge pull request #2525 from BOINC/dpa_autoattach
Client: bug fixes for auto-attach
2018-05-28 17:32:28 -07:00
David Anderson 83b9de7b08
Merge pull request #2518 from BOINC/dpa_credit4
Server: add support for post-assigned credit
2018-05-28 17:32:15 -07:00
David Anderson 8384669568
Merge pull request #2517 from BOINC/dpa_credit2
Server: add support for pre-assigned credit
2018-05-28 17:32:01 -07:00
Oliver Bock 3ba7724d69
Merge pull request #2534 from drshawnkwang/drupal_fix-deleteuser-text
Drupal: Changed wording on delete page and email.
2018-05-28 14:39:08 +02:00
Oliver Bock 030b8f71f9
Merge pull request #2533 from drshawnkwang/drupal_fix-addpaths-ignore-optin
Drupal: Added more paths to ignore opt-in page.
2018-05-28 09:38:40 +02:00
Oliver Bock 19dc41bcd6
Merge pull request #2532 from drshawnkwang/drupal_update-join-page
Drupal: Modified join page to change instructions based on whether or…
2018-05-28 09:37:28 +02:00
Shawn Kwang 14b0766bb1 Drupal: Changed wording on delete page and email.
https://dev.gridrepublic.org/browse/DBOINCP-429
2018-05-25 12:26:37 -05:00
Shawn Kwang a8b28403ab Drupal: Added more paths to ignore opt-in page.
part of: https://dev.gridrepublic.org/browse/DBOINCP-428
2018-05-25 09:59:37 -05:00
Shawn Kwang 27d50496cf Drupal: Modified join page to change instructions based on whether or not user registration is enabled.
part of: https://dev.gridrepublic.org/browse/DBOINCP-428
2018-05-25 09:19:56 -05:00
tristanolive fb9477eeef
Merge pull request #2480 from drshawnkwang/drupal_feature-user-Webregistration
Drupal: User Opt-in consent and Web registration
2018-05-24 10:01:48 -04:00
tristanolive a692116a62
Merge pull request #2524 from drshawnkwang/drupal_feature-delete-user-revisit
Drupal: Delete user
2018-05-24 09:47:44 -04:00
David Anderson 0514a28dfc web: add support for autoattach
- make download page translatable
- change sample_index.php to show different things to:
    new users: show project intro, Join link
    returning users: show recent credit, link to home page
- add signup page: streamlined registration, goes to download
2018-05-21 15:08:24 -07:00
David Anderson 0b9826c023 client: show error message if login token lookup fails
Also change lookup token RPC to work better with AMs.
But client fixes are required to make it work completely right,
which will have to wait until 7.12.
2018-05-20 13:55:40 -07:00
David Anderson 2aff54c2c0 Bug fixes for auto-attach
- token lookup RPC returned wrong tag
- client failed to record AM name
2018-05-18 21:12:50 -07:00
Shawn Kwang e72aa0176b Drupal: Add cron jobs to delete expired records from tokens, user_deleted, and host_deleted tables, project database. 2018-05-18 10:38:16 -05:00
Shawn Kwang c73d764462 Drupal: Fixed misc Scrutinizer issues. 2018-05-18 09:18:37 -05:00
Kevin Reed 85625c7512
Merge pull request #2523 from BOINC/brevilo-coc-crlf-attrib
Fix git regression: make git aware that code of conduct uses CRLF
2018-05-18 09:10:04 -05:00
Shawn Kwang f7af0674a0 Drupal: removed debugging statement. 2018-05-18 08:57:56 -05:00
Shawn Kwang 071d64409c Drupal: Modified messages to be more user friendly. 2018-05-18 08:49:35 -05:00
Shawn Kwang 2cff2a2eaf Drupal: Removed old code.
Also added some bts() functions.
Removed grace-period code, no longer used.
2018-05-18 08:49:35 -05:00
Shawn Kwang 599e7d5588 Drupal: Add admin interface to allow admin to delete user. 2018-05-18 08:49:34 -05:00
Shawn Kwang 677a8a7ec8 Drupal: Modified boincuser delete function to delete record in boincuser table.
Also modified some watchdog messages.
2018-05-18 08:49:34 -05:00
Shawn Kwang cba68a56a6 Drupal: Add front-end code to for user delete.
Changed user delete form. It now sends a token in an email.
Use rconfirms deletion, and the account is now deleted (immediately).

https://dev.gridrepublic.org/browse/DBOINCP-429
2018-05-18 08:49:34 -05:00
Oliver Bock 5a8bb73323 Fix git regression: make git aware that code of conduct uses CRLF 2018-05-18 11:02:55 +02:00
Oliver Bock 0ca9243a34
Merge pull request #2521 from drshawnkwang/drupal_fix-fontawesome-bug
Drupal: Fix bug in Font Awesome CSS.
2018-05-18 09:39:24 +02:00
Kevin Reed 19bf320d7e
Update CODE_OF_CONDUCT.md
Add single space
2018-05-17 13:31:00 -05:00
Kevin Reed 958e8c22aa
Merge pull request #2428 from Ageless93/master
Code of Conduct for BOINC on Github
2018-05-17 13:29:56 -05:00
Oliver Bock 16bbbea450
Merge pull request #2472 from BOINC/knr_right_to_erase
Delete Account
2018-05-17 17:36:54 +02:00
Kevin Reed 83ea2bc9ec web: fixing spacing identified by scruitinizer 2018-05-17 09:58:03 -05:00
Kevin Reed 0c2b0bc88a web: remove excess space 2018-05-17 09:46:08 -05:00
Shawn Kwang 1804163ae3 Drupal: Fix bug in Font Awesome CSS.
Part of https://dev.gridrepublic.org/browse/DBOINCP-439
2018-05-17 09:22:31 -05:00
Kevin Reed b6804ab5de web: add mising closing parenthesis 2018-05-17 09:15:27 -05:00
Kevin Reed ae7200490a web: Make the delay after invalidating the autheniticator something that
can be customized by projects in the project.inc file
2018-05-17 08:56:45 -05:00
Kevin Reed 7ce2370160 db: change index names to not be shortened 2018-05-17 08:46:37 -05:00
tristanolive 1a3f1d78b0
Merge pull request #2516 from drshawnkwang/drupal_update-fontawesome
Drupal: Update fontawesome library
2018-05-17 09:38:03 -04:00
tristanolive d0701a811f
Merge pull request #2509 from drshawnkwang/drupal_feature-css-external-links
Drupal: Add font-awesome 'link' icon to all external links.
2018-05-17 09:37:43 -04:00
David Anderson 9bf2a3a4b9
Merge pull request #2520 from JamesMolson/fixes
Add missing mac_spawn entries to lib/Makefile.am
2018-05-16 17:48:18 -07:00
Kevin Reed f799c9c04b web: fix issues identified by scruitinizer 2018-05-16 16:26:14 -05:00
Kevin Reed 7172942bb0 web: reorganize code so that error_page is not called in inc files 2018-05-16 16:08:19 -05:00
Kevin Reed fdf493e3d4 web: use sensible constant values for times in code (improve
readability)
2018-05-16 15:43:49 -05:00
Kevin Reed f7e310e3e4 server: Use mysql_store_result() instead of mysql_use_result() when
fetching USER_DELETED records in db_dump
2018-05-16 15:39:02 -05:00
Kevin Reed 328a901ff3 db: add indexes in support delete account 2018-05-16 15:38:34 -05:00
David Anderson b857a37008 Add support for post-assigned credit
Add --post_assigned_credit option to validator.
If set, it gets claimed credit from result.claimed_credit
(put there by project's init_result() function).
The claimed credit of the canonical result is the job's granted credit.

Also changed --credit_from_runtime so that it averages
claimed credit across instances,
instead of just using the canonical instance.
2018-05-15 14:55:30 -07:00
David Anderson 924ff5dba9 Add support for pre-assigned credit
You can now pre-assign a job's credit, as described here:
https://boinc.berkeley.edu/trac/wiki/CreditOptions

Note: this feature was originally available via an
--additional_xml "<credit>xx</credit>" arg to create_work.
This is an ugly kludge; I removed it.
In fact, the --additional_xml arg should be removed at some point.

Also: change stage_file to it cd's to html/bin when including stuff;
this is needed since util_basic.inc now includes something else
2018-05-15 13:01:31 -07:00
Kevin Reed 21453710fd web: don't allow a user to start the delete account process if their
email address has been changed in the past 7 days
2018-05-15 14:32:40 -05:00
Kevin Reed 53250e7d27 web: fix bug in change email where the reversal email was only sent to
the new email when not using phpmailer
2018-05-15 14:32:07 -05:00
Kevin Reed 239af2d508 Merge branch 'master' into knr_right_to_erase
Conflicts:
	html/ops/db_update.php
2018-05-15 13:09:11 -05:00
David Anderson 02a59808b9
Merge pull request #2500 from Uplinger/email_change_notification
Email change notification
2018-05-15 09:42:20 -07:00
James Molson dad1069a8a
Add missing mac_spawn entries to lib/Makefile.am 2018-05-15 14:03:48 +02:00