makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-19 17:58:51 +00:00
Code Issues Projects Releases Packages Wiki Activity
22039 commits 18 branches 192 tags 207 MiB
Commit graph

22039 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nathaniel Guse
bf32b31f8a Merge branch 'develop-ascraeus' into develop 
# By Nicofuma
# Via Nathaniel Guse (1) and Nicofuma (1)
* develop-ascraeus:
  [ticket/12432] Correcting the assertion
  [ticket/12432] Adding unit test
  [ticket/12432] Migrator should not revert custom functions
 2014-05-01 22:16:07 -05:00
Nathaniel Guse
4f393ad096 Merge remote-tracking branch 'remotes/Nicofuma/ticket/12432' into develop-ascraeus 
# By Nicofuma
# Via Nicofuma
* remotes/Nicofuma/ticket/12432:
  [ticket/12432] Correcting the assertion
  [ticket/12432] Adding unit test
  [ticket/12432] Migrator should not revert custom functions
 2014-05-01 22:16:02 -05:00
Matt Friedman
0e0eca2d2e [ticket/12332] Add missing semicolon to inline styling 
PHPBB3-12332
 2014-05-01 20:04:27 -07:00
Nathaniel Guse
e31a071f2b Merge branch 'develop-ascraeus' into develop 
# By PayBas
# Via Nathaniel Guse (1) and PayBas (1)
* develop-ascraeus:
  [ticket/12442] More heading classes
  [ticket/12442] Add CSS classes to important headings
 2014-05-01 22:00:29 -05:00
Nathaniel Guse
f0036d2ac6 Merge remote-tracking branch 'remotes/PayBas/ticket/12442' into develop-ascraeus 
# By PayBas
# Via PayBas
* remotes/PayBas/ticket/12442:
  [ticket/12442] More heading classes
  [ticket/12442] Add CSS classes to important headings
 2014-05-01 21:55:45 -05:00
Nathaniel Guse
8ae229febe Merge branch 'develop-ascraeus' into develop 
# By Nicofuma
# Via Nathaniel Guse (1) and Nicofuma (1)
* develop-ascraeus:
  [ticket/12444] Replacing spaces with tabs
  [ticket/12444] Replace spaces with tabs
  [ticket/12444] Adding regression test
  [ticket/12444] The logs message aren't filled correctly
 2014-05-01 21:49:55 -05:00
Nathaniel Guse
4f236729e4 Merge remote-tracking branch 'remotes/Nicofuma/ticket/12444' into develop-ascraeus 
# By Nicofuma
# Via Nicofuma
* remotes/Nicofuma/ticket/12444:
  [ticket/12444] Replacing spaces with tabs
  [ticket/12444] Replace spaces with tabs
  [ticket/12444] Adding regression test
  [ticket/12444] The logs message aren't filled correctly
 2014-05-01 21:49:18 -05:00
Nathaniel Guse
a3995d123a Merge branch 'develop-ascraeus' into develop 
# By Nicofuma
# Via Nathaniel Guse (1) and Nicofuma (1)
* develop-ascraeus:
  [ticket/12445] Change the formulation
  [ticket/12445] Disapproved post: the name of the poster should be in logs
 2014-05-01 21:47:06 -05:00
Nathaniel Guse
5c54cd6a45 Merge remote-tracking branch 'remotes/Nicofuma/ticket/12445' into develop-ascraeus 
# By Nicofuma
# Via Nicofuma
* remotes/Nicofuma/ticket/12445:
  [ticket/12445] Change the formulation
  [ticket/12445] Disapproved post: the name of the poster should be in logs
 2014-05-01 21:46:34 -05:00
Nathaniel Guse
730b73dab7 Merge branch 'develop-ascraeus' into develop 
# By Cesar G
# Via Cesar G (1) and Nathaniel Guse (1)
* develop-ascraeus:
  [ticket/11339] Always clear timeout functions on subsequent AJAX calls
 2014-05-01 21:36:25 -05:00
