1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00

17896 Commits

Author SHA1 Message Date
Marcus Vinny
83092e0269 [ticket/11804] Remove </li> from overall_header which was not open
PHPBB3-11804
2013-08-20 04:25:06 -03:00
Andreas Fischer
edb0f61124 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11802] replace $browser with $user->browser

Conflicts:
	phpBB/download/file.php
2013-08-20 00:50:58 +02:00
Andreas Fischer
7893e992ff Merge branch 'prep-release-3.0.12' into develop-olympus
* prep-release-3.0.12:
  [ticket/11802] replace $browser with $user->browser
2013-08-20 00:47:21 +02:00
Andreas Fischer
ba9d303d52 Merge remote-tracking branch 'dhruvgoel92/ticket/11802' into prep-release-3.0.12
* dhruvgoel92/ticket/11802:
  [ticket/11802] replace $browser with $user->browser
2013-08-20 00:46:33 +02:00
Dhruv
aa3d2ef7a9 [ticket/11802] replace $browser with $user->browser
PHPBB3-11802
2013-08-20 04:14:20 +05:30
Andreas Fischer
c6f56f5149 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11801] removed some whitespace and added missing semi colon's in css

Conflicts:
	phpBB/styles/prosilver/theme/colours.css
2013-08-19 20:48:17 +02:00
Andreas Fischer
8c69db6ab2 Merge remote-tracking branch 'Prosk8er/ticket/11801' into develop-olympus
* Prosk8er/ticket/11801:
  [ticket/11801] removed some whitespace and added missing semi colon's in css
2013-08-19 20:45:34 +02:00
Dhruv
f7b967dc5a Merge remote-tracking branch 'Elsensee/ticket/11760' into develop
# By Oliver Schramm
# Via Oliver Schramm
* Elsensee/ticket/11760:
  [ticket/11760] Use phpbb_version_compare() wrapper
2013-08-19 23:28:53 +05:30
Prosk8er
f61db86b8d [ticket/11801] removed some whitespace and added missing semi colon's in css
PHPBB3-11801
2013-08-19 13:31:30 -04:00
Andreas Fischer
3cc0a4149f Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11789] Remove inline color in memberlist_view

Conflicts:
	phpBB/styles/subsilver2/template/memberlist_view.html
2013-08-18 17:10:26 +02:00
Andreas Fischer
78f1e11aeb Merge remote-tracking branch 'cyberalien/ticket/11789' into develop-olympus
* cyberalien/ticket/11789:
  [ticket/11789] Remove inline color in memberlist_view
2013-08-18 17:08:14 +02:00
Vjacheslav Trushkin
6f566fdaf0 [ticket/11789] Remove inline color in memberlist_view
PHPBB3-11789
2013-08-18 10:56:16 +03:00
Andreas Fischer
09f547e373 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11789] Remove colors from HTML code

Conflicts:
	phpBB/styles/subsilver2/template/ucp_pm_history.html
2013-08-18 03:07:32 +02:00
Andreas Fischer
20fb220b4f Merge remote-tracking branch 'cyberalien/ticket/11789' into develop-olympus
* cyberalien/ticket/11789:
  [ticket/11789] Remove colors from HTML code
2013-08-18 03:00:42 +02:00
Andreas Fischer
8fd49f9df8 Merge remote-tracking branch 'cyberalien/ticket/11796' into develop
* cyberalien/ticket/11796:
  [ticket/11796] Replace pagination with pagination.html
2013-08-18 02:50:32 +02:00
Andreas Fischer
5bb02647e6 Merge remote-tracking branch 'cyberalien/ticket/11779' into develop
* cyberalien/ticket/11779:
  [ticket/11779] Fix unapproved messages class name
2013-08-18 02:37:07 +02:00
Andreas Fischer
a808c4f9c9 Merge remote-tracking branch 'cyberalien/ticket/11800' into develop
* cyberalien/ticket/11800:
  [ticket/11800] Fix scripts variable in subsilver simple_footer
  [ticket/11800] Fix JavaScript in simple_footer.html
  [ticket/11800] Remove forum_fn from memberlist_search.html
2013-08-18 02:02:44 +02:00
Andreas Fischer
55d911a2fd Merge remote-tracking branch 'cyberalien/ticket/11754' into develop
* cyberalien/ticket/11754:
  [ticket/11754] Remove styleswitcher leftovers
