Commit Graph
100 Commits
Author SHA1 Message Date
Marc Alexander 520f0b4ab4 Merge branch 'master' into develop-2.1.x
Conflicts:
	root/language/de/mods/info_acp_portal.php
	root/language/en/mods/info_acp_portal.php
2012-10-26 12:56:19 +02:00
Marc Alexander 075a12dbca Merge pull request #99 from marc1706/master
Add missing language variable "NO_FILE_B3P"
2012-10-13 13:02:37 -07:00
Marc Alexander 0c90a1c613 Add missing error messages to links & main menu modules 2012-10-13 22:01:50 +02:00
Marc Alexander 326d9013b2 Add missing language variable "NO_FILE_B3P" 2012-10-13 21:50:30 +02:00
Marc Alexander fee70fd3d0 Merge pull request #97 from marc1706/master
Add small changes for B3P 2.0.1 release
2012-09-22 07:34:43 -07:00
Marc Alexander a8ed6a31e8 Add missing language variable "NO_FILE_B3P" 2012-09-22 16:32:29 +02:00
Marc Alexander 370f96aa99 Update install & update instructions for 2.0.1 2012-09-08 16:30:44 +02:00
Marc Alexander 715960ee94 Merge pull request #96 from marc1706/master
Remove update for beta version
2012-08-26 07:47:18 -07:00
Marc Alexander 1f55dd564c Remove update for beta version 2012-08-26 16:36:29 +02:00
Marc Alexander 2678e879e3 Merge pull request #95 from marc1706/master
Remove update instructions for old releases
2012-08-26 07:35:33 -07:00
Marc Alexander 1aeed1e4ec Remove update instructions for old releases
Fixed #86
2012-08-26 16:30:06 +02:00
Marc Alexander 46fd811fa1 Merge pull request #94 from marc1706/master
Add missing error messages to links & main menu modules
2012-08-25 08:03:42 -07:00
Marc Alexander 74b5f6f87c Add missing error messages to links & main menu modules 2012-08-25 17:01:13 +02:00
Marc Alexander 12b792bb38 Merge pull request #93 from marc1706/master
Save module settings even if module image can't be found
2012-08-11 09:18:16 -07:00
Marc Alexander c4026c9066 Save module settings even if module image can't be found 2012-08-11 17:28:41 +02:00
Marc Alexander eb5f1f8156 Add .gitignore 2012-08-10 13:17:56 +02:00
Marc Alexander 8234c97a82 Merge pull request #92 from marc1706/master
Remove unnecessary variables from format_birthday() & clean-up
2012-08-09 06:08:04 -07:00
Marc Alexander 2b100c2792 Remove unnecessary variables from format_birthday() & clean-up 2012-08-09 15:02:39 +02:00
Marc Alexander 3645336aeb Merge pull request #91 from marc1706/master
Display events that start in the next 24 Hours as "Current"
2012-08-04 08:14:22 -07:00
Marc Alexander 1ea5e2bfd7 Display events that start in the next 24 Hours as "Current"
Cleaned some more code up, too. Using constants instead of magic
numbers in some places where it makes sense to use them.
2012-08-04 17:12:25 +02:00
Marc Alexander 7ddb84c514 Merge pull request #90 from marc1706/master
Fix: Infinite loop caused by smiley code with "["
2012-08-04 04:26:36 -07:00
Marc Alexander ec54bb99c4 Fix: Infinite loop caused by smiley code with "["
This reworks the previous commit and fix the incorrect readings.
I would've rebased but my windows git is missing some commands for
not so obvious reasons.
2012-08-04 13:23:05 +02:00
Marc Alexander 1c4a73efa7 Merge pull request #89 from marc1706/master
Only variables can be passed by ref in strict mode
2012-07-30 13:08:09 -07:00
Marc Alexander 8327c46551 Only variables can be passed by ref in strict mode
Fix for PHP 5.5.x
2012-07-30 22:04:58 +02:00
Marc Alexander b8f9b6a83f Merge pull request #88 from marc1706/master
Fix: Infinite loop caused by smiley code with "["
2012-07-30 13:01:17 -07:00
Marc Alexander cea6d2b155 Fix: Infinite loop caused by smiley code with "["
Complete error description here:
http://www.flying-bits.org/tracker.php?p=33&t=978
2012-07-30 21:45:06 +02:00
Marc Alexander 4f83baee6f Merge pull request #87 from marc1706/master
Remove converter for Board3 Portal 1.0.6
2012-06-27 08:12:41 -07:00
Marc Alexander a72b7b788f Remove converter for Board3 Portal 1.0.6
Fixed #85
2012-06-27 17:10:06 +02:00
Marc Alexander 011163669f Merge pull request #84 from marc1706/master
Add missing language var for logs after removing a link
2012-06-23 14:00:50 -07:00
Marc Alexander 591d6af124 Add missing language var for logs after removing a link 2012-06-23 22:59:07 +02:00
Marc Alexander a68b9b1904 Merge pull request #83 from marc1706/master
Enable stylechanger for guests again
2012-06-23 06:07:52 -07:00
Marc Alexander 009b90f9cb Enable stylechanger for guests again
Update install files for next release
2012-06-23 15:05:39 +02:00
Marc Alexander d84dda8fe1 Merge pull request #82 from marc1706/master
Properly handle mutated vowels in links
2012-06-19 07:57:47 -07:00
Marc Alexander e81bb0f967 Properly handle mutated vowels in links 2012-06-19 15:51:41 +02:00
Marc Alexander 0f53f6de07 Merge pull request #81 from marc1706/master
Fix incorrect space above calendar in IE9
2012-06-11 05:03:45 -07:00
Marc Alexander e5182d667b Merge pull request #80 from marc1706/e5206ff46deb942e4716f2a4125e060c66edc4b2
Fix PHP notice when unable to rename
2012-06-11 05:03:19 -07:00
Marc Alexander f203232c60 Fix incorrect space above calendar in IE9 2012-06-11 13:50:49 +02:00
Marc Alexander e5206ff46d Fix PHP notice when unable to rename
Also change chmod() to phpbb_chmod()
2012-06-06 15:00:19 +02:00
Marc Alexander e0210130d7 Merge pull request #78 from marc1706/master
[ticket/206] Missing link to MCP in subsilver2
2012-06-05 13:51:21 -07:00
Marc Alexander 9907b61aa9 [ticket/206] Missing link to MCP in subsilver2 2012-06-05 22:49:15 +02:00
Marc Alexander 778de7ca84 Merge pull request #77 from marc1706/master
[ticket/207] Debug warning in ACP when using PHP 5.4
2012-06-05 13:46:40 -07:00
Marc Alexander d8558bafb0 [ticket/207] Debug warning in ACP when using PHP 5.4 2012-06-05 22:43:56 +02:00
Marc Alexander 72c882b691 Merge pull request #76 from marc1706/master
[ticket/203] Future all day events are always displayed as current
2012-06-05 13:27:14 -07:00
Marc Alexander 5ae08f7604 [ticket/203] Future all day events are always displayed as current 2012-06-05 22:24:29 +02:00
Marc Alexander d7cfebbd31 Merge pull request #75 from marc1706/master
Fix incorrect space between blocks in IE9
2012-06-04 09:04:32 -07:00
Marc Alexander 2acdafd27b Fix incorrect space between blocks in IE9 2012-06-04 18:00:34 +02:00
Marc Alexander 29ac558758 Merge pull request #74 from marc1706/master
Fix error if server-side topic marking is disabled
2012-05-24 11:32:10 -07:00
Marc Alexander 0d6b235b87 Fix error if server-side topic marking is disabled 2012-05-24 20:30:23 +02:00
Marc Alexander be189babd4 Merge pull request #73 from marc1706/master
Fix incorrect config_name in portal_recent.php
2012-05-14 15:23:04 -07:00
Marc Alexander 7fe2d484ab Fix incorrect config_name in portal_recent.php 2012-05-15 00:19:02 +02:00
Marc Alexander 84bbe65ed7 Merge pull request #72 from marc1706/master
Fix previous commit for calendar
2012-04-30 11:04:05 -07:00
Marc Alexander 9f835088da Fix previous commit for calendar 2012-04-30 20:02:17 +02:00
Marc Alexander aea49ee61a Merge pull request #71 from marc1706/master
Fixed incorrect handling of months by strtotime
2012-04-30 09:27:19 -07:00
Marc Alexander d7dc9cfb04 Fixed incorrect handling of months by strtotime 2012-04-30 18:23:50 +02:00
Marc Alexander 62ca3c2478 Merge pull request #70 from marc1706/master
Add rel="nofollow" to calendar navigation
2012-04-20 04:10:01 -07:00
Marc Alexander 7eca7c6b58 Add rel="nofollow" to calendar navigation 2012-04-20 13:08:44 +02:00
Marc Alexander 2f0831eec4 Merge pull request #69 from marc1706/master
Redirect to portal.php when detecting incorrect announcement parameter
2012-04-12 11:05:59 -07:00
Marc Alexander f97fad470a Redirect to portal.php when detecting incorrect announcement parameter 2012-04-12 20:01:50 +02:00
Marc Alexander 3e841584fa Merge pull request #68 from marc1706/master
Moving algorithm should finally be fixed now
2012-04-08 13:52:19 -07:00
Marc Alexander 361fc247f7 Moving algorithm should finally be fixed now 2012-04-08 22:50:21 +02:00
Marc Alexander 972e10d82c Merge pull request #67 from marc1706/master
Fix me messing up
2012-04-08 08:28:15 -07:00
Marc Alexander 858e643a4b Add missing edit to portal_attachments.php after c0e0191945 2012-04-08 17:23:17 +02:00
Marc Alexander 86eb3e7526 Make sure we can only move modules to allowed columns
Moving a module to a column type (side & center columns) where
this module already exists will cause massive issues
2012-04-08 17:19:01 +02:00
Marc Alexander a7bb3b3226 Add missing edit to portal_attachments.php after c0e0191945 2012-04-07 17:53:03 +02:00
Marc Alexander 908db8fa6c Merge pull request #63 from marc1706/master
Fix incorrect filtering of custom blocks from drop-down list
2012-04-07 03:24:18 -07:00
Marc Alexander cf3784b780 Fix incorrect filtering of custom blocks from drop-down list 2012-04-07 12:17:47 +02:00
Marc Alexander 01755ad5b5 Merge pull request #62 from marc1706/master
Updated install.xml
2012-04-06 04:44:03 -07:00
Marc Alexander 0f54212e90 Updated changelog 2012-04-06 13:39:21 +02:00
Marc Alexander df17f6f59f Add note to DIY-instructions that user needs to remove install folder 2012-04-06 13:29:34 +02:00
Marc Alexander 07c527e855 Merge pull request #61 from marc1706/master
Hide modules that can't be added
2012-04-06 02:51:56 -07:00
Marc Alexander 724505062c Hide modules that can't be added 2012-04-06 11:50:46 +02:00
Marc Alexander 6b86ea9094 Merge pull request #60 from marc1706/master
Moved duplicate javascript to acp_portal.js
2012-04-06 02:39:58 -07:00
Marc Alexander c34c6efe57 Moved duplicate javascript to acp_portal.js 2012-04-06 11:38:18 +02:00
Marc Alexander ab6db7e57d Merge pull request #59 from marc1706/master
Fixed exceeding of max execution time when using trim message tool
2012-04-03 02:06:17 -07:00
Marc Alexander 2c0838b2c3 Fixed exceeding of max execution time when using trim message tool 2012-04-03 11:03:07 +02:00
Marc Alexander 435e8b7e5f Merge pull request #58 from marc1706/master
Added missing language vars and removed useless ones
2012-03-13 03:39:17 -07:00
Marc Alexander f2aad0b6a2 Added missing language vars and removed useless ones
Purge caches via install file
2012-03-13 11:24:48 +01:00
Marc Alexander bd0659b36f Merge pull request #57 from marc1706/master
Update update instructions in order to fit 83ac08a
2012-03-07 06:22:37 -08:00
Marc Alexander 53953d4476 Update update instructions in order to fit 83ac08a9d2 2012-03-07 15:19:56 +01:00
Marc Alexander 1ecf1372e9 Merge pull request #56 from marc1706/master
[Fix] Don't let Bots use styleswitcher
2012-03-07 03:56:16 -08:00
Marc Alexander 83ac08a9d2 [Fix] Don't let Bots use styleswitcher 2012-03-07 11:53:06 +01:00
Marc Alexander 0e263e7f34 Merge pull request #55 from marc1706/master
Make sure we don't try to copy folders
2012-02-26 04:20:40 -08:00
Marc Alexander 8e4cb28569 Merge pull request #54 from marc1706/master
Get rid of magic numbers in portal.php
2012-02-26 04:20:11 -08:00
Marc Alexander 4917e8ca3c Make sure we don't try to copy folders 2012-02-26 13:19:14 +01:00
Marc Alexander 9e542e181d Get rid of magic numbers in portal.php 2012-02-26 13:00:22 +01:00
Marc Alexander d92d1fb476 Merge pull request #53 from marc1706/master
Fixing incorrect size of module box for oneliners
2012-02-25 16:04:03 -08:00
Marc Alexander adaad84a1b Merge pull request #52 from marc1706/master
Fixed "unknown column" issue when installing
2012-02-25 16:03:26 -08:00
Marc Alexander 2e95c0f6ee Fixing incorrect size of module box for oneliners 2012-02-26 01:01:36 +01:00
Marc Alexander 1dd041d67d Fixed "unknown column" issue when installing 2012-02-26 00:42:58 +01:00
Marc Alexander b198ef8930 Merge pull request #51 from marc1706/master
Fix size of input boxes
2012-02-01 12:59:40 -08:00
Marc Alexander 732098f461 Fix size of input boxes 2012-02-01 21:58:15 +01:00
Marc Alexander 7e6ada25d7 Merge pull request #50 from marc1706/master
Add missing class references
2012-02-01 12:50:36 -08:00
Marc Alexander 8ea4242591 Merge pull request #49 from marc1706/master
Update to last few changes before test release
2012-02-01 12:49:44 -08:00
Marc Alexander 9850484fa3 Add missing class references 2012-02-01 21:43:18 +01:00
Marc Alexander 394a3677c1 Fixed incorrect size of input box in link us module 2012-01-06 20:31:34 +01:00
Marc Alexander 551ebc31f2 Added missing link to update instructions 2012-01-05 13:10:32 +01:00
Marc Alexander 4209c3e1f7 Add missing update instructions for 2.0.0b1 2012-01-05 13:04:34 +01:00
Marc Alexander 9fa1778225 Fixed missing module_status in board3_basic_install() 2012-01-04 16:23:34 +01:00
Marc Alexander 5e8cdd6ba3 Merged small whois online block into whois online module 2012-01-04 16:13:56 +01:00
Marc Alexander 80abc153ea Updated files for upcoming release 2012-01-04 12:05:20 +01:00