DevHeads.net

Postings by Adam Culp

com web/php: updated conference image - php day curitiba 2018: images/news/php-day-curitiba-2018.jpg

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=06c4ac7c093ba83fdfb88ade35367cc4ec36ac9b" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=06c4ac7c093ba83fdfb88ade35367cc4ec36ac9b">http://git.php.net/?p=web/php.git;a=commitdiff;h=06c4ac7c093ba83fdfb88ad...</a>

Log:
updated conference image - php day curitiba 2018

Changed paths:
M images/news/php-day-curitiba-2018.jpg

Diff:
diff --git a/images/news/php-day-curitiba-2018.jpg b/images/news/php-day-curitiba-2018.jpg
index 5b9ff2e..880602d 100644
Binary files a/images/news/php-day-curitiba-2018.jpg and b/images/news/php-day-curitiba-2018.jpg differ

com web/php: Merge branch 'pull-request/239': archive/archive.xml

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=0c8e1c8d675b1a625706487b8b37e4f281a7b0af" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=0c8e1c8d675b1a625706487b8b37e4f281a7b0af">http://git.php.net/?p=web/php.git;a=commitdiff;h=0c8e1c8d675b1a625706487...</a>

Log:
Merge branch 'pull-request/239'

Changed paths:
MM archive/archive.xml

Diff:
diff --cc archive/archive.xml
index e2c572a,96b66c3..e9fe242
--- a/archive/archive.xml
+++ b/archive/archive.xml
@@@ -9,9 -9,8 +9,10 @@@
<uri>http://php.net/contact</uri>
<email>php- ... at lists dot php.net</email>
</author>
+ <xi:include href="entries/2018-09-03-1.xml"/>
<xi:include href="entries/2018-08-30-1.xml"/>
+ <xi:include href="entries/2018-08-28-1.xml"/>
+ <xi:include href

com web/php: Resolved merge conflict by keeping old and new entries: archive/archive.xml

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=6233c22407627405b493c330a2959e44b13366b9" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=6233c22407627405b493c330a2959e44b13366b9">http://git.php.net/?p=web/php.git;a=commitdiff;h=6233c22407627405b493c33...</a>

Log:
Resolved merge conflict by keeping old and new entries

Changed paths:
MM archive/archive.xml

Diff:
diff --cc archive/archive.xml
index 14977d6,c031653..e2c572a
--- a/archive/archive.xml
+++ b/archive/archive.xml
@@@ -10,7 -10,7 +10,8 @@@
<email>php- ... at lists dot php.net</email>
</author>
<xi:include href="entries/2018-08-30-1.xml"/>
+ <xi:include href="entries/2018-08-28-1.xml"/>
+ <xi:include href="entries/2018-08-21-1.xml"/>
<xi:include href="entries/2018-

com web/php: Resolved merge conflict by keeping both entries: archive/archive.xml

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=2726e235af14c5e67d82ba456f571831580d7a6a" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=2726e235af14c5e67d82ba456f571831580d7a6a">http://git.php.net/?p=web/php.git;a=commitdiff;h=2726e235af14c5e67d82ba4...</a>

Log:
Resolved merge conflict by keeping both entries

Changed paths:
MM archive/archive.xml

Diff:
diff --cc archive/archive.xml
index d4b1726,8bb68e9..14977d6
--- a/archive/archive.xml
+++ b/archive/archive.xml
@@@ -9,7 -9,7 +9,8 @@@
<uri>http://php.net/contact</uri>
<email>php- ... at lists dot php.net</email>
</author>
+ <xi:include href="entries/2018-08-30-1.xml"/>
+ <xi:include href="entries/2018-08-21-1.xml"/>
<xi:include href="entries/2018-08-17-1.xml"/>
<

com web/php: Merge branch 'master' of github.com:php/web-php: archive/archive.xml

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=565c4e2842fe849c5d2ca22e42d7eba109fc60b7" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=565c4e2842fe849c5d2ca22e42d7eba109fc60b7">http://git.php.net/?p=web/php.git;a=commitdiff;h=565c4e2842fe849c5d2ca22...</a>

Log:
Merge branch 'master' of github.com:php/web-php

Changed paths:
MM archive/archive.xml