Nathaniel Guse
621023e4ae Merge remote-tracking branch 'remotes/prototech/ticket/11339' into develop-ascraeus 
# By Cesar G
# Via Cesar G
* remotes/prototech/ticket/11339:
  [ticket/11339] Always clear timeout functions on subsequent AJAX calls
 2014-05-01 21:35:40 -05:00
PayBas
5ec67ed248 [ticket/12442] More heading classes 
I think that about finishes the most important one

PHPBB3-12442
 2014-04-30 09:44:28 +02:00
Joas Schilling
be2b80e82b Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12186] Move PM reports below post reports while installing for ascraeus
  [ticket/12186] Move PM reports below post reports while installing
 2014-04-29 21:29:43 +02:00
Joas Schilling
83cdad77ec Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
 2014-04-29 21:29:29 +02:00
Joas Schilling
1ba6a45a78 Merge pull request #2362 from n-aleha/ticket/12186a 
[ticket/12186] Move PM reports below post reports while installing for ascraeus

* n-aleha/ticket/12186a:
  [ticket/12186] Move PM reports below post reports while installing for ascraeus
  [ticket/12186] Move PM reports below post reports while installing
 2014-04-29 21:29:18 +02:00
Joas Schilling
06e9d8871c Merge pull request #2319 from n-aleha/ticket/12186 
[ticket/12186] Move PM reports below post reports while installing

* n-aleha/ticket/12186:
  [ticket/12186] Move PM reports below post reports while installing
 2014-04-29 21:28:54 +02:00
Joas Schilling
2fff767fd4 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code.
 2014-04-29 20:41:15 +02:00
