mirrors/graphonline
1
0
Fork 0
mirror of https://github.com/UnickSoft/graphonline.git synced 2026-02-16 10:40:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflict

Browse Source
This commit is contained in:
/usr/bin/nano
2020-07-03 23:24:10 +03:00
parent aa86662d9f
commit 61f79385ea
281 changed files with 712 additions and 1940 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wiki/local/config.php
View File

@@ -36,8 +36,10 @@ $Skin = 'graph';
## the "attr" passwords for the PmWiki and Main groups are locked, so
## an admin password is a good way to unlock those. See PmWiki.Passwords
## and PmWiki.PasswordsAdmin.
$DefaultPasswords['admin'] = pmcrypt('pas');
$DefaultPasswords['edit'] = pmcrypt('pas');
$DefaultPasswords['admin'] = pmcrypt('123erROR');
$DefaultPasswords['edit'] = pmcrypt('123erROR');
#$DefaultPasswords['admin'] = pmcrypt('pas');
#$DefaultPasswords['edit'] = pmcrypt('pas');
## Unicode (UTF-8) allows the display of all languages and all alphabets.
## Highly recommended for new wikis.

305
wiki/wiki.d/.pageindex
View File

File diff suppressed because one or more lines are too long

10
wiki/wiki.d/Site.AllRecentChanges
View File

File diff suppressed because one or more lines are too long

10
wiki/wiki.d/SiteAdmin.Blocklist-MoinMaster
View File

File diff suppressed because one or more lines are too long

10
wiki/wiki.d/Справка.RecentChanges
View File

@@ -1,9 +1,9 @@
version=pmwiki-2.2.75 ordered=1 urlencoded=1
agent=Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.142 Safari/537.36 OPR/62.0.3331.119
agent=Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36 OPR/68.0.3618.125
charset=UTF-8
ctime=1430541344
host=83.219.136.203
host=83.219.147.237
name=Справка.RecentChanges
rev=173
text=* [[Справка/Справка]] . . . October 05, 2019, at 10:06 PM by ?: [==]%0a* [[Справка/ПоискРадиусаИДиаметраГрафа]] . . . April 04, 2018, at 04:53 PM by ?: [==]%0a* [[Справка/ГорячиеКлавиши]] . . . March 22, 2018, at 10:32 PM by ?: [==]%0a* [[Справка/РасчетСтепениВершин]] . . . January 24, 2018, at 07:45 PM by ?: [==]%0a* [[Справка/ВизуализацияНаОсновеВесов]] . . . January 24, 2018, at 07:42 PM by ?: [==]%0a* [[Справка/УпорядочитьГраф]] . . . January 24, 2018, at 07:40 PM by ?: [==]%0a* [[Справка/АлгоритмФлойда—Уоршелла]] . . . January 24, 2018, at 07:37 PM by ?: [==]%0a* [[Справка/ПоискКратчайшегоПути]] . . . January 10, 2018, at 11:17 PM by ?: [==]%0a* [[Справка/ПоискМинимальногоОставногоДерева]] . . . January 10, 2018, at 11:12 PM by ?: [==]%0a* [[Справка/ПоискЭйлеровогоЦикла]] . . . January 08, 2018, at 10:00 PM by ?: [==]%0a* [[Справка/ДобавлениеВершины]] . . . June 29, 2017, at 12:43 AM by ?: [==]%0a* [[Справка/СохранениеГрафа]] . . . June 24, 2017, at 12:16 PM by ?: [==]%0a* [[Справка/ПеремещениеВершин]] . . . June 24, 2017, at 12:12 PM by ?: [==]%0a* [[Справка/ДобавлениеДуги]] . . . June 24, 2017, at 12:07 PM by ?: [==]%0a* [[Справка/МатрицаСмежности]] . . . March 01, 2017, at 11:45 PM by ?: [==]%0a* [[Справка/ПоискКомпонентовСвязанности]] . . . August 23, 2016, at 09:45 AM by ?: [==]%0a* [[Справка/ПоискКомпонентовСвязности]] . . . August 18, 2016, at 08:50 PM by ?: [==]%0a* [[Справка/МатрицаИнцидентности]] . . . August 06, 2016, at 10:38 PM by ?: [==]%0a* [[Справка/Главная]] . . . April 17, 2016, at 01:15 PM by ?: [==]%0a* [[Справка/ПеремещениеВершинИДуг]] . . . April 17, 2016, at 01:14 PM by ?: [==]%0a
time=1570302361
rev=174
text=* [[Справка/ПоискГамильтоноваЦиклаИПути]] . . . June 14, 2020, at 02:33 PM by ?: [==]%0a* [[Справка/Справка]] . . . October 05, 2019, at 10:06 PM by ?: [==]%0a* [[Справка/ПоискРадиусаИДиаметраГрафа]] . . . April 04, 2018, at 04:53 PM by ?: [==]%0a* [[Справка/ГорячиеКлавиши]] . . . March 22, 2018, at 10:32 PM by ?: [==]%0a* [[Справка/РасчетСтепениВершин]] . . . January 24, 2018, at 07:45 PM by ?: [==]%0a* [[Справка/ВизуализацияНаОсновеВесов]] . . . January 24, 2018, at 07:42 PM by ?: [==]%0a* [[Справка/УпорядочитьГраф]] . . . January 24, 2018, at 07:40 PM by ?: [==]%0a* [[Справка/АлгоритмФлойда—Уоршелла]] . . . January 24, 2018, at 07:37 PM by ?: [==]%0a* [[Справка/ПоискКратчайшегоПути]] . . . January 10, 2018, at 11:17 PM by ?: [==]%0a* [[Справка/ПоискМинимальногоОставногоДерева]] . . . January 10, 2018, at 11:12 PM by ?: [==]%0a* [[Справка/ПоискЭйлеровогоЦикла]] . . . January 08, 2018, at 10:00 PM by ?: [==]%0a* [[Справка/ДобавлениеВершины]] . . . June 29, 2017, at 12:43 AM by ?: [==]%0a* [[Справка/СохранениеГрафа]] . . . June 24, 2017, at 12:16 PM by ?: [==]%0a* [[Справка/ПеремещениеВершин]] . . . June 24, 2017, at 12:12 PM by ?: [==]%0a* [[Справка/ДобавлениеДуги]] . . . June 24, 2017, at 12:07 PM by ?: [==]%0a* [[Справка/МатрицаСмежности]] . . . March 01, 2017, at 11:45 PM by ?: [==]%0a* [[Справка/ПоискКомпонентовСвязанности]] . . . August 23, 2016, at 09:45 AM by ?: [==]%0a* [[Справка/ПоискКомпонентовСвязности]] . . . August 18, 2016, at 08:50 PM by ?: [==]%0a* [[Справка/МатрицаИнцидентности]] . . . August 06, 2016, at 10:38 PM by ?: [==]%0a* [[Справка/Главная]] . . . April 17, 2016, at 01:15 PM by ?: [==]%0a* [[Справка/ПеремещениеВершинИДуг]] . . . April 17, 2016, at 01:14 PM by ?: [==]%0a
time=1592134427