Subject | Hash | Author | Date (UTC) |
---|---|---|---|
Checkpoint | c769943b7cd003725a18731a1723616010582d50 | Catalin(ux) M. BOIE | 2014-09-06 05:43:17 |
Checkpoint after a lot of pause | 53c17f78a3d70e22165de311ff56b094cb3b1096 | Catalin(ux) M. BOIE | 2014-04-14 18:23:27 |
Checkpoint - mostly fixes for tests and switch to sql_params | 28830fcf28cf8f3ae0f59bf1205281820df1307a | Catalin(ux) M. BOIE | 2013-07-16 19:42:15 |
Bulk changes all over the place. | 69bd7667ac66a02ae3734ddb2f1eb8eec526e3bf | Catalin(ux) M. BOIE | 2013-04-21 06:40:27 |
Fixed repo search: ui['admin'] may not be defined | 48794821cb9a4ea8fa793144256ac916b1554bf2 | Catalin(ux) M. BOIE | 2013-02-18 19:37:31 |
Several changes. Bump version to 0.18 | 57269df7b88cd6cbb0c2569c6e14d94887c6ca40 | Catalin(ux) M. BOIE | 2013-02-17 10:10:48 |
Bump the version | 753abba3b1f6caac8f96d801e5a5d1786023aa2f | Catalin(ux) M. BOIE | 2013-02-05 19:40:38 |
Checkpoint | 16a893cae9b7754a3e9ff9a0f380c00ccc52a907 | Catalin(ux) M. BOIE | 2013-02-05 19:35:48 |
Bulk fixes | 30f559c9d7701b0a06344f286f113e154a39805b | Catalin(ux) M. BOIE | 2013-01-06 00:24:33 |
Removed some debug stuff. | d17e0d454e7e1cad1b350139e0770e7450ee9331 | Catalin(ux) M. BOIE | 2012-12-02 21:00:30 |
Apply conditionals before replacing variables! | 3d5b7d5fcc11734f9623a3d6ff0aaa8a332b6bdb | Catalin(ux) M. BOIE | 2012-12-02 20:58:43 |
More fixes for 'fixes' infrastructure | 831af837ca9e7fcf56bef81d1831c3150afa7de8 | Catalin(ux) M. BOIE | 2012-12-01 21:58:30 |
Fixes infrastructure; bug fixing | c282b19dcb975b1e90a4eaacfe4c126364f6e054 | Catalin(ux) M. BOIE | 2012-12-01 21:01:23 |
First round of notifications | 561943c9bfd37fcf2b3c53724af2c8145d76d664 | Catalin(ux) M. BOIE | 2012-11-18 12:03:28 |
Repo history added | 888934152ff5c2f2dafae9e598cf93ab6f377dba | Catalin(ux) M. BOIE | 2012-11-09 22:39:08 |
git clone fixes and other stuff | dbe6ddaddfc735c8a6fef126ba90cdb2a98fe631 | Catalin(ux) M. BOIE | 2012-11-07 19:19:38 |
Allow duplicate repo names. Allow same key (db pov). | 146d1de07369f1e3270a6cdca1f1bead2d076f30 | Catalin(ux) M. BOIE | 2012-11-05 19:47:06 |
Bulk | e15b8500a1ba4d1a84631287b234a661aa366cd6 | Catalin(ux) M. BOIE | 2012-11-05 18:39:16 |
Bulk updates - search, rights \!own | fd52a1454efb598538244ac8b1117ee074d818cd | Catalin(ux) M. BOIE | 2012-10-31 22:08:29 |
Fix delete repo function | 63e34cf9032bb7b108b51c97ccbd1efbd1e5cd7b | Catalin(ux) M. BOIE | 2012-10-29 20:45:40 |
File docs/rights.txt renamed from root/themes/default/user/repo/rights/list/nodata.html (similarity 100%) |
File inc/user/repo/admin/admin.php deleted (index 3b46283..0000000) | |||
1 | <?php | ||
2 | rg_log("/inc/user/repo/admin/admin"); | ||
3 | |||
4 | $_admin_body = ""; | ||
5 | $repo_admin_more = $repo_more; | ||
6 | |||
7 | if (rg_repo_allow($db, $ri, $login_ui, "A") !== TRUE) { | ||
8 | // Probably the user is not logged in | ||
9 | $_url = rg_re_url("/op/login"); | ||
10 | rg_redirect($_url); | ||
11 | exit(0); | ||
12 | } | ||
13 | |||
14 | // TODO: we must set the url globally, in index.php! | ||
15 | $_url_admin = rg_re_repopage($login_ui, $repo) . "/admin"; | ||
16 | |||
17 | $repo_admin_more = array_merge($repo_admin_more, $ri); | ||
18 | $repo_admin_more['url_admin'] = $_url_admin; | ||
19 | |||
20 | $_op = empty($paras) ? "" : array_shift($paras); | ||
21 | switch ($_op) { | ||
22 | case 'edit': | ||
23 | include($INC . "/user/repo/admin/edit/edit.php"); | ||
24 | $_admin_body .= $_edit; | ||
25 | break; | ||
26 | |||
27 | case 'rights': | ||
28 | include($INC . "/user/repo/admin/rights/rights.php"); | ||
29 | $_admin_body .= $_rights; | ||
30 | break; | ||
31 | |||
32 | case 'delete': | ||
33 | include($INC . "/user/repo/admin/delete/delete.php"); | ||
34 | $_admin_body .= $_delete; | ||
35 | break; | ||
36 | |||
37 | case '': | ||
38 | break; | ||
39 | |||
40 | default: | ||
41 | rg_log("BAD, invalid op=$_op!"); | ||
42 | } | ||
43 | |||
44 | // menu | ||
45 | $_admin_menu = rg_template("repo/admin.html", $repo_admin_more); | ||
46 | |||
47 | $_admin = $_admin_menu . $_admin_body; | ||
48 | ?> |
File inc/user/repo/admin/delete/delete.php deleted (index 482b26f..0000000) | |||
1 | <?php | ||
2 | rg_log("/inc/user/repo/admin/delete/delete"); | ||
3 | |||
4 | $are_you_sure = rg_var_uint("are_you_sure"); | ||
5 | |||
6 | $repo_delete_more = $repo_admin_more; | ||
7 | $_delete = ""; | ||
8 | |||
9 | $errmsg = array(); | ||
10 | |||
11 | $_show_form = 1; | ||
12 | do { | ||
13 | if ($doit != 1) | ||
14 | break; | ||
15 | |||
16 | if ($are_you_sure == 0) { | ||
17 | $_delete .= rg_template("user/repo/delete/no.html", $repo_delete_more); | ||
18 | $_show_form = 0; | ||
19 | break; | ||
20 | } | ||
21 | |||
22 | if (!rg_token_valid($db, $sid, $token)) { | ||
23 | $del_errmsg[] = "invalid token; try again"; | ||
24 | break; | ||
25 | } | ||
26 | |||
27 | $r = rg_repo_delete($db, $ri['repo_id'], $login_ui); | ||
28 | if ($r === FALSE) { | ||
29 | $errmsg[] = rg_repo_error(); | ||
30 | break; | ||
31 | } | ||
32 | |||
33 | $_delete .= rg_template("user/repo/delete/done.html", $repo_delete_more); | ||
34 | $_show_form = 0; | ||
35 | } while (0); | ||
36 | |||
37 | if ($_show_form == 1) { | ||
38 | $repo_delete_more['HTML:errmsg'] = rg_template_errmsg($errmsg); | ||
39 | $repo_delete_more['rg_form_token'] = rg_token_get($db, $sid); | ||
40 | $_delete .= rg_template("user/repo/delete/sure.html", $repo_delete_more); | ||
41 | } | ||
42 | |||
43 | ?> |
File inc/user/repo/admin/rights/README deleted (index ba9d47c..0000000) | |||
1 | rights.php seems to do the same with /inc/repo/repo.php! |
File inc/user/repo/admin/rights/repo/repo.php renamed from inc/user/repo/admin/rights/rights.php (similarity 100%) |
File root/themes/default/admin/menu.html copied from file root/themes/default/errmsg/nodata.html (similarity 100%) |
File root/themes/default/admin/plans/menu.html added (mode: 100644) (index 0000000..63ce6e3) | |||
1 | <div class="menu"> | ||
2 | <ul> | ||
3 | <li><a @@if(@@menu.sub1.plans@@ == 1){{class="selected"}}{{}} href="@@url@@/plans">Plans</a></li> | ||
4 | <li><a @@if(@@menu.sub1.users@@ == 1){{class="selected"}}{{}} href="@@url@@/users">Users</a></li> | ||
5 | <li><a @@if(@@menu.sub1.repos@@ == 1){{class="selected"}}{{}} href="@@url@@/repos">Repos</a></li> | ||
6 | </ul> | ||
7 | </div> |
File root/themes/default/hints/repo/edit_repo_refs_rights.html copied from file root/themes/default/hints/repo/edit_rights.html (similarity 69%) (mode: 100644) (index 75f132b..e25af68) | |||
1 | You do not have to grant yourself rights.<br /> | ||
1 | You do not have to grant yourself rights. | ||
2 | 2 | You are the owner, so you have maximum rights.<br /> | You are the owner, so you have maximum rights.<br /> |
3 | 3 | <br /> | <br /> |
4 | 4 | ||
5 | Priority is used to order the rights in the proper order.<br /> | ||
6 | <br /> | ||
7 | |||
5 | 8 | Bad whitespace: if checked, commits with mixed tabs and spaces, trailing | Bad whitespace: if checked, commits with mixed tabs and spaces, trailing |
6 | 9 | spaces/tabs etc. will be allowed.<br /> | spaces/tabs etc. will be allowed.<br /> |
7 | 10 | <br /> | <br /> |
8 | 11 | ||
9 | 12 | Example rights for references:<br /> | Example rights for references:<br /> |
10 | 13 | refs/heads/x * Fetch + Push = Allow user to fetch/push in private namespace 'x'<br /> | refs/heads/x * Fetch + Push = Allow user to fetch/push in private namespace 'x'<br /> |
11 | {USER} * Fetch + Push + Create branch+Delete branch = Logged in user 'USER' has rights to refs/heads/USER<br /> | ||
14 | {USER} * Fetch + Push + Create branch+Delete branch = Logged in user 'USER' has rights to refs/heads/USER<br /> |
File root/themes/default/hints/repo/edit_repo_rights.html copied from file root/themes/default/hints/repo/edit_rights.html (similarity 100%) |
File root/themes/default/hints/repo/edit_rights.html changed (mode: 100644) (index 75f132b..8e2b7d9) | |||
1 | You do not have to grant yourself rights.<br /> | ||
2 | You are the owner, so you have maximum rights.<br /> | ||
3 | <br /> | ||
1 | You do not have to grant yourself rights. | ||
2 | You are the owner, so you have maximum rights. | ||
3 | <br /><br /> | ||
4 | 4 | ||
5 | Bad whitespace: if checked, commits with mixed tabs and spaces, trailing | ||
6 | spaces/tabs etc. will be allowed.<br /> | ||
7 | <br /> | ||
5 | IP can be empty, meaning any IP will match. | ||
6 | You can use both IPv4 and IPv6. Some examples: 4.4.4.4, 1.2.3.0/24, | ||
7 | 2001:6:3456::/64. | ||
8 | <br /><br /> | ||
8 | 9 | ||
9 | Example rights for references:<br /> | ||
10 | refs/heads/x * Fetch + Push = Allow user to fetch/push in private namespace 'x'<br /> | ||
11 | {USER} * Fetch + Push + Create branch+Delete branch = Logged in user 'USER' has rights to refs/heads/USER<br /> | ||
10 | Priority is used to order the rights in the proper order. | ||
11 | They are evaluated top to bottom. |
File root/themes/default/repo/create_ok.html added (mode: 100644) (index 0000000..3b375f0) | |||
1 | <div class="ok"> | ||
2 | Repository was updated with success. | ||
3 | </div> |
File root/themes/default/repo/edit_ok.html added (mode: 100644) (index 0000000..3b375f0) | |||
1 | <div class="ok"> | ||
2 | Repository was updated with success. | ||
3 | </div> |
File root/themes/default/repo/menu.html added (mode: 100644) (index 0000000..977f8d4) | |||
1 | <div class="menu"> | ||
2 | <ul> | ||
3 | <li><a @@if(@@menu.sub1.edit_info@@ == 1){{class="selected"}}{{}} href="@@url@@/edit_info">Edit info</a></li> | ||
4 | <li><a @@if(@@menu.sub1.change_pass@@ == 1){{class="selected"}}{{}} href="@@url@@/change_pass">Change password</a></li> | ||
5 | <li><a @@if(@@menu.sub1.keys@@ == 1){{class="selected"}}{{}} href="@@url@@/keys">SSH keys</a></li> | ||
6 | </ul> | ||
7 | </div> |
File root/themes/default/suggestion_sent.html copied from file root/themes/default/ok.html (similarity 100%) |
File root/themes/default/user/keys/remove_ok.html copied from file root/themes/default/user/edit_ok.html (similarity 100%) |
File root/themes/default/user/repo/menu.html renamed from root/themes/default/repo/admin.html (similarity 100%) |
File root/themes/default/user/repo/rights/delete_ok.html added (mode: 100644) (index 0000000..d8a4857) | |||
1 | <div class="ok"> | ||
2 | Rights granted with success. | ||
3 | </div> |
File root/themes/default/user/repo/rights/form_repo.html copied from file root/themes/default/user/repo/rights/form.html (similarity 100%) |
File root/themes/default/user/repo/rights/form_repo_refs.html renamed from root/themes/default/user/repo/rights/form.html (similarity 78%) (mode: 100644) (index 6b26feb..4d35c6a) | |||
1 | <pre>@@DUMP@@</pre> | ||
1 | 2 | <div class="formarea"> | <div class="formarea"> |
2 | 3 | ||
3 | 4 | <div class="formarea_title">Grant rights</div><br /> | <div class="formarea_title">Grant rights</div><br /> |
26 | 27 | </td> | </td> |
27 | 28 | ||
28 | 29 | <td> | <td> |
29 | <label class="form_item_title" for="ref">Reference</label><br /> | ||
30 | <label class="form_item_title" for="ref">Reference (regexp)</label><br /> | ||
30 | 31 | <input type="text" name="ref" value="@@ref@@" /> | <input type="text" name="ref" value="@@ref@@" /> |
31 | 32 | <br /> | <br /> |
32 | 33 | <br /> | <br /> |
33 | 34 | ||
34 | <label class="form_item_title" for="path">Path</label><br /> | ||
35 | <label class="form_item_title" for="path">Path (regexp)</label><br /> | ||
35 | 36 | <input type="text" name="path" value="@@path@@" /> | <input type="text" name="path" value="@@path@@" /> |
36 | 37 | <br /> | <br /> |
37 | 38 | <br /> | <br /> |
38 | 39 | ||
39 | <label class="form_item_title" for="rights">Rights</label><br /> | ||
40 | <label class="form_item_title" for="refs_rights">Rights</label><br /> | ||
40 | 41 | @@refs_rights_checkboxes@@ | @@refs_rights_checkboxes@@ |
41 | 42 | <br /> | <br /> |
42 | 43 | </td> | </td> |
File root/themes/default/user/repo/rights/grant_ok.html copied from file root/themes/default/errmsg/nodata.html (similarity 100%) |
File root/themes/default/user/repo/rights/list_repo/footer.html renamed from root/themes/default/user/repo/rights/list/footer.html (similarity 100%) |
File root/themes/default/user/repo/rights/list_repo/header.html renamed from root/themes/default/user/repo/rights/list/header.html (similarity 100%) |
File root/themes/default/user/repo/rights/list_repo/line.html renamed from root/themes/default/user/repo/rights/list/line.html (similarity 100%) |
File root/themes/default/user/repo/rights/list_repo/nodata.html copied from file root/themes/default/errmsg/nodata.html (similarity 100%) |
File root/themes/default/user/settings/menu.html copied from file root/themes/default/errmsg/nodata.html (similarity 100%) |
File tests/themes/util/t3/c6b added (mode: 100644) (index 0000000..862719c) | |||
1 | @@if("@@a@@" != ""){{A}}{{B}} | ||
2 | @@if("@@a@@" = ""){{X}}{{Y}} |
File tests/themes/util/t3/c9 copied from file tests/themes/util/t3/c4 (similarity 100%) |