Diff:
diff --cc archive/archive.xml
index 4c97963,d4b1726..c031653
--- a/archive/archive.xml
+++ b/archive/archive.xml
@@@ -9,7 -9,7 +9,8 @@@
<uri>http://php.net/contact</uri>
<email>php- ... at lists dot php.net</email>
</author>
+ <xi:include href="entries/2018-08-30-1.xml"/>
+ <xi:include href="entries/2018-08-28-1.xml"/>
<xi:include href="entries/2018-08-17-1.xml"/>
<

com web/php: added conference - PHP Day Curitiba 2018: archive/archive.xml archive/entries/2018-09-03-1.xml images/news/php-day-curitiba-2018.jpg

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=61edfb340c38af94a925b56081ebe9147318d6aa" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=61edfb340c38af94a925b56081ebe9147318d6aa">http://git.php.net/?p=web/php.git;a=commitdiff;h=61edfb340c38af94a925b56...</a>

Log:
added conference - PHP Day Curitiba 2018

Changed paths:
M archive/archive.xml
A archive/entries/2018-09-03-1.xml
A images/news/php-day-curitiba-2018.jpg

Diff:
diff --git a/archive/archive.xml b/archive/archive.xml
index d4b1726..96b66c3 100644
--- a/archive/archive.xml
+++ b/archive/archive.xml
@@ -9,6 +9,7 @@
<uri>http://php.net/contact</uri>
<email>php- ... at lists dot php.net</email>
</author>
+ <xi:include href="entries/2018-09-03-1.xml"/>
<xi:include href

com web/php: Adding CFP announcement and dates for PHP UK Conference 2019: archive/archive.xml archive/entries/2018-08-28-1.xml images/news/phpuk.png

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=77d344ed6e70dce87b9a5c69a6670f75e24d921a" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=77d344ed6e70dce87b9a5c69a6670f75e24d921a">http://git.php.net/?p=web/php.git;a=commitdiff;h=77d344ed6e70dce87b9a5c6...</a>

Log:
Adding CFP announcement and dates for PHP UK Conference 2019

Changed paths:
M archive/archive.xml
A archive/entries/2018-08-28-1.xml
A images/news/phpuk.png

Diff:
diff --git a/archive/archive.xml b/archive/archive.xml
index 489063a..4c97963 100644
--- a/archive/archive.xml
+++ b/archive/archive.xml
@@ -9,6 +9,7 @@
<uri>http://php.net/contact</uri>
<email>php- ... at lists dot php.net</email>
</author>
+ <xi:include href="entries/2018-08-28-1.xml"/>
<xi:include

com web/php: added conference announcement for Cascadia PHP 2018: archive/archive.xml archive/entries/2018-08-21-1.xml images/news/cascadiaphp-2018.jpg

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=bb8b13f97d022a14f658e6d62cd312f5beeaddc9" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=bb8b13f97d022a14f658e6d62cd312f5beeaddc9">http://git.php.net/?p=web/php.git;a=commitdiff;h=bb8b13f97d022a14f658e6d...</a>

Log:
added conference announcement for Cascadia PHP 2018

Changed paths:
M archive/archive.xml
A archive/entries/2018-08-21-1.xml
A images/news/cascadiaphp-2018.jpg

Diff:
diff --git a/archive/archive.xml b/archive/archive.xml
index 489063a..8bb68e9 100644
--- a/archive/archive.xml
+++ b/archive/archive.xml
@@ -9,6 +9,7 @@
<uri>http://php.net/contact</uri>
<email>php- ... at lists dot php.net</email>
</author>
+ <xi:include href="entries/2018-08-21-1.xml"/>
<xi:includ

com web/php: Added SunshinePHP 2019 CFP announcement: archive/archive.xml archive/entries/2018-08-14-1.xml images/news/sunshinephp2019.png

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=16f0a525aa287ad0ede0d0322f76986dfd3621a5" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=16f0a525aa287ad0ede0d0322f76986dfd3621a5">http://git.php.net/?p=web/php.git;a=commitdiff;h=16f0a525aa287ad0ede0d03...</a>

Log:
Added SunshinePHP 2019 CFP announcement

Changed paths:
M archive/archive.xml
A archive/entries/2018-08-14-1.xml
A images/news/sunshinephp2019.png

Diff:
diff --git a/archive/archive.xml b/archive/archive.xml
index abeff95..207cad5 100644
--- a/archive/archive.xml
+++ b/archive/archive.xml
@@ -9,6 +9,7 @@
<uri>http://php.net/contact</uri>
<email>php- ... at lists dot php.net</email>
</author>
+ <xi:include href="entries/2018-08-14-1.xml"/>
<xi:include href="entri