Joas Schilling
417a0d0ea6 Merge pull request #2366 from bantu/ticket/12458 
[ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code

* bantu/ticket/12458:
  [ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code.
 2014-04-29 20:40:06 +02:00
Andreas Fischer
89391dec08 [ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code. 
* There MUST NOT be trailing whitespace at the end of lines.
* There MUST NOT be whitespace before the first content of a file.
* There MUST NOT be whitespace after the last content of a file.
* Functions MUST NOT contain multiple empty lines in a row.

PHPBB3-12458
 2014-04-29 17:51:21 +02:00
Andreas Fischer
aa6acfb00c Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12456] Add , after the last array element
  [ticket/12456] Fix duplicated empty lines in language files
  [ticket/12456] Fix missing new lines at the end of email templates
 2014-04-29 17:09:04 +02:00
Andreas Fischer
40351fae96 Merge pull request #2364 from nickvergessen/ticket/12456 
[ticket/12456] Missing new lines at the end of file in language files

* nickvergessen/ticket/12456:
  [ticket/12456] Add , after the last array element
  [ticket/12456] Fix duplicated empty lines in language files
  [ticket/12456] Fix missing new lines at the end of email templates
 2014-04-29 17:08:49 +02:00
Joas Schilling
23b3667978 [ticket/12456] Add , after the last array element 
PHPBB3-12456
 2014-04-29 16:24:51 +02:00
Joas Schilling
38f05750b7 [ticket/12456] Fix duplicated empty lines in language files 
PHPBB3-12456
 2014-04-29 15:44:17 +02:00
Joas Schilling
cec060bb9b [ticket/12456] Fix missing new lines at the end of email templates 
PHPBB3-12456
 2014-04-29 15:43:55 +02:00
Joas Schilling
7f90ff70ac [ticket/12273] Move $extension to constructor so the path is always set 
PHPBB3-12273
 2014-04-28 23:52:48 +02:00
Joas Schilling
2d5bae555d [ticket/12273] Find events.md relative from the path not the phpbb root 
PHPBB3-12273
 2014-04-28 23:15:38 +02:00
Joas Schilling
8d9fb27edc [ticket/12273] Do not look in extensions docs/ and tests/ directory 
PHPBB3-12273
 2014-04-28 23:11:40 +02:00
Nicofuma
7af9f41e4f [ticket/12025] Fixing the condition.... 
PHPBB3-12025
 2014-04-28 21:18:01 +02:00
Joas Schilling
f57df8e12e [ticket/12273] Also check file for adm "Location:" events 
PHPBB3-12273
 2014-04-28 21:14:29 +02:00
Joas Schilling
b28c8aebaa [ticket/12273] Do not allow template events in non-html files 
PHPBB3-12273
 2014-04-28 21:10:08 +02:00
Joas Schilling
da6eb0282d [ticket/12273] Fix return description 
PHPBB3-12273
 2014-04-28 21:08:48 +02:00
Joas Schilling
2928effb3c [ticket/12273] Update exporter to allow specifying an extension 
PHPBB3-12273
 2014-04-28 21:04:36 +02:00
Joas Schilling
ed669982c2 [ticket/12273] Allow to filter events for extensions 
PHPBB3-12273
 2014-04-28 21:03:59 +02:00
Nicofuma
5c33c20186 [ticket/12445] Change the formulation 
PHPBB3-12445
 2014-04-28 18:44:56 +02:00
Joas Schilling
bf8b9f0143 [ticket/12273] Remove old parameter from function call 
PHPBB3-12273
 2014-04-28 00:06:14 +02:00
Joas Schilling
35f8b7f5ea [ticket/12273] Fix table header for adm events 
PHPBB3-12273
 2014-04-27 23:54:12 +02:00
Joas Schilling
dbac4bb5c0 [ticket/12273] Add root path to recursive_event_filter_iterator 
PHPBB3-12273
 2014-04-27 23:51:06 +02:00
Joas Schilling
e934cefe80 [ticket/12273] Fix missing classes in export_events_for_wiki.php 
PHPBB3-12273
 2014-04-27 23:50:02 +02:00
Nicofuma
8facf2b8d9 [ticket/12025] Don't show any error on preview if the message is empty 
PHPBB3-12025
 2014-04-27 23:11:10 +02:00
n-aleha
ac8ce42a12 [ticket/12186] Move PM reports below post reports while installing for ascraeus 
In mcp, move PM reports below post reports while installing.

PHPBB3-12186
 2014-04-27 22:44:41 +03:00
n-aleha
edeeaa03c1 Merge branch 'ticket/12186' into ticket/12186a 2014-04-27 22:29:37 +03:00
Joas Schilling
2bd13eb054 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12097] Bug fix and adding unit test
  [ticket/12097] Validate_data() should work with class method
 2014-04-27 20:44:01 +02:00
Joas Schilling
0b6accf1ac Merge pull request #2359 from Nicofuma/ticket/12097 
[ticket/12097] Validate_data() should work with class method

* Nicofuma/ticket/12097:
  [ticket/12097] Bug fix and adding unit test
  [ticket/12097] Validate_data() should work with class method
 2014-04-27 20:43:03 +02:00
Nicofuma
ea15b879f1 [ticket/12432] Correcting the assertion 
PHPBB3-12432
 2014-04-26 18:54:47 +02:00
Nicofuma
7b8a8a2a5d [ticket/12444] Replacing spaces with tabs 
PHPBB3-12444
 2014-04-26 18:52:26 +02:00
Matt Friedman
7d5672f6c5 [ticket/12332] Adjust size of mark column where too wide 
PHPBB3-12332
 2014-04-26 09:50:45 -07:00
Matt Friedman
76843f4a3a [ticket/12332] Adjust column widths for responsive changes 
PHPBB3-12332
 2014-04-26 09:25:59 -07:00
Joas Schilling
0b32860e90 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12406] Fix variable description of core.viewtopic_modify_page_title
 2014-04-26 18:18:33 +02:00
Joas Schilling
42e29daa1f Merge pull request #2325 from n-aleha/ticket/12406 
[ticket/12406] Fix variable description of core.viewtopic_modify_page_ti...

* n-aleha/ticket/12406:
  [ticket/12406] Fix variable description of core.viewtopic_modify_page_title
 2014-04-26 18:18:18 +02:00
Matt Friedman
92fa39b79d [ticket/12332] Restore some changes back to original state 
PHPBB3-12332
 2014-04-26 09:18:14 -07:00