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

1868 Commits

Author SHA1 Message Date
Callum Macrae
0e55b2393d [ticket/10270] Removed all the inline language and HTML from the JS.
PHPBB3-10270
2012-03-31 02:09:17 +02:00
Callum Macrae
4ae74cd4b4 [ticket/10271] AJAXified buttons on acp_main.
PHPBB3-10271
2012-03-31 02:09:15 +02:00
Callum Macrae
1cb3b595ec [ticket/10271] AJAXified the styles tab in the ACP.
PHPBB3-10271
2012-03-31 02:09:15 +02:00
Callum Macrae
11112314f7 [ticket/10271] AJAXified various deletions in the ACP.
The following places have had deletion AJAXified:
* Smilies and icons
* Word censors
* BBCodes
* Attachment groups
* Groups
* Admin / User / Moderator / Forum roles
* Report / denial reasons
* Module management
* Custom profile fields

PHPBB3-10271
2012-03-31 02:09:15 +02:00
Callum Macrae
420de9c9a0 [ticket/10270] Moved some HTML from the JavaScript to overall_footer.
PHPBB3-10270
2012-03-31 02:09:14 +02:00
Callum Macrae
8a28456f75 [ticket/10273] AJAXified approve / disapprove posts (in viewtopic).
This commit AJAXifies the moderator approval functionality, and adds it to
viewtopic instead of the MCP. This commit has involved some language changes,
which may affect fallbacks.

PHPBB3-10273
2012-03-31 02:00:22 +02:00
Vjacheslav Trushkin
f15167bcfa Merge remote-tracking branch 'imkingdavid/ticket/10727' into develop
* imkingdavid/ticket/10727:
  [ticket/10727] Do not hide Quick Reply with javascript on prosilver
2012-03-31 00:22:04 +03:00
David King
29a904ce45 Merge branch 'develop-olympus' into develop
Conflicts:
	phpBB/language/en/acp/common.php
2012-03-29 20:43:03 -04:00
Igor Wiedler
7258794be3 Merge remote-tracking branch 'imkingdavid/ticket/10586' into develop
* imkingdavid/ticket/10586:
  [ticket/10586] Added space in if statement
  [ticket/10586] Tidy up comments
  [ticket/10586] Tests finally work (thanks naderman)
  [ticket/10586] Correctly purge board cache and don't rename install directory
  [ticket/10586] trying to get tests to work
  [ticket/10586] more work on getting tests to pass
  [ticket/10586] Tests are coming along, just a little more to go
  [ticket/10586] Rename install directory back to install/ after tests
  [ticket/10586] browse tests now work, but mine dont. at least we are making progress
  [ticket/10586] initial work on copying fixtures. Note that this depends on 10706
  [ticket/10586] Adding the extensions used by the tests
  [ticket/10586] Now tests run, but fail. But here is what I have.
  [ticket/10586] some bootstrap additions and test changes to try and make it work
  [ticket/10586] test stuff. does not work yet, still need to put phpBB objects in bootstrap.php
  [ticket/10586] Copy/paste fail fixed
  [ticket/10586] Sanitize periods from class names, use manager to get path.
  [ticket/10586] Removed file_exists() check because class_exists() covers that.
  [ticket/10586] Extension front controller
2012-03-28 21:36:07 +02:00
David King
75e731e14b [task/php5.3] Changed minimum PHP requirement for Ascraeus to 5.3.2
PHPBB3-10693
2012-03-25 21:20:52 -04:00
David King
cfb8f01040 [ticket/10727] Do not hide Quick Reply with javascript on prosilver
PHPBB3-10727
2012-03-24 22:03:03 -04:00
HTF
2768db44f5 [ticket/10129] Remove apostrophes and plurals in ACP user management -> permissions language file as per ticket.
PHPBB3-10129
2012-03-24 15:13:04 +00:00
David King
a0131b45f5 [ticket/10586] Extension front controller
Handle extension front pages

PHPBB3-10586
2012-03-19 09:12:31 -04:00
Joas Schilling
33dce916e2 [ticket/10690] Fix undefined UNAPPROVED_POSTS_ZERO_TOTAL in queue
PHPBB3-10690
2012-03-14 22:22:22 +01:00
Andreas Fischer
3850b05fbb Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/7432] Delete redundant reference to "appropriate menu item".
  [ticket/7432] Explain what users are inactive in more detail.
