GitHub/WoltLab/WCF.git
9 years agoMerge branch '2.0'
Marcel Werk [Sun, 8 Mar 2015 13:03:44 +0000 (14:03 +0100)]
Merge branch '2.0'

Conflicts:
com.woltlab.wcf/templates/user.tpl
com.woltlab.wcf/templates/userInformationHeadline.tpl
com.woltlab.wcf/templates/usersOnlineList.tpl

9 years agoFixed missing rank image
Marcel Werk [Sun, 8 Mar 2015 12:00:13 +0000 (13:00 +0100)]
Fixed missing rank image

9 years agoFix typo in en.xml
Tim Düsterhus [Sun, 8 Mar 2015 03:33:29 +0000 (04:33 +0100)]
Fix typo in en.xml

9 years agoMerge branch 'master' of github.com:WoltLab/WCF
Alexander Ebert [Sat, 7 Mar 2015 22:49:25 +0000 (23:49 +0100)]
Merge branch 'master' of github.com:WoltLab/WCF

9 years agoMoved a single phrase to prevent issues w/ the WCF 2.0 event
Alexander Ebert [Sat, 7 Mar 2015 22:49:10 +0000 (23:49 +0100)]
Moved a single phrase to prevent issues w/ the WCF 2.0 event

9 years agoUpdating minified JavaScript files
woltlab.com [Sat, 7 Mar 2015 22:46:46 +0000 (23:46 +0100)]
Updating minified JavaScript files

9 years agoStrip background-color from pasted content
Alexander Ebert [Sat, 7 Mar 2015 22:43:19 +0000 (23:43 +0100)]
Strip background-color from pasted content

9 years agoPrevent matching background-color as color
Alexander Ebert [Sat, 7 Mar 2015 22:36:13 +0000 (23:36 +0100)]
Prevent matching background-color as color

9 years agoMerge branch 'master' of github.com:WoltLab/WCF
Alexander Ebert [Sat, 7 Mar 2015 22:21:11 +0000 (23:21 +0100)]
Merge branch 'master' of github.com:WoltLab/WCF

9 years agoUsing our own range to determine cursor position (more reliable)
Alexander Ebert [Sat, 7 Mar 2015 22:20:55 +0000 (23:20 +0100)]
Using our own range to determine cursor position (more reliable)

9 years agoUpdating minified JavaScript files
woltlab.com [Sat, 7 Mar 2015 15:16:44 +0000 (16:16 +0100)]
Updating minified JavaScript files

9 years agoMerge branch 'master' of github.com:WoltLab/WCF
Alexander Ebert [Sat, 7 Mar 2015 15:12:49 +0000 (16:12 +0100)]
Merge branch 'master' of github.com:WoltLab/WCF

9 years agoFixed index check
Alexander Ebert [Sat, 7 Mar 2015 15:12:33 +0000 (16:12 +0100)]
Fixed index check

9 years agoUpdating minified JavaScript files
woltlab.com [Sat, 7 Mar 2015 14:41:42 +0000 (15:41 +0100)]
Updating minified JavaScript files

9 years agoOverhauled editor integration, simulating br-Mode in WYSIWYG-Mode
Alexander Ebert [Sat, 7 Mar 2015 14:37:49 +0000 (15:37 +0100)]
Overhauled editor integration, simulating br-Mode in WYSIWYG-Mode

9 years agoMerge branch 'master' of github.com:WoltLab/WCF
Alexander Ebert [Sat, 7 Mar 2015 00:00:37 +0000 (01:00 +0100)]
Merge branch 'master' of github.com:WoltLab/WCF

9 years agoForce loading of CSS before JS
Alexander Ebert [Sat, 7 Mar 2015 00:00:21 +0000 (01:00 +0100)]
Force loading of CSS before JS

9 years agoRevert "Defer loading of JavaScript to body end, avoid too early rendering"
Alexander Ebert [Fri, 6 Mar 2015 23:59:16 +0000 (00:59 +0100)]
Revert "Defer loading of JavaScript to body end, avoid too early rendering"

This reverts commit 91c39ee5a899fd3afbc63a63f2a562973abaf5d5.

9 years agoUpdating minified JavaScript files
woltlab.com [Fri, 6 Mar 2015 18:56:43 +0000 (19:56 +0100)]
Updating minified JavaScript files