2013-08-18 01:55:56 +02:00
Dhruv
c54f1faf59 Merge remote-tracking branch 'VSEphpbb/ticket/11784' into develop
# By Matt Friedman
# Via Matt Friedman
* VSEphpbb/ticket/11784:
  [ticket/11784] Remove naming redundancy for event listeners
2013-08-18 01:09:33 +05:30
Vjacheslav Trushkin
9174788762 [ticket/11800] Fix scripts variable in subsilver simple_footer
PHPBB3-11800
2013-08-17 19:21:10 +03:00
Vjacheslav Trushkin
487822d12f [ticket/11800] Fix JavaScript in simple_footer.html
Include forum_fn.js via INCLUDEJS
Move $SCRIPTS after footer event, allowing extensions to include scripts
Use correct template variable for including scripts

PHPBB3-11800
2013-08-17 19:18:25 +03:00
Vjacheslav Trushkin
0ed7bd8a5b [ticket/11800] Remove forum_fn from memberlist_search.html
PHPBB3-11800
2013-08-17 19:17:17 +03:00
Andreas Fischer
772494af7e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11794] Add missing array element commas to docs/coding-guidelines.html
2013-08-16 18:04:52 +02:00
Andreas Fischer
afb6800b59 Merge remote-tracking branch 'rechosen/ticket/11794' into develop-olympus
* rechosen/ticket/11794:
  [ticket/11794] Add missing array element commas to docs/coding-guidelines.html
2013-08-16 18:02:09 +02:00
Vjacheslav Trushkin
87dd739a84 [ticket/11796] Replace pagination with pagination.html
PHPBB3-11796
2013-08-16 18:52:07 +03:00
rechosen
48f6f4559c [ticket/11794] Add missing array element commas to docs/coding-guidelines.html
Even though the coding guidelines document prescribes "commas after every
array element", it contains several example code fragments with array elements
not terminated by a comma. This commit fixes that.

PHPBB3-11794
2013-08-16 17:48:36 +02:00
Andreas Fischer
96789df962 Merge remote-tracking branch 'cyberalien/ticket/11770' into develop
* cyberalien/ticket/11770:
  [ticket/11770] Fix class name for pm list
2013-08-15 02:24:17 +02:00
Andreas Fischer
1ac1b9b7ee Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11775] Fix doc blocks syntax
  [ticket/11775] Remove spaces at line ends
  [ticket/11775] Split test into multiple steps
  [ticket/11775] Add functional test for moving the last post
  [ticket/11775] Backport moving of the posting functions to 3.0
  [ticket/11775] Fix error when moving the last post to another topic

Conflicts:
	tests/test_framework/phpbb_functional_test_case.php
2013-08-15 01:40:08 +02:00
Andreas Fischer
d089f9693a Merge branch 'prep-release-3.0.12' into develop-olympus
* prep-release-3.0.12:
  [ticket/11775] Fix doc blocks syntax
  [ticket/11775] Remove spaces at line ends
  [ticket/11775] Split test into multiple steps
  [ticket/11775] Add functional test for moving the last post
  [ticket/11775] Backport moving of the posting functions to 3.0
  [ticket/11775] Fix error when moving the last post to another topic
2013-08-15 01:37:56 +02:00
Andreas Fischer
b08928ee1c Merge remote-tracking branch 'nickvergessen/ticket/11775' into prep-release-3.0.12
* nickvergessen/ticket/11775:
  [ticket/11775] Fix doc blocks syntax
  [ticket/11775] Remove spaces at line ends
  [ticket/11775] Split test into multiple steps
  [ticket/11775] Add functional test for moving the last post
  [ticket/11775] Backport moving of the posting functions to 3.0
  [ticket/11775] Fix error when moving the last post to another topic