2012-03-09 23:43:11 +01:00
Andreas Fischer
aee79c6cdb Merge remote-tracking branch 'p/ticket/7432' into develop-olympus
* p/ticket/7432:
  [ticket/7432] Delete redundant reference to "appropriate menu item".
  [ticket/7432] Explain what users are inactive in more detail.
2012-03-09 23:41:43 +01:00
Oleg Pudeyev
89a0cbc57e [ticket/7432] Delete redundant reference to "appropriate menu item".
PHPBB3-7432
2012-03-07 18:00:57 -05:00
Andreas Fischer
74dfea22a1 Merge remote-tracking branch 'p/ticket/10618' into develop
* p/ticket/10618:
  [ticket/10618] Change phpBB 3 to phpBB 3.1.
  [ticket/10618] Replace phpBB 3.0 with phpBB 3 for 3.1.
2012-03-07 12:56:32 +01:00
Oleg Pudeyev
6e207e3f69 [ticket/10618] Change phpBB 3 to phpBB 3.1.
PHPBB3-10618
2012-03-06 19:42:33 -05:00
David King
2929d345ab Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9914] Add backup warning to updater.
2012-02-03 17:00:09 -05:00
Oleg Pudeyev
cddd63aae0 Merge remote-tracking branch 'imkingdavid/ticket/10535' into develop
* imkingdavid/ticket/10535:
  [ticket/10535] Delete no longer needed email confirm language entries.
  [ticket/10535] Delete email confirm from installer
  [ticket/10535] Removed email confirm field from acp_users module
  [ticket/10535] Forgot a subsilver2 change. *doh*
  [ticket/10535] Removed email confirm from UCP, removed unused language entries
  [ticket/10535] Remove email confirm check on registration form
2012-02-03 16:21:51 -05:00
Oleg Pudeyev
ccf0cf649d [ticket/10535] Delete no longer needed email confirm language entries.
PHPBB3-10535
2012-02-03 16:14:56 -05:00
Oleg Pudeyev
d035dc3eef [ticket/10618] Replace phpBB 3.0 with phpBB 3 for 3.1.
PHPBB3-10618
2012-02-03 16:00:03 -05:00
Michael Cullum
225892f506 [ticket/9914] Add backup warning to updater.
PHPBB3-9914
2012-02-03 16:14:48 +00:00
Oleg Pudeyev
466acfdd94 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10563] Show deactivated styles below active styles in acp
2012-01-06 02:46:52 -05:00
Vjacheslav Trushkin
23363efaaa [ticket/10563] Show deactivated styles below active styles in acp
Separates active and deactivated styles in styles list in acp

PHPBB3-10563
2012-01-02 21:07:40 +02:00
Unknown
656a8ece6f [ticket/9916] Updating header license and removing Version $Id$
PHPBB3-9916
2012-01-02 19:10:27 +01:00
Unknown
7a04c9048c [ticket/9916] Updating header license and removing Version $Id$
PHPBB3-9916
2011-12-31 13:32:52 +00:00
p
fc297a710e [ticket/10535] Delete email confirm from installer
PHPBB3-10535
2011-12-28 14:14:05 +00:00
Oleg Pudeyev
b8ddd32922 [ticket/7432] Explain what users are inactive in more detail.
PHPBB3-7432
2011-12-23 01:45:41 -05:00
David King
d73c3a297e [ticket/10535] Removed email confirm from UCP, removed unused language entries
PHPBB3-10535
2011-12-15 23:15:24 +00:00
Andreas Fischer
f4f82ac5bd Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10511] Fix a grammar defect in permissions language.
2011-12-08 22:22:29 +01:00
Andreas Fischer
7ae12df3d2 Merge remote-tracking branch 'p/ticket/10511' into develop-olympus
* p/ticket/10511:
  [ticket/10511] Fix a grammar defect in permissions language.
