aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1834 from cyberalien/ticket/11984Nathan Guse2013-11-215-11/+18
|\
| * [ticket/11984] Do not resize textarea on touch devicesVjacheslav Trushkin2013-11-191-2/+4
| * [ticket/11984] Hide <dfn> for invalid extensionsVjacheslav Trushkin2013-11-191-0/+3
| * [ticket/11984] Fix stray </ul> and active tab hover in ACPVjacheslav Trushkin2013-11-192-11/+8
| * [ticket/11984] Prevent AJAX background animation flicker in prosilverVjacheslav Trushkin2013-11-191-0/+3
| * [ticket/11984] Prevent AJAX background animation flicker in ACPVjacheslav Trushkin2013-11-191-0/+2
* | Merge pull request #1869 from prototech/ticket/10810Nathan Guse2013-11-2115-207/+117
|\ \
| * | [ticket/10810] Remove obsolete swatch code.Cesar G2013-11-134-134/+0
| * | [ticket/10810] Update all palettes.Cesar G2013-11-139-12/+26
| * | [ticket/10810] Make the color palette usable outside of the editor context.Cesar G2013-11-131-8/+42
| * | [ticket/10810] Move the color palette code to core.js.Cesar G2013-11-122-61/+57
* | | Merge pull request #1882 from prototech/ticket/11959Nathan Guse2013-11-212-3/+33
|\ \ \
| * | | [ticket/11959] Rename $extra_cnt to something more descriptive.Cesar G2013-11-211-3/+3
| * | | [ticket/11959] Use COMMA_SEPARATOR to join the user list.Cesar G2013-11-211-1/+1
| * | | [ticket/11959] Trim the list of users from post notifications.Cesar G2013-11-212-2/+32
| | |/ | |/|
* | | Merge pull request #1878 from blitze/ticket/12024Nathan Guse2013-11-215-0/+22
|\ \ \
| * | | [ticket/12024] Add new lineOpenShift guest2013-11-192-0/+2
| * | | [ticket/12024] Correct the 'since' information in event listOpenShift guest2013-11-191-2/+2
| * | | [ticket/12024] Update events listOpenShift guest2013-11-181-0/+16
| * | | [ticket/12024] Replace newlineOpenShift guest2013-11-181-1/+1
| * | | [ticket/12024] Template event overall_header_content_beforeOpenShift guest2013-11-184-0/+4
* | | | Merge pull request #1881 from prototech/ticket/11484Nathan Guse2013-11-212-17/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | [ticket/11484] Display login box for users following email notification link.Cesar G2013-11-212-17/+4
|/ / /
* | | Merge branch 'develop-olympus' into developJoas Schilling2013-11-191-2/+1
|\ \ \
| * \ \ Merge remote-tracking branch 'prototech/ticket/11814' into develop-olympusJoas Schilling2013-11-191-2/+1
| |\ \ \
| | * | | [ticket/11814] Remove redundant text from the topic reply email notification.Cesar G2013-11-191-2/+1
| |/ / /
* | | | Merge branch 'prep-release-3.1.0-a2' into developJoas Schilling2013-11-198-32/+137
|\ \ \ \
| * | | | [prep-release-3.1.0-a2] Update version to 3.1.0-a3-dev in install and constantJoas Schilling2013-11-192-2/+2
| * | | | [prep-release-3.1.0-a2] Add changelog for alpha2Joas Schilling2013-11-191-0/+74
| * | | | [prep-release-3.1.0-a2] Prepare ChangelogJoas Schilling2013-11-191-22/+25
| * | | | [prep-release-3.1.0-a2] Add migration for 3.1.0-a2Joas Schilling2013-11-191-0/+28
| * | | | [prep-release-3.1.0-a2] Update version to 3.1.0-a2Joas Schilling2013-11-196-10/+10
|/ / / /
* | | | Merge remote-tracking branch 'Marc/ticket/11896' into developJoas Schilling2013-11-193-10/+52
|\ \ \ \
| * | | | [ticket/11896] Use $form_time and fix out of bounds $form_timeMarc Alexander2013-11-141-2/+3
| * | | | [ticket/11896] Correctly document return of null in docblocksMarc Alexander2013-11-141-4/+4
| * | | | [ticket/11896] Minor code improvements in phpbb_functional_test_caseMarc Alexander2013-11-141-21/+7
| * | | | [ticket/11896] Add functional tests for marking all notifications readMarc Alexander2013-11-091-0/+33
| * | | | [ticket/11896] Add ability to define expected message after postingMarc Alexander2013-11-091-7/+29
| * | | | [ŧicket/11896] Set form_time with time() when marking all notifications readMarc Alexander2013-11-091-1/+1
* | | | | Merge pull request #1877 from nickvergessen/ticket/12023Nils Adermann2013-11-182-1/+3
|\ \ \ \ \
| * | | | | [ticket/12023] Correctly compare the size of the array in ignore_new_filesJoas Schilling2013-11-191-1/+1
| * | | | | [ticket/12023] Add test for failing .css copyJoas Schilling2013-11-191-0/+2
|/ / / / /
* | | | | Merge remote-tracking branch 'Marc/ticket/12018' into developJoas Schilling2013-11-141-2/+2
|\ \ \ \ \
| * | | | | [ticket/12018] Use path_helper for admin style CSS in sql reportMarc Alexander2013-11-141-2/+2
|/ / / / /
* | | | | Merge remote-tracking branch 'prototech/ticket/12008' into developJoas Schilling2013-11-146-3/+39
|\ \ \ \ \
| * | | | | [ticket/12008] Update the run time value for the prune notifications cron taskCesar G2013-11-144-2/+11
| * | | | | [ticket/12008] The read_notification_last_gc config setting should be dynamic.Cesar G2013-11-142-1/+28
|/ / / / /
* | | | | Merge pull request #1872 from nickvergessen/ticket/12017David King2013-11-136-21/+7
|\ \ \ \ \
| * | | | | [ticket/12017] Fix phpbb requirement in composer.jsonJoas Schilling2013-11-141-1/+1
| * | | | | [ticket/12017] Copy config/ dir so events workJoas Schilling2013-11-143-2/+6