aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x'Marc Alexander2015-05-281-27/+27
|\
| * Merge pull request #3634 from prototech/ticket/13858Marc Alexander2015-05-281-27/+27
| |\ | | | | | | | | | [ticket/13858] Make Plupload uploader available in the global namespace.
| | * [ticket/13858] Make Plupload uploader available in the global namespace.Cesar G2015-05-281-27/+27
| | | | | | | | | | | | PHPBB3-13858
* | | Merge branch '3.1.x'Cesar G2015-05-281-0/+1
|\ \ \ | |/ / | | | | | | | | | * 3.1.x: [ticket/13878] Display background images when printing topic in webkit
| * | [ticket/13878] Display background images when printing topic in webkitMarc Alexander2015-05-281-0/+1
| | | | | | | | | | | | PHPBB3-13878
* | | Merge branch '3.1.x'Marc Alexander2015-05-281-8/+7
|\ \ \ | |/ /
| * | Merge pull request #3637 from callumacrae/ticket/13873Marc Alexander2015-05-281-8/+7
| |\ \ | | | | | | | | | | | | [ticket/13873] Removed broken print stylesheet.
| | * | [ticket/13873] Removed broken print stylesheet.Callum Macrae2015-05-281-8/+7
| | |/ | | | | | | | | | PHPBB3-13873
* | | Merge branch '3.1.x'Marc Alexander2015-05-282-3/+87
|\ \ \ | |/ /
| * | Merge pull request #3633 from nickvergessen/ticket/13872Marc Alexander2015-05-282-3/+87
| |\ \ | | | | | | | | | | | | [ticket/13872] Allow template events to have a changed version
| | * | [ticket/13872] Allow template events to have a changed versionJoas Schilling2015-05-282-3/+87
| | | | | | | | | | | | | | | | PHPBB3-13872
* | | | Merge branch '3.1.x'Cesar G2015-05-284-0/+43
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/12542] Use more specific CSS for drag-n-drop [ticket/12542] Do not use browser specific css for outline [ticket/12542] Properly check if textarea is undefined or null [ticket/12542] Use extended CSS for all browsers [ticket/12542] Rename javascript method and add doc block [ticket/12542] Add different outline colors for body & textarea [ticket/12542] Add initial drag-n-drop animation
| * | | Merge remote-tracking branch 'marc1706/ticket/12542' into 3.1.xCesar G2015-05-284-0/+43
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * marc1706/ticket/12542: [ticket/12542] Use more specific CSS for drag-n-drop [ticket/12542] Do not use browser specific css for outline [ticket/12542] Properly check if textarea is undefined or null [ticket/12542] Use extended CSS for all browsers [ticket/12542] Rename javascript method and add doc block [ticket/12542] Add different outline colors for body & textarea [ticket/12542] Add initial drag-n-drop animation
| | * | | [ticket/12542] Use more specific CSS for drag-n-dropMarc Alexander2015-05-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise the CSS gets overwritten by other CSS rules. PHPBB3-12542
| | * | | [ticket/12542] Do not use browser specific css for outlineMarc Alexander2015-05-232-18/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, the CSS selector for the drag'n'drop was simplified to only use the class. PHPBB3-12542
| | * | | [ticket/12542] Properly check if textarea is undefined or nullMarc Alexander2015-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12542
| | * | | [ticket/12542] Use extended CSS for all browsersMarc Alexander2015-04-292-1/+21
| | | | | | | | | | | | | | | | | | | | PHPBB3-12542
| | * | | [ticket/12542] Rename javascript method and add doc blockMarc Alexander2015-04-292-2/+16
| | | | | | | | | | | | | | | | | | | | PHPBB3-12542
| | * | | [ticket/12542] Add different outline colors for body & textareaMarc Alexander2015-04-292-2/+11
| | | | | | | | | | | | | | | | | | | | PHPBB3-12542
| | * | | [ticket/12542] Add initial drag-n-drop animationMarc Alexander2015-04-284-0/+16
| | | | | | | | | | | | | | | | | | | | PHPBB3-12542
* | | | | Merge branch '3.1.x'Joas Schilling2015-05-281-0/+20
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13672] Removed bogus sting concatenation [ticket/13672] BUMP version to 3.1.5-dev [ticket/13672] Allow changing the data from the user-submitted report
| * | | | Merge pull request #3469 from brunoais/ticket/13672Joas Schilling2015-05-281-0/+20
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13672] Allow changing the data from the user-submitted report * brunoais/ticket/13672: [ticket/13672] Removed bogus sting concatenation [ticket/13672] BUMP version to 3.1.5-dev [ticket/13672] Allow changing the data from the user-submitted report
| | * | | | [ticket/13672] Removed bogus sting concatenationbrunoais2015-05-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13672
| | * | | | [ticket/13672] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13672
| | * | | | [ticket/13672] Allow changing the data from the user-submitted reportbrunoais2015-03-051-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13672
* | | | | | Merge branch '3.1.x'Joas Schilling2015-05-281-5/+34
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13668] Removed bogus sting concatenation [ticket/13668] BUMP version to 3.1.5-dev [ticket/13668] Allow changing the query to obtain the user-submitted report. [ticket/13668] Convert the mcp report_details query to a built query Conflicts: phpBB/includes/mcp/mcp_reports.php
| * | | | | Merge pull request #3468 from brunoais/ticket/13668Joas Schilling2015-05-281-5/+33
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13668] Allow changing the query to obtain the user-submitted report * brunoais/ticket/13668: [ticket/13668] Removed bogus sting concatenation [ticket/13668] BUMP version to 3.1.5-dev [ticket/13668] Allow changing the query to obtain the user-submitted report. [ticket/13668] Convert the mcp report_details query to a built query
| | * | | | | [ticket/13668] Removed bogus sting concatenationbrunoais2015-05-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13668
| | * | | | | [ticket/13668] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13668
| | * | | | | [ticket/13668] Allow changing the query to obtain the user-submitted report.brunoais2015-03-051-0/+19
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-13668
| | * | | | [ticket/13668] Convert the mcp report_details query to a built querybrunoais2015-03-051-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13668
* | | | | | Merge branch '3.1.x'Joas Schilling2015-05-281-15/+70
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13661] BUMP version to 3.1.5-dev [ticket/13661] Brackets in their own line [ticket/13661] Re-Fixed $log_type -> $log_time [ticket/13661] Wrong event @since version [ticket/13661] Removed superfluous whitespace [ticket/13661] bugfix: The conditional is the log_time, not log_type [ticket/13661] Fixed the "FROM" in the built query. [ticket/13661] Add event to allow editing the queries used to get the logs [ticket/13661] Transform queries to get logs and log count into built queries
| * | | | | Merge pull request #3457 from brunoais/ticket/13661Joas Schilling2015-05-281-15/+70
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13661] Add event to allow editing the queries used to get the logs * brunoais/ticket/13661: [ticket/13661] BUMP version to 3.1.5-dev [ticket/13661] Brackets in their own line [ticket/13661] Re-Fixed $log_type -> $log_time [ticket/13661] Wrong event @since version [ticket/13661] Removed superfluous whitespace [ticket/13661] bugfix: The conditional is the log_time, not log_type [ticket/13661] Fixed the "FROM" in the built query. [ticket/13661] Add event to allow editing the queries used to get the logs [ticket/13661] Transform queries to get logs and log count into built queries
| | * | | | | [ticket/13661] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13661
| | * | | | | [ticket/13661] Brackets in their own linebrunoais2015-03-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I didn't even notice that I used my own coding guidelines there... Thanks to MGaetan89 for pointing it out. PHPBB3-13661
| | * | | | | [ticket/13661] Re-Fixed $log_type -> $log_timebrunoais2015-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to goof for pointing it out... PHPBB3-13661
| | * | | | | [ticket/13661] Wrong event @since versionbrunoais2015-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13661
| | * | | | | [ticket/13661] Removed superfluous whitespacebrunoais2015-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13661
| | * | | | | [ticket/13661] bugfix: The conditional is the log_time, not log_typebrunoais2015-03-011-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I mistakenly made the log_type the conditional instead of log_time. Thankfully, the automated tests helped finding this mistake. PHPBB3-13661
| | * | | | | [ticket/13661] Fixed the "FROM" in the built query.brunoais2015-03-011-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I was doing it wrong by giving a string to the FROM clause in the built query. PHPBB3-13661
| | * | | | | [ticket/13661] Add event to allow editing the queries used to get the logsbrunoais2015-03-011-2/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13661
| | * | | | | [ticket/13661] Transform queries to get logs and log count into built queriesbrunoais2015-02-281-15/+23
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-13661
* | | | | | Merge pull request #3636 from nickvergessen/ticket/13808-masterMarc Alexander2015-05-281-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ticket/13808 master Conflicts: phpBB/docs/events.md
| * \ \ \ \ \ Merge branch 'ticket/13808' into ticket/13808-masterJoas Schilling2015-05-281-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/13808: [ticket/13808] Fix version Conflicts: phpBB/docs/events.md
* | \ \ \ \ \ \ Merge branch '3.1.x'Marc Alexander2015-05-281-1/+1
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/docs/events.md
| * | | | | | | Merge pull request #3635 from nickvergessen/ticket/13808Marc Alexander2015-05-281-1/+1
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | / | | |_|_|_|_|/ | |/| | | | | [ticket/13808] Fix version
| | * | | | | [ticket/13808] Fix versionJoas Schilling2015-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13808
* | | | | | | [ticket/13871] Fix call to undefined member function on non-object error.Cesar G2015-05-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13871
* | | | | | | Merge branch '3.1.x'Cesar G2015-05-281-13/+8
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | | * 3.1.x: [ticket/13787] Remove duplicate entry of poll_delete in prosilver template
| * | | | | Merge remote-tracking branch 'Wolfsblvt/ticket/13787' into 3.1.xCesar G2015-05-281-13/+8
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * Wolfsblvt/ticket/13787: [ticket/13787] Remove duplicate entry of poll_delete in prosilver template
generated by cgit v1.2.1 (git 2.21.0) at 2026-04-20 06:47:53 +0000