2011-12-08 22:22:22 +01:00
Andreas Fischer
a8ee32a66b Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9876] Distinctly name user and forum roles for newly registered users.
2011-12-08 22:22:06 +01:00
Oleg Pudeyev
5b9c835127 [ticket/9876] Distinctly name user and forum roles for newly registered users.
PHPBB3-9876
2011-12-03 17:44:58 -05:00
Oleg Pudeyev
0ad81a4cdc [ticket/10511] Fix a grammar defect in permissions language.
PHPBB3-10511
2011-12-03 17:42:10 -05:00
Oleg Pudeyev
6027541dc7 Merge remote-tracking branch 'nickvergessen/ticket/develop/10345' into develop
* nickvergessen/ticket/develop/10345: (21 commits)
  [ticket/10345] Check directly whether the key to use exists
  [ticket/10345] Return the language key when the key has an empty array
  [ticket/10345] Document behaviour for floating numbers on phpbb_get_plural_form
  [ticket/10345] Remove doubled check for valid plural rule
  [ticket/10345] Add documentation and phpbb_ prefix to the new avatar functions
  [ticket/10345] Add cases for 1 pixel height on MAX_FLASH and MAX_IMG sizes
  [ticket/10345] Fix parsing error in language/en/viewtopic.php
  [ticket/10345] Move rule determination code into a new function
  [ticket/10345] Fix little type in unit test
  [ticket/10345] Remove more useless 0-cases
  [ticket/10345] Make the use of the 0-case optional
  [ticket/10345] Remove some unused 0 cases
  [ticket/10345] Fix some last use cases of sprintf() to use $user->lang()
  [ticket/10345] Add tests for array() as first parameter on call to $user->lang()
  [ticket/10345] Fix some documentation issues.
  [ticket/10345] Allow float as array key and add some tests
  [ticket/10345] Use the plural function in some more places.
  [ticket/10345] Make use of the plural function in some basic places
  [ticket/10345] Remove '1 hour ago' string which conflicted with plural rules
  [ticket/10345] Fix documentation on the new function and the switch
  ...
2011-12-03 15:39:06 -05:00
Andreas Fischer
af867de77c Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10501] Fix description of table prefixes
2011-11-29 20:09:51 +01:00
Joas Schilling
cb4e72298b [ticket/10501] Fix description of table prefixes
They must start with a letter, not an alphanumeric character

PHPBB3-10501
2011-11-28 11:28:46 +01:00
Joas Schilling
6472a270e0 [ticket/10345] Add cases for 1 pixel height on MAX_FLASH and MAX_IMG sizes
PHPBB3-10345
2011-11-27 21:43:07 +01:00
Joas Schilling
2fac1d4c23 [ticket/10345] Fix parsing error in language/en/viewtopic.php
PHPBB3-10345
2011-11-27 21:41:22 +01:00
Joas Schilling
3788326d71 [ticket/10345] Remove more useless 0-cases
PHPBB3-10345
2011-11-25 15:10:51 -05:00
Joas Schilling
7da6826a67 [ticket/10345] Remove some unused 0 cases
PHPBB3-10345
2011-11-25 15:10:50 -05:00
Joas Schilling
c4aa8d8401 [ticket/10345] Fix some last use cases of sprintf() to use $user->lang()
PHPBB3-10345
2011-11-25 15:10:50 -05:00
Joas Schilling
179662e949 [ticket/10345] Use the plural function in some more places.
I added two function avatar_explanation_string() and avatar_error_wrong_size()
for easier handling of the "pixels"-languages, as they are used quite often.

PHPBB3-10345
2011-11-25 15:10:49 -05:00
Joas Schilling
88ae40a4b1 [ticket/10345] Make use of the plural function in some basic places
PHPBB3-10345
2011-11-25 15:10:44 -05:00
Joas Schilling
0734dd3c42 [ticket/10345] Remove '1 hour ago' string which conflicted with plural rules
This message was only viewed for 1 second anyway,
as floor($delta / 60) is only 60 for 3600 to 3660,
but the code was limited to $delta <= 3600

PHPBB3-10345
2011-11-25 15:04:31 -05:00
Joas Schilling
f16d72fcfb [ticket/10345] Fix documentation on the new function and the switch
Also do not min/max the value, but throw an error on an invalid Plural rule.

PHPBB3-10345
2011-11-25 15:04:31 -05:00
Joas Schilling
757fcd3e63 [ticket/10345] Add a system to allow multiple plural forms
See http://wiki.phpbb.com/Plural_Rules for explanation and examples.

PHPBB3-10345
2011-11-25 15:04:30 -05:00
Oleg Pudeyev
4b8f00f649 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10479] Remove PostgreSQL version numbers from driver's language string
2011-11-23 18:39:48 -05:00