CW Cyrix's Git Repository Mirror
Browse code

conflict file names fix

Jimako authored on 2023/09/07 15:38:37
Showing 1 changed files
docs/pagelinks.sql
History View file @ c61a7bd
... ... 
@@ -8,11 +8,11 @@ INSERT INTO `test3fanfiction_pagelinks` (`link_id`, `link_name`, `link_text`, `l
8 8 
 (8, 'members', 'Members', 'authors.php?action=list', '0', 0),
9 9 
 (9, 'authors', 'Authors', 'authors.php?list=authors', '0', 0),
10 10 
 (10, 'help', 'Help', 'viewpage.php?page=help', '0', 0),
11 
-(11, 'search', 'Search', 'search.php', '0', 0),
11 
+(11, 'search', 'Search', 'searching.php', '0', 0),
12 12 
 (12, 'series', 'Series', 'browse.php?type=series', '0', 0),
13 13 
 (13, 'tens', 'Top Tens', 'toplists.php', '0', 0),
14 14 
 (14, 'challenges', 'Challenges', 'browse.php?type=challenges', '0', 0),
15 
-(15, 'contactus', 'Contact Us', 'contact.php', '0', 0),
15 
+(15, 'contactus', 'Contact Us', 'report.php', '0', 0),
16 16 
 (16, 'rules', 'Rules', 'viewpage.php?page=rules', '0', 0),
17 17 
 (17, 'tos', 'Terms of Service', 'viewpage.php?page=tos', '0', 0),
18 18 
 (18, 'rss', '<img src=''images/xml.gif'' alt=''RSS'' border=''0''>', 'rss.php', '0', 0),
... ... 
@@ -20,7 +20,7 @@ INSERT INTO `test3fanfiction_pagelinks` (`link_id`, `link_name`, `link_text`, `l
20 20 
 (20, 'titles', 'Titles', 'browse.php?type=titles', '0', 0),
21 21 
 (21, 'register', 'Register', 'author.php?action=register', '0', 0),
22 22 
 (22, 'lostpassword', 'Lost Password', 'author.php?action=lostpassword', '0', 0),
23 
-(23, 'newsarchive', 'News Archive', 'news.php', '0', 0),
23 
+(23, 'newsarchive', 'News Archive', 'ffnews.php', '0', 0),
24 24 
 (24, 'browse', 'Browse', 'browse.php', '0', 0),
25 25 
 (25, 'charslink', 'Characters', 'browse.php?type=characters', '0', 0),
26 26 
 (26, 'ratings', 'Ratings', 'browse.php?type=ratings', '0', 0);
Browse code

update

Jimako authored on 2023/09/07 15:28:52
Showing 1 changed files
docs/pagelinks.sql
History View file @ d812a74
... ... 
@@ -1,14 +1,14 @@
1 
-INSERT INTO `e107_fanfiction_pagelinks` (`link_id`, `link_name`, `link_text`, `link_url`, `link_target`, `link_access`) VALUES (1, 'home', 'Home', 'index.php', '0', 0),
1 
+INSERT INTO `test3fanfiction_pagelinks` (`link_id`, `link_name`, `link_text`, `link_url`, `link_target`, `link_access`) VALUES (1, 'home', 'Home', 'index.php', '0', 0),
2 2 
 (2, 'recent', 'Most Recent', 'browse.php?type=recent', '0', 0),
3 
-(3, 'login', 'Login', 'member.php?action=login', '0', 0),
3 
+(3, 'login', 'Login', 'author.php?action=login', '0', 0),
4 4 
 (4, 'adminarea', 'Admin', 'admin.php', '0', 2),
5 
-(5, 'logout', 'Logout', 'member.php?action=logout', '0', 1),
5 
+(5, 'logout', 'Logout', 'author.php?action=logout', '0', 1),
6 6 
 (6, 'featured', 'Featured Stories', 'browse.php?type=featured', '0', 0),
7 7 
 (7, 'catslink', 'Categories', 'browse.php?type=categories', '0', 0),
8 8 
 (8, 'members', 'Members', 'authors.php?action=list', '0', 0),
9 9 
 (9, 'authors', 'Authors', 'authors.php?list=authors', '0', 0),
10 10 
 (10, 'help', 'Help', 'viewpage.php?page=help', '0', 0),
11 
-(11, 'search', 'Search', 'searching.php', '0', 0),
11 
+(11, 'search', 'Search', 'search.php', '0', 0),
12 12 
 (12, 'series', 'Series', 'browse.php?type=series', '0', 0),
13 13 
 (13, 'tens', 'Top Tens', 'toplists.php', '0', 0),
14 14 
 (14, 'challenges', 'Challenges', 'browse.php?type=challenges', '0', 0),
... ... 
@@ -16,11 +16,11 @@ INSERT INTO `e107_fanfiction_pagelinks` (`link_id`, `link_name`, `link_text`, `l
16 16 
 (16, 'rules', 'Rules', 'viewpage.php?page=rules', '0', 0),
17 17 
 (17, 'tos', 'Terms of Service', 'viewpage.php?page=tos', '0', 0),
18 18 
 (18, 'rss', '<img src=''images/xml.gif'' alt=''RSS'' border=''0''>', 'rss.php', '0', 0),
19 
-(19, 'login', 'Account Info', 'member.php', '0', 1),
19 
+(19, 'login', 'Account Info', 'author.php', '0', 1),
20 20 
 (20, 'titles', 'Titles', 'browse.php?type=titles', '0', 0),
21 
-(21, 'register', 'Register', 'member.php?action=register', '0', 0),
22 
-(22, 'lostpassword', 'Lost Password', 'member.php?action=lostpassword', '0', 0),
23 
-(23, 'newsarchive', 'News Archive', 'ffnews.php', '0', 0),
21 
+(21, 'register', 'Register', 'author.php?action=register', '0', 0),
22 
+(22, 'lostpassword', 'Lost Password', 'author.php?action=lostpassword', '0', 0),
23 
+(23, 'newsarchive', 'News Archive', 'news.php', '0', 0),
24 24 
 (24, 'browse', 'Browse', 'browse.php', '0', 0),
25 25 
 (25, 'charslink', 'Characters', 'browse.php?type=characters', '0', 0),
26 26 
 (26, 'ratings', 'Ratings', 'browse.php?type=ratings', '0', 0);
Browse code

Moved docs to gitbook, added news back

Jimmi08 authored on 2021/08/26 05:24:22
Showing 1 changed files
docs/pagelinks.sql
History View file @ 44f490d
... ... 
@@ -1,8 +1,8 @@
1 1 
 INSERT INTO `e107_fanfiction_pagelinks` (`link_id`, `link_name`, `link_text`, `link_url`, `link_target`, `link_access`) VALUES (1, 'home', 'Home', 'index.php', '0', 0),
2 2 
 (2, 'recent', 'Most Recent', 'browse.php?type=recent', '0', 0),
3 
-(3, 'login', 'Login', 'user.php?action=login', '0', 0),
3 
+(3, 'login', 'Login', 'member.php?action=login', '0', 0),
4 4 
 (4, 'adminarea', 'Admin', 'admin.php', '0', 2),
5 
-(5, 'logout', 'Logout', 'user.php?action=logout', '0', 1),
5 
+(5, 'logout', 'Logout', 'member.php?action=logout', '0', 1),
6 6 
 (6, 'featured', 'Featured Stories', 'browse.php?type=featured', '0', 0),
7 7 
 (7, 'catslink', 'Categories', 'browse.php?type=categories', '0', 0),
8 8 
 (8, 'members', 'Members', 'authors.php?action=list', '0', 0),
... ... 
@@ -16,11 +16,11 @@ INSERT INTO `e107_fanfiction_pagelinks` (`link_id`, `link_name`, `link_text`, `l
16 16 
 (16, 'rules', 'Rules', 'viewpage.php?page=rules', '0', 0),
17 17 
 (17, 'tos', 'Terms of Service', 'viewpage.php?page=tos', '0', 0),
18 18 
 (18, 'rss', '<img src=''images/xml.gif'' alt=''RSS'' border=''0''>', 'rss.php', '0', 0),
19 
-(19, 'login', 'Account Info', 'user.php', '0', 1),
19 
+(19, 'login', 'Account Info', 'member.php', '0', 1),
20 20 
 (20, 'titles', 'Titles', 'browse.php?type=titles', '0', 0),
21 
-(21, 'register', 'Register', 'user.php?action=register', '0', 0),
22 
-(22, 'lostpassword', 'Lost Password', 'user.php?action=lostpassword', '0', 0),
23 
-(23, 'newsarchive', 'News Archive', 'news.php', '0', 0),
21 
+(21, 'register', 'Register', 'member.php?action=register', '0', 0),
22 
+(22, 'lostpassword', 'Lost Password', 'member.php?action=lostpassword', '0', 0),
23 
+(23, 'newsarchive', 'News Archive', 'ffnews.php', '0', 0),
24 24 
 (24, 'browse', 'Browse', 'browse.php', '0', 0),
25 25 
 (25, 'charslink', 'Characters', 'browse.php?type=characters', '0', 0),
26 26 
 (26, 'ratings', 'Ratings', 'browse.php?type=ratings', '0', 0);
Browse code

rename search.php to avoid conflict

Jimmi08 authored on 2021/04/05 11:59:16
Showing 1 changed files
docs/pagelinks.sql
History View file @ 5d70588
... ... 
@@ -1,4 +1,4 @@
1 
-INSERT INTO `test3fanfiction_pagelinks` (`link_id`, `link_name`, `link_text`, `link_url`, `link_target`, `link_access`) VALUES (1, 'home', 'Home', 'index.php', '0', 0),
1 
+INSERT INTO `e107_fanfiction_pagelinks` (`link_id`, `link_name`, `link_text`, `link_url`, `link_target`, `link_access`) VALUES (1, 'home', 'Home', 'index.php', '0', 0),
2 2 
 (2, 'recent', 'Most Recent', 'browse.php?type=recent', '0', 0),
3 3 
 (3, 'login', 'Login', 'user.php?action=login', '0', 0),
4 4 
 (4, 'adminarea', 'Admin', 'admin.php', '0', 2),
... ... 
@@ -8,7 +8,7 @@ INSERT INTO `test3fanfiction_pagelinks` (`link_id`, `link_name`, `link_text`, `l
8 8 
 (8, 'members', 'Members', 'authors.php?action=list', '0', 0),
9 9 
 (9, 'authors', 'Authors', 'authors.php?list=authors', '0', 0),
10 10 
 (10, 'help', 'Help', 'viewpage.php?page=help', '0', 0),
11 
-(11, 'search', 'Search', 'search.php', '0', 0),
11 
+(11, 'search', 'Search', 'searching.php', '0', 0),
12 12 
 (12, 'series', 'Series', 'browse.php?type=series', '0', 0),
13 13 
 (13, 'tens', 'Top Tens', 'toplists.php', '0', 0),
14 14 
 (14, 'challenges', 'Challenges', 'browse.php?type=challenges', '0', 0),
Browse code

backup 3.52

Jimmi08 authored on 2021/04/02 11:08:04
Showing 1 changed files
docs/pagelinks.sql
History View file @ 0d8bb76
1 1 
new file mode 100644
... ... 
@@ -0,0 +1,26 @@
1 
+INSERT INTO `test3fanfiction_pagelinks` (`link_id`, `link_name`, `link_text`, `link_url`, `link_target`, `link_access`) VALUES (1, 'home', 'Home', 'index.php', '0', 0),
2 
+(2, 'recent', 'Most Recent', 'browse.php?type=recent', '0', 0),
3 
+(3, 'login', 'Login', 'user.php?action=login', '0', 0),
4 
+(4, 'adminarea', 'Admin', 'admin.php', '0', 2),
5 
+(5, 'logout', 'Logout', 'user.php?action=logout', '0', 1),
6 
+(6, 'featured', 'Featured Stories', 'browse.php?type=featured', '0', 0),
7 
+(7, 'catslink', 'Categories', 'browse.php?type=categories', '0', 0),
8 
+(8, 'members', 'Members', 'authors.php?action=list', '0', 0),
9 
+(9, 'authors', 'Authors', 'authors.php?list=authors', '0', 0),
10 
+(10, 'help', 'Help', 'viewpage.php?page=help', '0', 0),
11 
+(11, 'search', 'Search', 'search.php', '0', 0),
12 
+(12, 'series', 'Series', 'browse.php?type=series', '0', 0),
13 
+(13, 'tens', 'Top Tens', 'toplists.php', '0', 0),
14 
+(14, 'challenges', 'Challenges', 'browse.php?type=challenges', '0', 0),
15 
+(15, 'contactus', 'Contact Us', 'contact.php', '0', 0),
16 
+(16, 'rules', 'Rules', 'viewpage.php?page=rules', '0', 0),
17 
+(17, 'tos', 'Terms of Service', 'viewpage.php?page=tos', '0', 0),
18 
+(18, 'rss', '<img src=''images/xml.gif'' alt=''RSS'' border=''0''>', 'rss.php', '0', 0),
19 
+(19, 'login', 'Account Info', 'user.php', '0', 1),
20 
+(20, 'titles', 'Titles', 'browse.php?type=titles', '0', 0),
21 
+(21, 'register', 'Register', 'user.php?action=register', '0', 0),
22 
+(22, 'lostpassword', 'Lost Password', 'user.php?action=lostpassword', '0', 0),
23 
+(23, 'newsarchive', 'News Archive', 'news.php', '0', 0),
24 
+(24, 'browse', 'Browse', 'browse.php', '0', 0),
25 
+(25, 'charslink', 'Characters', 'browse.php?type=characters', '0', 0),
26 
+(26, 'ratings', 'Ratings', 'browse.php?type=ratings', '0', 0);