Commit Graph

1633 Commits

Author SHA1 Message Date
Marc Alexander
6130bcab38 Merge pull request #150 from marc1706/fix/german
[fix/german] Fix incorrect language strings in the German files
2013-10-14 05:03:27 -07:00
Marc Alexander
7d42187fb1 [fix/german] Fix incorrect language strings in the German files
B3P-FIX-DE
2013-10-14 14:02:17 +02:00
Marc Alexander
18c27f17d8 Merge pull request #149 from marc1706/ticket/226
[ticket/226] Use $this->c_class instead of $c_class
2013-10-14 02:57:20 -07:00
Marc Alexander
533701b201 [ticket/226] Use $this->c_class instead of $c_class
B3P-226
2013-10-14 11:56:17 +02:00
Marc Alexander
7b0864411b Merge pull request #148 from marc1706/translate/changes
[translate/changes] Translate 2.0.2 changes to German
2013-10-06 07:09:02 -07:00
Marc Alexander
3ab6e550c4 [translate/changes] Translate 2.0.2 changes to German
B3P-TRNS-CHANGES
2013-10-06 16:07:11 +02:00
Marc Alexander
dc032effb8 Merge pull request #147 from marc1706/remove/format_birthday
[remove/format_birthday] Remove useless function format_birthday()
2013-10-06 06:55:06 -07:00
Marc Alexander
e594d23f79 [remove/format_birthday] Remove useless function format_birthday()
B3P-RM-FORMAT_BIRTHDAY
2013-10-06 15:53:53 +02:00
Marc Alexander
277784bd11 Merge pull request #146 from marc1706/fix/xml
[fix/xml] Use dependency again for mod version check links
2013-10-06 04:08:51 -07:00
Marc Alexander
65c5406ae8 [fix/xml] Use dependency again for mod version check links
B3P-FIX_XML
2013-10-06 13:07:57 +02:00
Marc Alexander
1c6e503d2e Merge pull request #145 from marc1706/update/2.0.2
[update/2.0.2] Update files for 2.0.2 release
2013-10-06 03:59:36 -07:00
Marc Alexander
9d0a483ab3 [update/2.0.2] Update files for 2.0.2 release
This includes an update of MODx to 1.2.6

B3P-UPDATE-2.0.2
2013-10-06 12:58:06 +02:00
Marc Alexander
4640b00d3d Merge pull request #144 from marc1706/gh/113
[gh/113] Update UMIL to 1.0.5
2013-10-06 02:47:03 -07:00
Marc Alexander
7a1cf0e9ee [gh/113] Update UMIL to 1.0.5
B3P-GH-113
2013-10-06 11:46:10 +02:00
Marc Alexander
c71695dfcb Merge pull request #143 from marc1706/feature/clean-up
[feature/clean-up] Remove duplicated code from portal modules
2013-10-06 02:44:43 -07:00
Marc Alexander
93376e16a5 [feature/clean-up] Remove duplicated code from portal modules
B3P-CU
2013-10-05 11:00:33 +02:00
Marc Alexander
7d2a124bbc Merge pull request #142 from marc1706/ticket/223
[ŧicket/223] Set correct permissions to uploaded files (644)
2013-10-04 07:33:46 -07:00
Marc Alexander
651514aa54 [ŧicket/223] Set correct permissions to uploaded files (644)
phpbb_chmod() only sets the owner permissions. As we need to set the
permissions for all users, it is not possible to use phpbb_chmod().

B3P-223
2013-10-04 16:32:10 +02:00
Marc Alexander
3be38fabc5 Merge pull request #141 from marc1706/ticket/224
[ticket/224] Add possibility to append username to donation
2013-09-21 05:26:08 -07:00
Marc Alexander
198e32ea9d [ticket/224] Add possibility to append username to donation
B3P-224
2013-09-21 14:25:11 +02:00
Marc Alexander
aac0e22962 Merge pull request #140 from marc1706/ticket/224
[ticket/224] Add possibility to append username to donation
2013-09-21 05:23:29 -07:00
Marc Alexander
cd4dd32e0d [ticket/224] Add possibility to append username to donation
B3P-224
2013-09-21 14:22:16 +02:00
Marc Alexander
71a7860925 Merge pull request #139 from marc1706/ticket/138
[ticket/138] Fix issues caused by switching to twig
2013-08-23 14:20:44 -07:00
Marc Alexander
30da5c6261 [ticket/138] Fix issues caused by switching to twig
B3P-138
2013-08-23 15:30:23 -05:00
Marc Alexander
16b148b713 Merge pull request #137 from marc1706/ticket/134
[ticket/134] Replace old _approved and _replies columns with replacements
2013-08-23 12:26:33 -07:00
Marc Alexander
a5102ee393 [ticket/134] Replace old _approved and _replies columns with replacements
Due to softdelete in 3.1, these columns were replaced by newer ones.

