List of commits:
Subject Hash Author Date (UTC)
Admin user must not confirm the account by e-mail 0a81a2824087d9dcd2d1981c860946fd49cc8bf7 Catalin(ux) M. BOIE 2015-11-18 18:04:26
Bump the version to 0.41 363368555480d4c79c13867805c59541fd59e37c Catalin(ux) M. BOIE 2015-11-18 16:37:16
Mostly debug signaling by cache 2cd13a1f01403ebe733ef64ff2446b93e2cd46af Catalin(ux) M. BOIE 2015-11-18 16:36:40
Only texts changes. 37b6e035a5027c99a8b21672cef5431673320892 Catalin(ux) M. BOIE 2015-11-17 17:58:52
webhooks fixes 422d74f1cd4133e73ceb3edbb7a7da6d48c102f2 Catalin(ux) M. BOIE 2015-11-17 15:53:10
Checkpoint: ip/user fixes for remote connections, some pull request fixes and unit test start c8ac332f2ffda6149048dd17eaef8ff2f2920650 Catalin(ux) M. BOIE 2015-11-07 05:30:04
Added webhooks c2b73a8e494c4c61ce2d3f0d4101f0836a5a0df6 Catalin(ux) M. BOIE 2015-10-29 03:55:44
Mostly totp fixes; all tests pass; css fixes b4e220bf8823cad220183930949e80a6ec7f2fb3 Catalin(ux) M. BOIE 2015-10-17 12:02:14
Correct some gramatical problems 9078444271ce3e4fa25cff60afdb4efa8741fa01 Catalin(ux) M. BOIE 2015-09-13 08:43:38
Added weeks for ssh IP validity 6a8679ab22c25fd60504d2b21d57e9f1e2aaa254 Catalin(ux) M. BOIE 2015-09-13 08:03:51
Do not on any event if the protocol match. Assume is stable now. 69912910f5c0bbddc73ced992d8b3a652a8ff526 Catalin(ux) M. BOIE 2015-09-11 05:06:16
Bump version to 0.40 89d2ee4c3cae790d05a8b853de8427298dcbb9e1 Catalin(ux) M. BOIE 2015-09-11 04:59:49
Fix repo stats when there is no commit inside. 621b0a317b65d9a751d221908b8e1664d96011fa Catalin(ux) M. BOIE 2015-09-11 04:58:31
Added back the repo stats d8d06816223b52ff1d65df502fc6175f26c15518 Catalin(ux) M. BOIE 2015-09-10 04:44:10
TOTP fixes: mostly correct error messages 0f13d65e13211a91ce077b4a09307e54e9113f38 Catalin(ux) M. BOIE 2015-09-08 04:59:02
Lots of bug fixes, especially for cache a34c707720da68378086f73f16dd25c5a1ca8072 Catalin(ux) M. BOIE 2015-09-07 06:06:46
Mostly TOTP stuff for ssh 90eed0aa343f735f717238e3937439737290ecfd Catalin(ux) M. BOIE 2015-08-28 04:51:12
Added TOTP feature and some other minor stuff e9197291380929dd53f02f7373e8a339d6bd65a2 Catalin(ux) M. BOIE 2015-08-23 12:07:44
TODO clean-up. 1ae7c17d523aec8e6a303264e2c35934c459fc9d Catalin(ux) M. BOIE 2015-07-14 20:27:45
duilder updates (error out if head is not a tag 09ff5d7b52d059a7fab09427d8e6d12319a53804 Catalin(ux) M. BOIE 2015-07-14 20:27:35
Commit 0a81a2824087d9dcd2d1981c860946fd49cc8bf7 - Admin user must not confirm the account by e-mail
Author: Catalin(ux) M. BOIE
Author date (UTC): 2015-11-18 18:04
Committer name: Catalin(ux) M. BOIE
Committer date (UTC): 2015-11-18 18:04
Parent(s): 363368555480d4c79c13867805c59541fd59e37c
Signing key:
Tree: 3879066bab6776875b0782f95e7948b38ab322f5
File Lines added Lines deleted
inc/user.inc.php 4 4
tests/Makefile 1 1
tests/user.php 2 0
File inc/user.inc.php changed (mode: 100644) (index aeb083f..b7511a6)
... ... function rg_user_edit($db, $d)
450 450 // TODO: check rights // TODO: check rights
451 451 // TODO - check if user is allowed to give passed rights // TODO - check if user is allowed to give passed rights
452 452
453 if ($rg_account_email_confirm == 0) {
453 if (($d['confirmed'] == 0)
454 && ($rg_account_email_confirm == 0)) {
454 455 // no need to confirm account // no need to confirm account
455 $d['confirmed'] = 1; // signals "no-need-to-confirm"
456 } else {
457 $d['confirmed'] = 0;
456 $d['confirmed'] = 1;
458 457 } }
459 458
460 459 $update_pass = !empty($d['pass']); $update_pass = !empty($d['pass']);
 
... ... function rg_user_edit_high_level($db, &$rg)
1548 1547 $ui['plan_id'] = rg_var_uint("plan_id"); $ui['plan_id'] = rg_var_uint("plan_id");
1549 1548 $ui['session_time'] = rg_var_uint("session_time"); $ui['session_time'] = rg_var_uint("session_time");
1550 1549 $ui['confirm_token'] = rg_id(20); $ui['confirm_token'] = rg_id(20);
1550 $ui['confirmed'] = 0;
1551 1551 if ($rg['no_tos'] == 1) if ($rg['no_tos'] == 1)
1552 1552 $ui['tos'] = 1; $ui['tos'] = 1;
1553 1553 else else
File tests/Makefile changed (mode: 100644) (index 4a322a8..dddf9ee)
... ... clean:
102 102 @rm -rf git_log1 *.log *.strace *.strace.* *.out *.lock err-* *.diff \ @rm -rf git_log1 *.log *.strace *.strace.* *.out *.lock err-* *.diff \
103 103 http.arond *.pub git2key git2 *.in q_merge_requests/mr-* \ http.arond *.pub git2key git2 *.in q_merge_requests/mr-* \
104 104 qstats/* repos/* helper helper.pub keys/* ca *.pid pr_anon.git \ qstats/* repos/* helper helper.pub keys/* ca *.pid pr_anon.git \
105 *.tmp
105 *.tmp base ubase
File tests/user.php changed (mode: 100644) (index 2989569..f516f82)
... ... $_u['is_admin'] = 1;
56 56 $_u['rights'] = "C"; $_u['rights'] = "C";
57 57 $_u['session_time'] = 3600; $_u['session_time'] = 3600;
58 58 $_u['confirm_token'] = ""; $_u['confirm_token'] = "";
59 $_u['confirmed'] = 0;
59 60 $_u['plan_id'] = 1000; $_u['plan_id'] = 1000;
60 61 $uid = rg_user_edit($db, $_u); $uid = rg_user_edit($db, $_u);
61 62 if ($uid === FALSE) { if ($uid === FALSE) {
 
... ... $_u['is_admin'] = 1;
182 183 $_u['rights'] = "C"; $_u['rights'] = "C";
183 184 $_u['session_time'] = 3600; $_u['session_time'] = 3600;
184 185 $_u['confirm_token'] = ""; $_u['confirm_token'] = "";
186 $_u['confirmed'] = 0;
185 187 $_u['plan_id'] = 1000; $_u['plan_id'] = 1000;
186 188 $uid5 = rg_user_edit($db, $_u); $uid5 = rg_user_edit($db, $_u);
187 189 if ($uid5 === FALSE) { if ($uid5 === FALSE) {
Hints:
Before first commit, do not forget to setup your git environment:
git config --global user.name "your_name_here"
git config --global user.email "your@email_here"

Clone this repository using HTTP(S):
git clone https://rocketgit.com/user/catalinux/rocketgit

Clone this repository using ssh (do not forget to upload a key first):
git clone ssh://rocketgit@ssh.rocketgit.com/user/catalinux/rocketgit

Clone this repository using git:
git clone git://git.rocketgit.com/user/catalinux/rocketgit

You are allowed to anonymously push to this repository.
This means that your pushed commits will automatically be transformed into a merge request:
... clone the repository ...
... make some changes and some commits ...
git push origin main