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

16832 commits

This branch
This branch
All branches
Author SHA1 Message Date
Oleg Pudeyev
c34ee343ba [ticket/10843] Backport changes to install language. 
PHPBB3-10688
PHPBB3-10843
 2012-05-05 16:08:37 -04:00
Oleg Pudeyev
58842b5ca8 [ticket/10834] Backport general development language changes to 3.0. 
PHPBB3-10688
PHPBB3-10834
 2012-05-05 16:05:55 -04:00
Andreas Fischer
cb02dfda96 Merge remote-tracking branch 'brunoais/ticket/10871' into develop 
* brunoais/ticket/10871:
  [ticket/10871] Delete the unwanted implode
 2012-05-04 21:28:16 +02:00
Bruno Ais
fce0c5d436 [ticket/10871] Delete the unwanted implode 
Deleted the implode that had no reason to be there

PHPBB3-10871
 2012-05-04 20:08:42 +01:00
Nils Adermann
859c3ca7d5 Merge pull request #791 from erikfrerejean/task/10869 
[task/10869] Remove PHP 5.2 check from .travis.yml
 2012-05-03 16:22:04 -07:00
Erik Frèrejean
0e906f2575 [task/10869] Remove PHP 5.2 check from .travis.yml 
The travis configuration file contains a statement that checks whether
the test is ran against PHP 5.2 but as that version isn't tested at
all the check can be removed.

PHPBB3-10869
 2012-05-04 00:13:27 +02:00
Callum Macrae
06efa6c0be [ticket/10855] Added JS camelCaps info to guidelines. 
PHPBB3-10855
 2012-05-03 22:34:35 +01:00
Callum Macrae
ee2e2cb2c3 [ticket/10855] Added array trailing commas info in js to guidelines. 
PHPBB3-10855
 2012-05-03 22:30:22 +01:00
Andreas Fischer
7426c7a97f Merge remote-tracking branch 'nickvergessen/ticket/10818' into develop 
* nickvergessen/ticket/10818:
  [ticket/10818] Global Announcements Update Dialog should call exit_handler()
 2012-05-03 01:22:31 +02:00
Joas Schilling
ed67dcf3d8 [ticket/10818] Global Announcements Update Dialog should call exit_handler() 
PHPBB3-10818
 2012-05-02 21:12:18 +02:00
Bruno Ais
593ef78859 [ticket/10845] Remove censor from text 
In order to remove the censor, I added a new parameter to
generate_text_for_display(), that new parameter is used to tell if the text
should be censored or not. Defaults to true.

PHPBB3-10845
 2012-05-02 17:13:39 +01:00
Andreas Fischer
beda22c0b1 Merge remote-tracking branch 'mvinny/ticket/10778' into develop 
* mvinny/ticket/10778:
  [ticket/10778] Remove extra space from close link in prosilver smilies window
 2012-05-01 19:57:11 +02:00
Vinny
7294c71431 [ticket/10778] Remove extra space from close link in prosilver smilies window 
PHPBB3-10778
 2012-05-01 14:41:02 -03:00
Vjacheslav Trushkin
63b41913a4 [ticket/10799] Removing global variable from includejs 
Removing global $phpbb_root_path from includejs implementation

PHPBB3-10799
 2012-05-01 18:25:11 +03:00
Vjacheslav Trushkin
5114edcafe [ticket/10800] Changing html to js for includejs tests 
Changing .html to .js files for includejs tests

PHPBB3-10800
 2012-05-01 17:41:46 +03:00
Andreas Fischer
81af5c95ed Merge remote-tracking branch 'Senky/ticket/10847' into develop 
* Senky/ticket/10847:
  [ticket/10847] fixing all misspelled "dependant" to "dependent"
 2012-05-01 13:47:31 +02:00
Bruno Ais
06f4ef8852 [ticket/10845] Now it shows the preview post parsed 
With this addition, the preview post in the report details now shows with the
BBCode parsed.