B3P-134
2013-08-23 14:23:49 -05:00
Marc Alexander
e8056e8e48 Merge pull request #136 from marc1706/ticket/135
[ticket/135] Fix broken installer
2013-07-18 13:26:42 -07:00
Marc Alexander
c764c45732 [ticket/135] Fix broken installer
Fixed #135

B3P-135
2013-07-18 22:25:03 +02:00
Marc Alexander
c260b90488 Merge remote-tracking branch 'marc1706/ticket/120' into develop-2.1.x
Conflicts:
	root/portal/modules/portal_birthday_list.php
2013-06-09 16:52:07 +02:00
Marc Alexander
22b51dfb66 Merge pull request #132 from marc1706/ticket/120
[ticket/120] Move birthday block HTML to template files
2013-06-09 07:42:06 -07:00
Marc Alexander
9d8089b287 [ticket/120] Move birthday block HTML to template files
B3P-120
2013-06-09 16:40:56 +02:00
Marc Alexander
5d2b3b4a54 Merge pull request #131 from marc1706/feature/acp
[feature/acp] Convert ACP module to new extension system
2013-03-22 05:49:13 -07:00
Marc Alexander
fe1888e6c0 [feature/acp] Convert ACP module to new extension system
B3P-131
2013-03-22 13:45:56 +01:00
Marc Alexander
156fded994 Merge pull request #130 from marc1706/fixup/theme
[fixup/theme] Fix theme paths and topic icons
2013-03-09 05:17:29 -08:00
Marc Alexander
78ea9ef8d3 Merge pull request #129 from marc1706/fixup/valid_css
[fixup/valid_css] Fix invalid CSS and/or HTML
2013-03-09 05:17:17 -08:00
Marc Alexander
05e320be77 [fixup/theme] Fix theme paths and topic icons
B3P-118
2013-03-09 14:15:24 +01:00
Marc Alexander
1bbe74e8c6 [fixup/valid_css] Fix invalid CSS and/or HTML
B3P-118
2013-03-09 13:57:21 +01:00
Marc Alexander
faf559acd1 Merge pull request #128 from marc1706/feature/migrations
[feature/migrations] Add migrations file for phpBB 3.1
2013-03-08 14:33:09 -08:00
Marc Alexander
f931c822e8 [feature/migrations] Remove old umil installer and umil package
B3P-101
2013-03-08 23:27:07 +01:00
Marc Alexander
7be6d9318e [feature/migrations] Add migrations file for Board3 Portal
B3P-101
2013-03-08 23:26:43 +01:00
Marc Alexander
7e25bf46aa [feature/migrations] Fix minor issues in migrations data script
Fixed incorrect IDs, line endings, and add tabbing.

B3P-101
2013-03-08 23:22:56 +01:00
Marc Alexander
bd2ea48ecb [feature/migrations] Fix incorrect use of php_ext
B3P-101
2013-03-08 23:17:43 +01:00
Marc Alexander
1431b95c1d [feature/migrations] Fix issues in data script and unserialize data
B3P-101
2013-03-04 21:59:55 +01:00
Marc Alexander
5d6f457b93 [feature/migrations] Add script for creating the needed database queries
This script will parse the needed config entries and module entries that
are needed for a basic Board3 Portal.

B3P-101
2013-03-04 21:33:58 +01:00
Marc Alexander
16de474503 Merge pull request #127 from marc1706/update/copyright
[update/copyright] Update copyright to 2013
2013-03-03 09:17:42 -08:00
Marc Alexander
78e1a9b064 [update/copyright] Update copyright to 2013
B3P-217
2013-03-03 18:16:31 +01:00
Marc Alexander
a2ef3b8172 Merge pull request #126 from marc1706/fixup/stylechanger
[fixup/stylechanger] Use link to controller file
2013-03-03 09:16:03 -08:00
Marc Alexander
895546f502 [fixup/stylechanger] Use link to controller file
It's not perfect but makes sure the links work right now.

B3P-126
2013-03-03 18:14:38 +01:00
Marc Alexander
b72fef9af3 Merge pull request #125 from marc1706/ticket/124
[ticket/124] Make portal HTML 5 valid
2013-03-03 09:12:56 -08:00
Marc Alexander
ed642b9321 [ticket/124] Make portal HTML 5 valid
B3P-124
2013-03-03 18:11:30 +01:00