com web/php: Announce Northeast PHP Schedule: archive/archive.xml

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=9b3aa2beb164d0b63fa4950d087091ab62ef9ec8" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=9b3aa2beb164d0b63fa4950d087091ab62ef9ec8">http://git.php.net/?p=web/php.git;a=commitdiff;h=9b3aa2beb164d0b63fa4950...</a>

Log:
Announce Northeast PHP Schedule

Changed paths:
M archive/archive.xml

Diff:
diff --git a/archive/archive.xml b/archive/archive.xml
index 614ed6b..abeff95 100644
--- a/archive/archive.xml
+++ b/archive/archive.xml
@@ -10,8 +10,6 @@
<email>php- ... at lists dot php.net</email>
</author>
<xi:include href="entries/2018-08-09-1.xml"/>
- <xi:include href="entries/2018-08-09-1.xml"/>
- <xi:include href="entries/2018-08-09-1.xml"/>
<xi:include href="entries/2018-08-02-1.xml"/>

com web/php: Announce Northeast PHP Schedule: archive/archive.xml

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=f1e2d05b6d6938559f1be500393b8d3329951b83" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=f1e2d05b6d6938559f1be500393b8d3329951b83">http://git.php.net/?p=web/php.git;a=commitdiff;h=f1e2d05b6d6938559f1be50...</a>

Log:
Announce Northeast PHP Schedule

Changed paths:
M archive/archive.xml

Diff:
diff --git a/archive/archive.xml b/archive/archive.xml
index 8c1e63c..614ed6b 100644
--- a/archive/archive.xml
+++ b/archive/archive.xml
@@ -9,6 +9,9 @@
<uri>http://php.net/contact</uri>
<email>php- ... at lists dot php.net</email>
</author>
+ <xi:include href="entries/2018-08-09-1.xml"/>
+ <xi:include href="entries/2018-08-09-1.xml"/>
+ <xi:include href="entries/2018-08-09-1.xml"/>
<xi:incl

com web/php: Announce Northeast PHP Schedule: archive/entries/2018-08-09-1.xml

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=c3388164a3fda405dfe8e3930cb7b0d0025987e1" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=c3388164a3fda405dfe8e3930cb7b0d0025987e1">http://git.php.net/?p=web/php.git;a=commitdiff;h=c3388164a3fda405dfe8e39...</a>

Log:
Announce Northeast PHP Schedule

Changed paths:
A archive/entries/2018-08-09-1.xml

Diff:
diff --git a/archive/entries/2018-08-09-1.xml b/archive/entries/2018-08-09-1.xml
new file mode 100644
index 0000000..8998717
--- /dev/null
+++ b/archive/entries/2018-08-09-1.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<entry xmlns="http://www.w3.org/2005/Atom" xmlns:default="http://php.net/ns/news">
+ <title>Northeast PHP Boston 2018</title>
+ <id>http://php.net/archive/2018.

com web/php: Added dates for the event.: archive/entries/2018-06-26-1.xml

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=6ed5e6037d52bb6d6ec754d78b717efedef63b9c" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=6ed5e6037d52bb6d6ec754d78b717efedef63b9c">http://git.php.net/?p=web/php.git;a=commitdiff;h=6ed5e6037d52bb6d6ec754d...</a>

Log:
Added dates for the event.

Changed paths:
M archive/entries/2018-06-26-1.xml

Diff:
diff --git a/archive/entries/2018-06-26-1.xml b/archive/entries/2018-06-26-1.xml
index 928d6f8..195c715 100644
--- a/archive/entries/2018-06-26-1.xml
+++ b/archive/entries/2018-06-26-1.xml
@@ -11,11 +11,11 @@
<link href="http://www.zendcon.com" rel="via" type="text/html"/>
<content type="xhtml">
<div xmlns="http://www.w3.org/1999/xhtml">
- <p><a href="http://www.zendcon.com">ZendCon &

com web/php: Merge branch 'master' of https://github.com/php/web-php: archive/archive.xml

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=24056934c0fdd007224c3ef35226436c0beae68f" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=24056934c0fdd007224c3ef35226436c0beae68f">http://git.php.net/?p=web/php.git;a=commitdiff;h=24056934c0fdd007224c3ef...</a>