Note: Tested with all BBCodes I have including one personalised to write the <s>
BBCode.

PHPBB3-10845
 2012-05-01 12:44:34 +01:00
Bruno Ais
f3e5acf377 [ticket/10845] Changed the report system. Now it saves posts with the bbcode 
Now the bitfield and uid of the bbcode is saved in the reports table.
This will allow parsing the BBCode while loading the post to show

PHPBB3-10845
 2012-05-01 12:44:16 +01:00
Andreas Fischer
52c7193ad0 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10846] fixing SQL query bug in acp_main.php
 2012-05-01 13:38:25 +02:00
Andreas Fischer
8cb0e30afc Merge remote-tracking branch 'Senky/ticket/10846' into develop-olympus 
* Senky/ticket/10846:
  [ticket/10846] fixing SQL query bug in acp_main.php
 2012-05-01 13:38:11 +02:00
Senky
2dd71f6520 [ticket/10835] fixing misleading message in UCP 
PHPBB3-10835
 2012-05-01 09:52:48 +02:00
Senky
665f38d42f [ticket/10846] fixing SQL query bug in acp_main.php 
PHPBB3-10846
 2012-04-30 22:01:53 +02:00
Senky
b83fa0349a [ticket/10847] fixing all misspelled "dependant" to "dependent" 
PHPBB3-10847
 2012-04-30 21:55:24 +02:00
Callum Macrae
3978e2620e [ticket/10855] Modified coding guidelines to reflect JS brace changes. 
Braces always go on the same line in JavaScript.

PHPBB3-10855
 2012-04-29 19:07:48 +01:00
Joas Schilling
53a47fdcc3 [ticket/10811] Make subscribe/unsubscribe repeatable with AJAX 
PHPBB3-10811
 2012-04-29 12:33:55 +02:00
Vjacheslav Trushkin
51347ebc09 [ticket/10800] Changing template paths in tests 
Changing template paths in tests from absolute to relative

PHPBB3-10800
 2012-04-29 00:30:08 +03:00
Sajaki
a9cf558af7 [ticket/10854] sql server drop default constraint when dropping column 
drops default columns with T-SQL before attempting drop column to
avoids sql exception.  This is a huge annoyance in UMIL scripts running
under sql server.
 2012-04-28 10:43:43 +02:00
galaxyAbstractor
8d45901657 [ticket/10849] Added missing helptext for listitem 
Added the missing helptext for list item in subsilver2.

PHPBB3-10849
 2012-04-27 22:19:41 +02:00
Oleg Pudeyev
2a92fee06d Merge PR #753 branch 'Senky/ticket/10161' into develop 
* Senky/ticket/10161:
  [ticket/10161] added fullstop to the end of sentence
  [ticket/10161] coding-guidelines.html updated
  [ticket/10161] all "e-mail" strings in language files changed to "email"
 2012-04-26 22:57:30 -04:00
Oleg Pudeyev
cd6f6d2813 Merge PR #771 branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10836] Check if avatar directory is writable after install
  [ticket/10836] Enable avatars by default at install
 2012-04-26 22:25:26 -04:00
Oleg Pudeyev
3a67604900 Merge PR #771 branch 'galaxyAbstractor/ticket/10836' into develop-olympus 
* galaxyAbstractor/ticket/10836:
  [ticket/10836] Check if avatar directory is writable after install
  [ticket/10836] Enable avatars by default at install
 2012-04-26 22:08:42 -04:00
Senky
0858a8023b [ticket/10161] added fullstop to the end of sentence 
PHPBB3-10161
 2012-04-26 09:20:33 +02:00
Senky
02cc32b901 [ticket/10161] coding-guidelines.html updated 
PHPBB3-10161
 2012-04-26 09:19:51 +02:00
Oleg Pudeyev
5b48df4168 [feature/prune-users] Move quote to the correct line. 
PHPBB3-9622
 2012-04-25 19:41:50 -04:00
