Commit Graph

853 Commits

Author SHA1 Message Date
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
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
Marc Alexander
06918bc81d Merge pull request #123 from marc1706/ticket/122
[ticket/122] Correctly display days in calendar
2013-03-03 09:07:49 -08:00
Marc Alexander
b69511de36 [ticket/122] Correctly display days in calendar
Due to changes in handling the time the HTML is incorrectly created and
thus causes a <tr> for every day. This results in every day being on a new
line. Additionally, the calendar module is now HTML5 valid.

B3P-122
2013-03-03 18:05:20 +01:00
Marc Alexander
c3f7197eea Merge pull request #121 from marc1706/feature/jquery_clock
[feature/jquery_clock] Add jQuery-based clock to prosilver clock_side
2013-03-03 08:55:25 -08:00
Marc Alexander
a74347eefc [feature/jquery_clock] Make jquery clock html5 valid
B3P-218
2013-03-03 17:54:16 +01:00
Marc Alexander
6b17f71941 [feature/jquery_clock] Remove not needed settings from portal_clock module
B3P-218
2013-03-02 23:33:08 +01:00
Marc Alexander
09faef4d74 [feature/jquery_clock] Add jQuery clock to subsilver2
The clock module is now also displaying the jQuery clock in subsilver2.

B3P-218
2013-03-02 23:29:21 +01:00
Marc Alexander
53186f7060 [feature/jquery_clock] Add jQuery-based clock to prosilver clock_side
The clock we currently use needs flash support. As newer browsers and
mobile devices are moving on from flash to HTML5 we should do the same and
replace our flash clock with a jQuery based clock.
It is using image sprites which means we only have to load 2 images. One
for the single digits and one for the double digit hours.
This is currently only added to prosilver and the obsolete settings in the
clock module still need to be removed.

B3P-218
2013-03-02 14:15:48 +01:00
Marc Alexander
ce300a78a6 Merge pull request #119 from marc1706/fixup/theme
[fixup/theme] Fix theme paths and other related paths in module files
2013-02-27 09:25:59 -08:00
Marc Alexander
76bd3af823 [fixup/theme] Fix theme paths and other related paths in module files
Due to the new extension system some paths to files are no longer correct
and need to be fixed. Additionally, an event listener that allows the
loading of portal.css has been added.

B3P-118
2013-02-27 18:18:14 +01:00
Marc Alexander
2d0e98b83c Merge pull request #117 from marc1706/calendar/one_day_off
Display correct day of the week with negative UTC offset
2013-02-27 08:28:32 -08:00
Marc Alexander
e33f13f8fb Display correct day of the week with negative UTC offset
A duplicate subtraction of the UTC offset and DST time caused the creation
of an incorrect timestamp. In return this caused us to go back too far and
therefore moved us back one day.

Conflicts:
	root/portal/modules/portal_calendar.php
2013-02-27 17:27:03 +01:00
Marc Alexander
e40a5e97a6 Merge pull request #115 from marc1706/feature/controller
[feature/controller] Make portal work with new controller interface
2013-02-25 02:49:17 -08:00
Marc Alexander
cf79e948c3 Merge branch 'develop-2.1.x' of github.com:board3/Board3-Portal into feature/controller
Conflicts:
	root/portal/modules/portal_user_menu.php
2013-02-25 11:47:49 +01:00
Marc Alexander
b755201897 [feature/controller] Fix missing issues that prevented portal from working
The portal still requires the fix to PHPBB3-11323 in order to work.

B3P-114
2013-02-25 11:41:57 +01:00
Marc Alexander
edf7541001 [feature/controller] Fix displayal of readme
B3P-114
2013-01-09 18:29:25 +01:00
Marc Alexander
742ac5bdea [feature/controller] Include portal files and fix incorrect variables
B3P-114
2013-01-09 18:28:05 +01:00
Marc Alexander
632c7ab24f [feature/controller] Add routing and services files
B3P-114
2013-01-09 18:22:44 +01:00
Marc Alexander
93b3291de9 [feature/controller] Fix incorrect coding and docblocks in main controller
B3P-114
2013-01-09 18:21:13 +01:00
Marc Alexander
3a6640450c [feature/controller] Update readme for correct database changes
B3P-114
2013-01-09 18:19:55 +01:00
Marc Alexander
48bce54c48 [feature/controller] Move main controller to controller directory
A few minor improvements to variables etc. were also added.

B3P-114
2013-01-09 17:44:51 +01:00
Marc Alexander
d419c19324 [feature/controller] Update readme for Board3 Portal 2.1.x
As migrations do not work yet, include instructions for manually
installing it.

B3P-114
2013-01-09 17:43:15 +01:00
Marc Alexander
1b85010f43 Merge remote-tracking branch 'origin' into develop-2.1.x
Conflicts:
	root/portal/includes/functions_upload.php
2013-01-09 17:02:41 +01:00
Marc Alexander
58aa86123a Merge pull request #110 from marc1706/cleanup/whitespace
[cleanup/whitespace] Get rid of unnecessary whitespace
2013-01-08 13:51:05 -08:00
Marc Alexander
407f8df8a4 [cleanup/whitespace] Get rid of unnecessary whitespace 2013-01-08 22:33:23 +01:00
Marc Alexander
61685ce96a Merge pull request #109 from marc1706/cleanup/tabs
[cleanup/tabs] Remove unnecessary tabbing in portal files
2013-01-04 08:00:52 -08:00
Marc Alexander
0b4eafdd9e Merge branch 'master' of github.com:board3/Board3-Portal into cleanup/tabs
Conflicts:
	root/includes/acp/acp_portal.php
	root/language/de/mods/info_acp_portal.php
	root/language/en/mods/info_acp_portal.php
2013-01-04 16:59:37 +01:00
Marc Alexander
f948811044 [cleanup/tabs] Remove unnecessary tabbing in portal files 2013-01-04 16:51:43 +01:00
Marc Alexander
95a7130591 Merge pull request #108 from board3/master
Update develop-2.1.x
2012-12-24 05:27:06 -08:00