9 years agoSuppress droparea marker if Redactor is currently not visible
Alexander Ebert [Fri, 6 Mar 2015 18:53:34 +0000 (19:53 +0100)]
Suppress droparea marker if Redactor is currently not visible

9 years agoAdded missing phrase
Alexander Ebert [Fri, 6 Mar 2015 18:49:43 +0000 (19:49 +0100)]
Added missing phrase

9 years agoMerge branch 'master' of github.com:WoltLab/WCF
Alexander Ebert [Fri, 6 Mar 2015 18:42:29 +0000 (19:42 +0100)]
Merge branch 'master' of github.com:WoltLab/WCF

9 years agoRemoved debug code
Alexander Ebert [Fri, 6 Mar 2015 18:41:31 +0000 (19:41 +0100)]
Removed debug code

9 years agoMerge branch 'master' of github.com:WoltLab/WCF
Marcel Werk [Fri, 6 Mar 2015 18:02:35 +0000 (19:02 +0100)]
Merge branch 'master' of github.com:WoltLab/WCF

9 years agoIncreased maximum category depth to 3
Marcel Werk [Fri, 6 Mar 2015 18:02:19 +0000 (19:02 +0100)]
Increased maximum category depth to 3

9 years agoInclude moderated groups in UserGroupCondition
Matthias Schmidt [Fri, 6 Mar 2015 17:44:28 +0000 (18:44 +0100)]
Include moderated groups in UserGroupCondition

9 years agoPurge compiled templates after template deletion
Alexander Ebert [Fri, 6 Mar 2015 13:35:54 +0000 (14:35 +0100)]
Purge compiled templates after template deletion

9 years agoMerge pull request #1890 from SoftCreatR/patch-4
Alexander Ebert [Fri, 6 Mar 2015 12:57:09 +0000 (13:57 +0100)]
Merge pull request #1890 from SoftCreatR/patch-4

Fix Youtube embed

9 years agoDefer loading of JavaScript to body end, avoid too early rendering
Alexander Ebert [Fri, 6 Mar 2015 12:54:03 +0000 (13:54 +0100)]
Defer loading of JavaScript to body end, avoid too early rendering

9 years agoUpdating minified JavaScript files
woltlab.com [Fri, 6 Mar 2015 11:01:46 +0000 (12:01 +0100)]
Updating minified JavaScript files

9 years agoAdded a flexible category list supporting up to 3 levels
Alexander Ebert [Fri, 6 Mar 2015 10:58:07 +0000 (11:58 +0100)]
Added a flexible category list supporting up to 3 levels

9 years agoUpdate cookie information link for Safari
Matthias Schmidt [Wed, 4 Mar 2015 20:09:04 +0000 (21:09 +0100)]
Update cookie information link for Safari

9 years agoImprove UserGroupAssignmentHandler::checkUsers()
Matthias Schmidt [Wed, 4 Mar 2015 19:00:10 +0000 (20:00 +0100)]
Improve UserGroupAssignmentHandler::checkUsers()

9 years agoFixed virtual sessions being considered within ACP 2.1.1
Alexander Ebert [Tue, 3 Mar 2015 19:35:21 +0000 (20:35 +0100)]
Fixed virtual sessions being considered within ACP

9 years agoLoosening check for drop table
Alexander Ebert [Tue, 3 Mar 2015 18:52:18 +0000 (19:52 +0100)]
Loosening check for drop table

9 years agoStripped comment
Alexander Ebert [Tue, 3 Mar 2015 18:08:38 +0000 (19:08 +0100)]
Stripped comment

9 years agoFixed mention parser discarding second word if only the first matched
Alexander Ebert [Tue, 3 Mar 2015 17:47:35 +0000 (18:47 +0100)]
Fixed mention parser discarding second word if only the first matched

9 years agoFix searching for menu items in the ACP
Matthias Schmidt [Tue, 3 Mar 2015 16:13:25 +0000 (17:13 +0100)]
Fix searching for menu items in the ACP

9 years agoFixed missing language variable
Marcel Werk [Tue, 3 Mar 2015 15:52:01 +0000 (16:52 +0100)]
Fixed missing language variable

9 years agoApplying controller case-sensitive check for aliased controllers
Alexander Ebert [Tue, 3 Mar 2015 15:10:32 +0000 (16:10 +0100)]
Applying controller case-sensitive check for aliased controllers