Oleg Pudeyev
7d92cccf74 Merge PR #731 branch 'VSEphpbb/ticket/10779' into develop 
* VSEphpbb/ticket/10779:
  [ticket/10779] Move jQuery CDN option to Load Settings
 2012-04-25 17:52:24 -04:00
galaxyAbstractor
1a8db76a20 [ticket/10836] Check if avatar directory is writable after install 
Check if the avatar directory is writeable after the installation is complete.
If it isn't, disable avatars and avatar uploading by default.

PHPBB3-10836
 2012-04-25 11:49:06 +02:00
David King
b82c77b38f [task/functional] Make sure missing language values are handled properly 
PHPBB3-10758
 2012-04-24 14:10:50 -04:00
David King
8cf0b79a47 [task/functional] Increase code coverage for functional tests 
PHPBB3-10758
 2012-04-23 17:16:16 -04:00
galaxyAbstractor
a21b367b21 [ticket/10836] Enable avatars by default at install 
Enables avatars and local avatar upload by default.

PHPBB3-10836
 2012-04-21 14:16:55 +02:00
Nils Adermann
417caa649a Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10492] Fix line endings
  [ticket/10492] Backporting functional tests
  [ticket/10492] Separate config generation from the installer

Conflicts:
	phpBB/includes/functions_install.php
	phpunit.xml.functional
	tests/bootstrap.php
	tests/test_framework/phpbb_functional_test_case.php
	tests/test_framework/phpbb_test_case_helpers.php
 2012-04-21 12:36:40 +02:00
Nils Adermann
cdf7ff1797 Merge remote-tracking branch 'github-noxwizard/ticket/10492' into develop-olympus 
* github-noxwizard/ticket/10492:
  [ticket/10492] Fix line endings
  [ticket/10492] Backporting functional tests
  [ticket/10492] Separate config generation from the installer
 2012-04-21 12:31:43 +02:00
Patrick Webster
6293bbf099 [ticket/10492] Fix line endings 
PHPBB3-10492
 2012-04-21 05:24:57 -05:00
Patrick Webster
2aa994b5ad [ticket/10492] Backporting functional tests 
PHPBB3-10492
 2012-04-21 04:37:57 -05:00
Patrick Webster
de70b17b1d [ticket/10492] Separate config generation from the installer 
PHPBB3-10492
 2012-04-20 23:50:49 -05:00
Nils Adermann
13a00ee8cb Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10815] enables feed feature by default for a fresh install
 2012-04-20 20:13:17 +02:00
Nils Adermann
29a6aec9ad Merge remote-tracking branch 'github-dhruv/ticket/10815' into develop-olympus 
* github-dhruv/ticket/10815:
  [ticket/10815] enables feed feature by default for a fresh install
 2012-04-20 20:13:00 +02:00
Dhruv Goel
4788705a9a [ticket/10815] enables feed feature by default for a fresh install 
PHPBB3-10815
 2012-04-20 23:30:01 +05:30
Andreas Fischer
70cba47871 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10767] Clarify what happens at the end of the hook.
  [ticket/10767] Use warning/error language as appropriate.
  [ticket/10767] Default to non-fatal behavior.
  [ticket/10767] Revert unconditional unfatality in commit-msg hook.
 2012-04-20 14:55:03 +02:00
Andreas Fischer
31fbc40a09 Merge remote-tracking branch 'p/ticket/10767' into develop-olympus 
* p/ticket/10767:
  [ticket/10767] Clarify what happens at the end of the hook.
  [ticket/10767] Use warning/error language as appropriate.
  [ticket/10767] Default to non-fatal behavior.
  [ticket/10767] Revert unconditional unfatality in commit-msg hook.
 2012-04-20 14:54:55 +02:00
Andreas Fischer
4df8afd27e Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10812] Disabled register_globals check in PHP 5.4
 2012-04-20 14:41:20 +02:00