2013-08-15 01:37:40 +02:00
Joas Schilling
c30d4025d2 [ticket/11775] Fix doc blocks syntax
PHPBB3-11775
2013-08-15 01:36:38 +02:00
Joas Schilling
4b0adfcff5 [ticket/11775] Remove spaces at line ends
PHPBB3-11775
2013-08-15 01:35:02 +02:00
Vjacheslav Trushkin
9c299b0e83 [ticket/11789] Remove colors from HTML code
PHPBB3-11789
2013-08-14 19:09:27 +03:00
Matt Friedman
65d8cd6302 [ticket/11784] Remove naming redundancy for event listeners
PHPBB3-11784
2013-08-13 02:14:22 -07:00
Joas Schilling
63535b196d [ticket/11775] Split test into multiple steps
PHPBB3-11775
2013-08-12 15:38:20 +02:00
Joas Schilling
585f692e31 Merge pull request #1643 from rechosen/ticket/11777
[ticket/11777] Search for template listeners in the php event listeners way
2013-08-12 06:37:47 -07:00
Andreas Fischer
f6c6122eed Merge remote-tracking branch 'cyberalien/ticket/11781' into develop
* cyberalien/ticket/11781:
  [ticket/11781] Include func update_post_information()
2013-08-12 12:57:43 +02:00
Andreas Fischer
9f8fffc54a Merge remote-tracking branch 'cyberalien/ticket/11780' into develop
* cyberalien/ticket/11780:
  [ticket/11780] Remove references to unused images
  [ticket/11780] Remove unused images
2013-08-12 12:43:38 +02:00
rechosen
4b1c5879eb [ticket/11777] Fix new test for loop variables in extension template listeners
With the merge of https://github.com/phpbb/phpbb3/pull/1564 a new test has
been added. Renamed and moved the template listener file of that test to
comply with the new requirements.

PHPBB3-11777
2013-08-12 10:21:40 +02:00
rechosen
08e6c61180 [ticket/11777] Require a suffix of '_listener' on extension template listeners
To further mirror the file name and location requirements for php template
event listeners, require extension template event listener files to follow the
'<event name>_listener.html' naming format.

PHPBB3-11777
2013-08-12 09:59:11 +02:00
rechosen
7f76c9f9c7 [ticket/11777] Rename the extension template listener subdirectory to 'event/'
Per suggestion of EXreaction and nickvergessen, do not look for extension
template event listeners in styles/[style]/template/events/ but in
styles/[style]/template/event/ (without the trailing 's') to match the way
phpBB looks for php template event listeners.

PHPBB3-11777
2013-08-12 09:59:11 +02:00
rechosen
e1c9a87586 [ticket/11777] Move the testing template events to 'events/' subdirectories
The tests written for extension template events did not follow the convention
and documentation of placing template event files in the events/ subdirectory.
Moved the files to this subdirectory so the tests succeed again.

PHPBB3-11777
2013-08-12 09:59:10 +02:00
rechosen
49824a0fd3 [ticket/11777] Add subdirectory 'events/' to the template event search path
Makes the twig template engine look in the events/ subdirectory instead of the
main styles/[style]/template/ directory for extension template events. Note
that it does _not_ look recursively!

PHPBB3-11777
2013-08-12 09:59:10 +02:00
Vjacheslav Trushkin
a0206a61bc [ticket/11781] Include func update_post_information()
Include functions_posting before using functions defined in that file

PHPBB3-11781
2013-08-11 11:31:02 +03:00
Vjacheslav Trushkin
fe97611eac [ticket/11780] Remove references to unused images
PHPBB3-11780
2013-08-11 10:51:37 +03:00
Vjacheslav Trushkin
fe3b57a141 [ticket/11780] Remove unused images
PHPBB3-11780
2013-08-11 10:51:16 +03:00
Vjacheslav Trushkin
0aea5e48d8 [ticket/11779] Fix unapproved messages class name
PHPBB3-11779
2013-08-11 10:37:29 +03:00
Nathan Guse
c9cd7412f2 Merge pull request #1633 from nickvergessen/ticket/11751
[ticket/11751] Add mcp modules for softdelete  on update
2013-08-09 12:08:36 -07:00
Joas Schilling
e399dc162b Merge remote-tracking branch 'EXreaction/ticket/11701' into develop
* EXreaction/ticket/11701:
  [ticket/11701] New line at EOF
  [ticket/11701] Test events in loops
  [ticket/11701] Refix regex for appending |length
  [ticket/11701] Fix regex for appending |length
  [ticket/11701] Fix loops var check
  [ticket/11701] Remove useless str_replace
  [ticket/11701] Loop variables are not passed correctly to events
2013-08-09 17:25:00 +02:00
Joas Schilling
a9b5e77e68 [ticket/11775] Add functional test for moving the last post
PHPBB3-11775
2013-08-09 00:41:28 +02:00