9 years agoFixed issues when routes to ACP and frontend are generated on the same page
Alexander Ebert [Tue, 3 Mar 2015 14:17:00 +0000 (15:17 +0100)]
Fixed issues when routes to ACP and frontend are generated on the same page

9 years agoPreparing internal release 2.1.1
Alexander Ebert [Tue, 3 Mar 2015 12:39:46 +0000 (13:39 +0100)]
Preparing internal release 2.1.1

9 years agoUpdating minified JavaScript files
woltlab.com [Tue, 3 Mar 2015 12:36:45 +0000 (13:36 +0100)]
Updating minified JavaScript files

9 years agoDeleting a smiley category did not reset the cache
Alexander Ebert [Tue, 3 Mar 2015 12:33:39 +0000 (13:33 +0100)]
Deleting a smiley category did not reset the cache

9 years agoFixed a few issues
Alexander Ebert [Tue, 3 Mar 2015 12:27:16 +0000 (13:27 +0100)]
Fixed a few issues

9 years agoImproved visuals for tab menus with an active dropdown
Alexander Ebert [Tue, 3 Mar 2015 12:24:02 +0000 (13:24 +0100)]
Improved visuals for tab menus with an active dropdown

9 years agoFixed smiley categories overflowing the menu
Alexander Ebert [Tue, 3 Mar 2015 12:23:50 +0000 (13:23 +0100)]
Fixed smiley categories overflowing the menu

9 years agoUse own phrases for undo/redo because Redactor's lang is unreliable
Alexander Ebert [Tue, 3 Mar 2015 12:23:33 +0000 (13:23 +0100)]
Use own phrases for undo/redo because Redactor's lang is unreliable

9 years agoAdded missing templates
Alexander Ebert [Tue, 3 Mar 2015 09:25:48 +0000 (10:25 +0100)]
Added missing templates

9 years agoFixed virtual session validation
Alexander Ebert [Mon, 2 Mar 2015 18:39:09 +0000 (19:39 +0100)]
Fixed virtual session validation

9 years agoFixed censorship treating '@' as delimiter
Alexander Ebert [Mon, 2 Mar 2015 17:11:38 +0000 (18:11 +0100)]
Fixed censorship treating '@' as delimiter

Stripping the '@' makes it impossible to match against e-mail addresses.

9 years agoUpdating minified JavaScript files
woltlab.com [Mon, 2 Mar 2015 14:51:45 +0000 (15:51 +0100)]
Updating minified JavaScript files

9 years agoAdded undo/redo buttons
Alexander Ebert [Mon, 2 Mar 2015 14:47:17 +0000 (15:47 +0100)]
Added undo/redo buttons

9 years agoMerge branch 'master' of github.com:WoltLab/WCF
Alexander Ebert [Mon, 2 Mar 2015 14:21:40 +0000 (15:21 +0100)]
Merge branch 'master' of github.com:WoltLab/WCF

9 years agoUploading a logo/preview image didn't cause the displayed image to be refreshed becau...
Alexander Ebert [Mon, 2 Mar 2015 14:21:23 +0000 (15:21 +0100)]
Uploading a logo/preview image didn't cause the displayed image to be refreshed because it replaces the existing image, causing the old image to be still cached

9 years agoCopying a style did not reset the style cache
Alexander Ebert [Mon, 2 Mar 2015 14:20:42 +0000 (15:20 +0100)]
Copying a style did not reset the style cache

9 years agoUpdating minified JavaScript files
woltlab.com [Mon, 2 Mar 2015 12:01:48 +0000 (13:01 +0100)]
Updating minified JavaScript files

9 years agoFixed browsers creating invalid HTML when indenting the first item
Alexander Ebert [Mon, 2 Mar 2015 11:58:42 +0000 (12:58 +0100)]
Fixed browsers creating invalid HTML when indenting the first item

9 years agoUpdating minified JavaScript files
woltlab.com [Mon, 2 Mar 2015 11:21:44 +0000 (12:21 +0100)]
Updating minified JavaScript files

9 years agoFixed handling of empty but formatted lines
Alexander Ebert [Mon, 2 Mar 2015 11:19:58 +0000 (12:19 +0100)]
Fixed handling of empty but formatted lines

9 years agoUpdating minified JavaScript files
woltlab.com [Mon, 2 Mar 2015 10:46:45 +0000 (11:46 +0100)]
Updating minified JavaScript files