Log:
Merge branch 'master' of <a href="https://github.com/php/web-php" title="https://github.com/php/web-php">https://github.com/php/web-php</a>

# Conflicts:
# archive/archive.xml

Changed paths:
M archive/archive.xml

Diff:
diff --git a/archive/archive.xml b/archive/archive.xml
index 6defdbf..767d183 100644
--- a/archive/archive.xml
+++ b/archive/archive.xml
@@ -9,10 +9,10 @@
<uri>http://php.net/contact</uri>
<email>php- ... at lists dot php.net</email>
</author>
+ <xi:include href="entries/2018-06-26-1.xml"/>
<xi:include href="entries/2018-06-25-4.xml"/

com web/php: Merge branch 'master' of https://github.com/php/web-php: archive/archive.xml

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=f5da09372457b841b6f2bffd0379c409ae9794fa" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=f5da09372457b841b6f2bffd0379c409ae9794fa">http://git.php.net/?p=web/php.git;a=commitdiff;h=f5da09372457b841b6f2bff...</a>

Log:
Merge branch 'master' of <a href="https://github.com/php/web-php" title="https://github.com/php/web-php">https://github.com/php/web-php</a>

# Conflicts:
# archive/archive.xml

Changed paths:
MM archive/archive.xml

Diff:
diff --cc archive/archive.xml
index 69b4587,70569bf..6defdbf
--- a/archive/archive.xml
+++ b/archive/archive.xml
@@@ -9,7 -9,9 +9,10 @@@
<uri>http://php.net/contact</uri>
<email>php- ... at lists dot php.net</email>
</author>
+ <xi:include href="entries/2018-06-25-4.xml"/>
+ <xi:include href="entries/2018-06-25-3.xml"/>
+ <xi:in

com web/php: Merge branch 'pull-request/227': archive/archive.xml

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=d35b021dca482e4532229361cfb2bd884861920c" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=d35b021dca482e4532229361cfb2bd884861920c">http://git.php.net/?p=web/php.git;a=commitdiff;h=d35b021dca482e453222936...</a>

Log:
Merge branch 'pull-request/227'

Changed paths:
MM archive/archive.xml

Diff:

com web/php: Added ZendCon & OpenEnterprise 2018 event.: archive/archive.xml archive/entries/2018-06-26-1.xml

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=974234438e9919dbec3be01c2efc9f099fecd16d" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=974234438e9919dbec3be01c2efc9f099fecd16d">http://git.php.net/?p=web/php.git;a=commitdiff;h=974234438e9919dbec3be01...</a>

Log:
Added ZendCon & OpenEnterprise 2018 event.

Changed paths:
M archive/archive.xml
A archive/entries/2018-06-26-1.xml

Diff:
diff --git a/archive/archive.xml b/archive/archive.xml
index 170499d..69b4587 100644
--- a/archive/archive.xml
+++ b/archive/archive.xml
@@ -9,6 +9,7 @@
<uri>http://php.net/contact</uri>
<email>php- ... at lists dot php.net</email>
</author>
+ <xi:include href="entries/2018-06-26-1.xml"/>
<xi:include href="entries/2018-06-25-1.xml"/>
<xi:incl

com web/php: Announcing some upcoming Symfony conferences: archive/archive.xml archive/entries/2018-06-25-2.xml archive/entries/2018-06-25-3.xml archive/entries/2018-06-25-4.xml images/news/symfony-con-lisbon-2018.jpg images/news/symfony-l

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=7f482f2722032e9c78d001fdea91ba79a3b93dc3" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=7f482f2722032e9c78d001fdea91ba79a3b93dc3">http://git.php.net/?p=web/php.git;a=commitdiff;h=7f482f2722032e9c78d001f...</a>

Log:
Announcing some upcoming Symfony conferences

Changed paths:
M archive/archive.xml
A archive/entries/2018-06-25-2.xml
A archive/entries/2018-06-25-3.xml
A archive/entries/2018-06-25-4.xml
A images/news/symfony-con-lisbon-2018.jpg
A images/news/symfony-live-berlin-2018.jpg
A images/news/symfony-live-usa-2018.jpg

Diff:
diff --git a/archive/archive.xml b/archive/archive.xml
index 7ee3650..88126bd 100644
--- a/archive/archive.xml
+++ b/archive/archive.xml
@@ -9,6 +9,9