9 years agoMerge branch 'master' of github.com:WoltLab/WCF
Alexander Ebert [Mon, 2 Mar 2015 10:42:07 +0000 (11:42 +0100)]
Merge branch 'master' of github.com:WoltLab/WCF

9 years agoFixed quote selection not working in IE11
Alexander Ebert [Mon, 2 Mar 2015 10:41:52 +0000 (11:41 +0100)]
Fixed quote selection not working in IE11

9 years agoMerge branch '2.0'
Tim Düsterhus [Sun, 1 Mar 2015 22:48:07 +0000 (23:48 +0100)]
Merge branch '2.0'

9 years agoFix UserGroupEditor::updateAccessibleGroups() being dependent on a loaded cache
Tim Düsterhus [Sun, 1 Mar 2015 22:45:57 +0000 (23:45 +0100)]
Fix UserGroupEditor::updateAccessibleGroups() being dependent on a loaded cache

Previously imported user groups were not accessible, as the cache was not
loaded before, leading to no admin groups being in the system (as the new
group already was added).

9 years agoFixed potential race condition causing the update to fail
Alexander Ebert [Sun, 1 Mar 2015 22:28:32 +0000 (23:28 +0100)]
Fixed potential race condition causing the update to fail

9 years agoFix smiley tab if default category is empty (2)
Matthias Schmidt [Sun, 1 Mar 2015 18:20:08 +0000 (19:20 +0100)]
Fix smiley tab if default category is empty (2)

9 years agoMerge remote-tracking branch 'origin/master'
Matthias Schmidt [Sun, 1 Mar 2015 18:03:35 +0000 (19:03 +0100)]
Merge remote-tracking branch 'origin/master'

9 years agoFix smiley tab if default category is empty
Matthias Schmidt [Sun, 1 Mar 2015 18:01:18 +0000 (19:01 +0100)]
Fix smiley tab if default category is empty

9 years agoUpdated CONTRIBUTING.md
Alexander Ebert [Sun, 1 Mar 2015 17:55:27 +0000 (18:55 +0100)]
Updated CONTRIBUTING.md

9 years agoUpdated README.md
Alexander Ebert [Sun, 1 Mar 2015 17:53:14 +0000 (18:53 +0100)]
Updated README.md

9 years agoMerge branch '2.0'
Alexander Ebert [Sun, 1 Mar 2015 17:52:34 +0000 (18:52 +0100)]
Merge branch '2.0'

Conflicts:
README.md

9 years agoHide disabled smiley categories in inline editor
Matthias Schmidt [Sun, 1 Mar 2015 17:52:02 +0000 (18:52 +0100)]
Hide disabled smiley categories in inline editor

9 years agoUpdated README.md
Alexander Ebert [Sun, 1 Mar 2015 17:51:33 +0000 (18:51 +0100)]
Updated README.md

9 years agoFixed typo 2.1.0
Alexander Ebert [Sun, 1 Mar 2015 13:06:28 +0000 (14:06 +0100)]
Fixed typo

9 years agoUpdating release date
Alexander Ebert [Sun, 1 Mar 2015 12:18:01 +0000 (13:18 +0100)]
Updating release date

9 years agoFixed typo
Alexander Ebert [Sun, 1 Mar 2015 11:43:52 +0000 (12:43 +0100)]
Fixed typo

9 years agoAllow search by template name components
Alexander Ebert [Sun, 1 Mar 2015 09:32:52 +0000 (10:32 +0100)]
Allow search by template name components

9 years agoFixed rendering issue
Alexander Ebert [Sat, 28 Feb 2015 20:30:50 +0000 (21:30 +0100)]
Fixed rendering issue

9 years agoAdded link to articles w/ instructions for setting up rewrites
Alexander Ebert [Sat, 28 Feb 2015 19:22:22 +0000 (20:22 +0100)]
Added link to articles w/ instructions for setting up rewrites

9 years agoUpdating minified JavaScript files
woltlab.com [Sat, 28 Feb 2015 18:21:47 +0000 (19:21 +0100)]
Updating minified JavaScript files

9 years agoImproved handling of code boxes incorrectly wrapped in <p>
Alexander Ebert [Sat, 28 Feb 2015 18:20:04 +0000 (19:20 +0100)]
Improved handling of code boxes incorrectly wrapped in <p>

9 years agoAdd missing checks in template if page menu item can be deleted
Matthias Schmidt [Sat, 28 Feb 2015 13:57:12 +0000 (14:57 +0100)]
Add missing checks in template if page menu item can be deleted

9 years agoFix reporting content with non-outstanding moderation queue entry
Matthias Schmidt [Sat, 28 Feb 2015 12:13:25 +0000 (13:13 +0100)]
Fix reporting content with non-outstanding moderation queue entry

35e19e581a5e61f13d37e536710604283b1f0ebf did not adjust `ModerationQueueReportManager::hasPendingReport()` to consider the new moderation queue statuses `ModerationQueue::STATUS_REJECTED` and `ModerationQueue::STATUS_CONFIRMED` so that once reported content could not be reported again.

9 years agoAdd Parsedown to CodeSniff ignores
Tim Düsterhus [Fri, 27 Feb 2015 22:52:17 +0000 (23:52 +0100)]
Add Parsedown to CodeSniff ignores

9 years agoAdd Parsedown markdown library
Tim Düsterhus [Fri, 27 Feb 2015 22:11:58 +0000 (23:11 +0100)]
Add Parsedown markdown library

9 years agoUpdating minified JavaScript files
woltlab.com [Fri, 27 Feb 2015 10:41:48 +0000 (11:41 +0100)]
Updating minified JavaScript files

9 years agoProperly check if selection is within the $messageBody element
Alexander Ebert [Fri, 27 Feb 2015 10:40:18 +0000 (11:40 +0100)]
Properly check if selection is within the $messageBody element

9 years agoUpdating minified JavaScript files
woltlab.com [Thu, 26 Feb 2015 23:31:49 +0000 (00:31 +0100)]
Updating minified JavaScript files

9 years agoMerge pull request #1891 from max-m/patch-15
Tim Düsterhus [Thu, 26 Feb 2015 23:29:55 +0000 (00:29 +0100)]
Merge pull request #1891 from max-m/patch-15

Set this._badge to null in WCF.User.Panel.Abstract.updateBadge on removal

9 years agoSet this._badge to null in WCF.User.Panel.Abstract.updateBadge on removal
Maximilian Mader [Thu, 26 Feb 2015 23:23:26 +0000 (00:23 +0100)]
Set this._badge to null in WCF.User.Panel.Abstract.updateBadge on removal

When not explicitly set to `null` the variable will still contain a reference, thus a badge update will not create a new badge when it was removed earlier.

9 years agoFixed Youtube embed on mobile devices
Sascha Greuel [Thu, 26 Feb 2015 22:46:56 +0000 (23:46 +0100)]
Fixed Youtube embed on mobile devices

9 years agoFixed 'index.php/' appended for no reason in compatibility mode
Alexander Ebert [Thu, 26 Feb 2015 18:13:10 +0000 (19:13 +0100)]
Fixed 'index.php/' appended for no reason in compatibility mode

9 years agoUpdated English translation
Alexander Ebert [Thu, 26 Feb 2015 16:18:07 +0000 (17:18 +0100)]
Updated English translation

9 years agoUpdated WCF_VERSION
Alexander Ebert [Thu, 26 Feb 2015 15:22:50 +0000 (16:22 +0100)]
Updated WCF_VERSION

9 years agoAdded upgrade support for 2.0.11 pl 1
Alexander Ebert [Thu, 26 Feb 2015 13:39:47 +0000 (14:39 +0100)]
Added upgrade support for 2.0.11 pl 1

9 years agoMerge branch '2.0'
Alexander Ebert [Thu, 26 Feb 2015 13:38:59 +0000 (14:38 +0100)]
Merge branch '2.0'

Conflicts:
com.woltlab.wcf/package.xml
wcfsetup/install/files/lib/system/WCF.class.php

9 years agoPreparing internal release 2.0.11 pl 1 2.0.11_pl_1
Alexander Ebert [Thu, 26 Feb 2015 13:07:52 +0000 (14:07 +0100)]
Preparing internal release 2.0.11 pl 1

9 years agoFixed tree level w/ maximum depth = 0
Alexander Ebert [Thu, 26 Feb 2015 13:04:57 +0000 (14:04 +0100)]
Fixed tree level w/ maximum depth = 0

Closes #1889

9 years agoPreparing internal release 2.1.0
Alexander Ebert [Thu, 26 Feb 2015 12:39:36 +0000 (13:39 +0100)]
Preparing internal release 2.1.0