1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00

15045 Commits

Author SHA1 Message Date
Marc Alexander
27bcf25c3b [ticket/11587] Pass legend and teampage settings to group_create()
Without passing those values, the group is removed from the teampage and
the legend while submitting the edit form on the ucp groups manage page.

PHPBB3-11587
2013-06-04 14:25:37 +02:00
Andreas Fischer
5fa25880e2 [ticket/11586] Move $filedata['thumbnail'] to where it might be returned.
PHPBB3-11586
2013-06-03 16:24:12 +02:00
Andreas Fischer
50e3173e8c [ticket/11586] Combine $filedata['post_attach'] assign into a single statement.
PHPBB3-11586
2013-06-03 16:24:12 +02:00
Andreas Fischer
11c80c0402 [ticket/11586] Use a variable for $cat_id == ATTACHMENT_CATEGORY_IMAGE.
PHPBB3-11586
2013-06-03 16:14:22 +02:00
Andreas Fischer
cb54f56c3d [ticket/11586] Combine administrator/moderator checks together.
PHPBB3-11586
2013-06-03 16:07:19 +02:00
Andreas Fischer
99d089ce9f Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11145] Wrong error thrown when uploading a bigger image.
2013-06-03 15:58:32 +02:00
Andreas Fischer
a3d1593804 Merge remote-tracking branch 'erangamapa/ticket/11145' into develop-olympus
* erangamapa/ticket/11145:
  [ticket/11145] Wrong error thrown when uploading a bigger image.
2013-06-03 15:58:21 +02:00
Andreas Fischer
a20a0e06c2 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10840] Add check_form_key to acp_groups.php
2013-06-03 15:39:07 +02:00
Andreas Fischer
1cd6bb88a6 Merge remote-tracking branch 'nickvergessen/ticket/10840' into develop-olympus
* nickvergessen/ticket/10840:
  [ticket/10840] Add check_form_key to acp_groups.php
2013-06-03 15:36:04 +02:00
Andreas Fischer
d925c8d0da [ticket/11583] Use a new lang key instead of giving the old one a new meaning.
PHPBB3-11583
2013-06-03 15:16:57 +02:00
Andreas Fischer
fe4f0ef42c Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11122] Add dhruv to active authors
  [ticket/11122] Remove Oleg and igorw from active authors
2013-06-03 15:05:09 +02:00
Joas Schilling
323bfbc78f [ticket/11122] Add dhruv to active authors
PHPBB3-11122
2013-06-03 11:08:50 +02:00
Joas Schilling
cb62b37bce [ticket/11122] Remove Oleg and igorw from active authors
PHPBB3-11122
2013-06-03 11:06:12 +02:00
Joas Schilling
0eae9eb75d [ticket/10840] Add check_form_key to acp_groups.php
PHPBB3-10840
2013-06-03 10:54:16 +02:00
David King
4b61178d05 Merge remote-tracking branch 'nickvergessen/ticket/11549' into develop
* nickvergessen/ticket/11549:
  [ticket/11549] Add functional test for ACP Extension Module with Template
  [ticket/11549] Do not set extension dir path for style in adm/index.php
2013-05-31 22:39:40 -04:00
Andreas Fischer
d0e45e17dd [ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4 or higher.
PHPBB3-11583
2013-06-01 04:09:33 +02:00
Joas Schilling
69e1b402df Merge remote-tracking branch 'Elsensee/ticket/11409' into develop
* Elsensee/ticket/11409:
  [ticket/11409] Add success message after updating group position settings
2013-05-31 18:08:26 +02:00
Joas Schilling
cae1f8bc86 Merge remote-tracking branch 'EXreaction/ticket/11387' into develop
* EXreaction/ticket/11387:
  [ticket/11387] Log module added only after it has been added
2013-05-31 17:21:00 +02:00
Oliver Schramm
faf804c70f [ticket/11409] Add success message after updating group position settings
PHPBB3-11409
2013-05-31 17:16:15 +02:00
Oliver Schramm
ec2cdbed61 [ticket/11570] Fix link and make the notice more conspiciuous
PHPBB3-11570
2013-05-31 12:18:03 +02:00
Joas Schilling
7917e5a589 [ticket/11549] Do not set extension dir path for style in adm/index.php
As we don't want style files in adm/adm/style/ we should not prepend the adm/
by setting it. Note, we did that correctly in adm/swatch.php.

PHPBB3-11549
2013-05-31 00:18:39 +02:00
Oliver Schramm
8b0a6fd2cd [ticket/11570] Add link back to update process
PHPBB3-11570
2013-05-30 21:30:09 +02:00
Joas Schilling
b3b92b7b18 Merge remote-tracking branch 'Elsensee/ticket/11569' into develop
* Elsensee/ticket/11569:
  [ticket/11569] Add type parameter and fix language variable
  [ticket/11569] Add parameter to URL and remove comment
  [ticket/11569] Fixing link to continue update
2013-05-29 13:46:25 +02:00
Oliver Schramm
a79e229c25 [ticket/11569] Add type parameter and fix language variable
PHPBB3-11569
2013-05-29 13:27:15 +02:00
Oliver Schramm
c65617479d [ticket/11569] Add parameter to URL and remove comment
PHPBB3-11569
2013-05-29 13:20:47 +02:00
Andreas Fischer
fc1c7211ab Merge remote-tracking branch 'nickvergessen/ticket/encryptedmind/11516' into develop
* nickvergessen/ticket/encryptedmind/11516:
  [ticket/11516] Upgrading the .live jquery function because it is deprecated.
2013-05-28 12:49:46 +02:00
Jesús Rafael Cova Huerta
7f82a95cb0 [ticket/11516] Upgrading the .live jquery function because it is deprecated.
I changed the .live function of jQuery for .on function because a user
reported that he had an error because of that, it showed that .live function
was deprecated, so I changed for .on that it's same but it work with new
jQuery versions.

PHPBB3-11516
2013-05-28 01:48:25 +02:00
Joas Schilling
a3c5809f94 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11578] Add missing underscore after 'validate' function prefix
2013-05-27 23:07:06 +02:00
marc1706
b75f67231f [ticket/11578] Add missing underscore after 'validate' function prefix
The underscore after the 'validate' function prefix for the older
functions was dropped by accident in PR #1407. This patch will add it
back.

PHPBB3-11578
2013-05-27 22:56:49 +02:00
Joas Schilling
0032651729 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11538] Cut functional tests down a bit as these are more expensive.
  [ticket/11538] Compare to '' instead of using empty(), so '0' does not pass.
  [ticket/11538] Add unit tests for phpbb_validate_hex_colour().
2013-05-27 11:52:44 +02:00
Oliver Schramm
7383841af5 [ticket/11569] Fixing link to continue update
PHPBB3-11569
2013-05-26 22:39:23 +02:00
Andreas Fischer
401e9466bf [ticket/11538] Compare to '' instead of using empty(), so '0' does not pass.
PHPBB3-11538
2013-05-26 19:24:09 +02:00
Andreas Fischer
06379aece8 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11538] Add optional switch as argument to hex colour validation
  [ticket/11538] Modify test colour values
  [ticket/11538] Limit comment in acp_groups to 80 characters per line
  [ticket/11538] Move group ID into abstract test class and add more test cases
  [ticket/11538] Merge calls to validate_data() in acp_groups
  [ticket/11538] Rename phpbb_validate_colour to phpbb_validate_hex_colour
  [ticket/11538] Use abstract class for functional test cases for group colour
  [ticket/11538] Add function phpbb_validate_colour for validating colours
  [ticket/11538] Make sure regex doesn't allow multiple color values
  [ticket/11538] Add tests for acp group manage page
  [ticket/11538] Simplify colour value check and remove support for '#'
  [ticket/11538] Fix incorrect regex and test for duplicate # in color string
  [ticket/11538] Use regex for testing color value and improve tests
  [ticket/11538] Make sure group color can't exceed maximum of 6 characters

Conflicts:
	phpBB/includes/functions_user.php
	phpBB/styles/prosilver/template/ucp_groups_manage.html
2013-05-26 19:19:08 +02:00
Andreas Fischer
2b356e766f Merge remote-tracking branch 'marc1706/ticket/11538' into develop-olympus
* marc1706/ticket/11538:
  [ticket/11538] Add optional switch as argument to hex colour validation
  [ticket/11538] Modify test colour values
  [ticket/11538] Limit comment in acp_groups to 80 characters per line
  [ticket/11538] Move group ID into abstract test class and add more test cases
  [ticket/11538] Merge calls to validate_data() in acp_groups
  [ticket/11538] Rename phpbb_validate_colour to phpbb_validate_hex_colour
  [ticket/11538] Use abstract class for functional test cases for group colour
  [ticket/11538] Add function phpbb_validate_colour for validating colours
  [ticket/11538] Make sure regex doesn't allow multiple color values
  [ticket/11538] Add tests for acp group manage page
  [ticket/11538] Simplify colour value check and remove support for '#'
  [ticket/11538] Fix incorrect regex and test for duplicate # in color string
  [ticket/11538] Use regex for testing color value and improve tests
  [ticket/11538] Make sure group color can't exceed maximum of 6 characters
2013-05-26 18:24:29 +02:00
Oliver Schramm
bb67b07920 [ticket/11567] Renamed extension_manager variable to avoid fatal error
PHPBB3-11567
2013-05-26 13:12:13 +02:00
erangamapa
8191755cca [ticket/11145] Wrong error thrown when uploading a bigger image.
When attaching an image to a post with a size larger than maximum defined in
php.ini, 'ATTACHED_IMAGE_NOT_IMAGE' error is thrown. $file->is_image() is
returning false value when image size is too large. Therefore, moved
not image test down after image size test.

PHPBB3-11145
2013-05-25 10:50:43 +05:30
Andreas Fischer
64e2230d19 Merge remote-tracking branch 'cyberalien/ticket/11560' into develop
* cyberalien/ticket/11560:
  [ticket/11560] Fix jQuery link in installer
2013-05-24 22:00:10 +02:00
Vjacheslav Trushkin
0a410c5994 [ticket/11564] Missing new line in tweaks.css
Missing new line at the end of tweaks.css

PHPBB3-11564
2013-05-23 15:17:47 +03:00
Vjacheslav Trushkin
110ce809af [ticket/11564] Notifications popup fixes
Fix width issue with vertical scrollbar
Correctly absolutely position it above link, allowing
style authors to move notifications link around in style
Fix IE7 positioning

PHPBB3-11564
2013-05-23 15:13:58 +03:00
David King
4b0d51adea Merge remote-tracking branch 'EXreaction/ticket/11435-2' into develop
* EXreaction/ticket/11435-2:
  [ticket/11435] Enable spacing test as it should now pass
  [ticket/11435] Create new template filter option (cleanup)
2013-05-22 16:10:51 -04:00
Vjacheslav Trushkin
01fb9ea3e3 [ticket/11560] Fix jQuery link in installer
PHPBB3-11560
2013-05-22 21:05:25 +03:00
Vjacheslav Trushkin
9db0fa8856 [feature/editor-code-tabs] Make inTag function reusable
Change inTag function to reusable JS function that can check
for any BBCode

PHPBB3-11557
2013-05-22 20:52:15 +03:00
Nathaniel Guse
3ab222d1c7 Merge remote-tracking branch 'remotes/Senky/ticket/11010' into develop
# By Senky (19) and others
# Via Senky
* remotes/Senky/ticket/11010: (32 commits)
  [ticket/11010] properly tabifying 'max_autologin_time'
  [ticket/11010] resolving latest comments
  [ticket/11010] Fixes for number input in acp
  [ticket/11010] Fix input type for urls
  [ticket/11010] Fix email inputs
  [ticket/11010] updating tests
  [ticket/11010] dealing with dimensions problem, removing extra code
  [ticket/11010] Change input type to search for search forms
  [ticket/11010] Add all HTML5 input types to ACP
  [ticket/11010] Add HTML5 input types to installer
  [ticket/11010] validation to match type
  [ticket/11010] displaying min and max only if they are set
  [ticket/11010] fixing tests
  [ticket/11010] replacing maxlenght with max
  [ticket/11010] applying some of EXreaction notes
  [ticket/11010] Try to keep min < max.
  [ticket/11010] Mock user in order for the test to run standalone.
  [ticket/11010] Progress toward fixing the test suite.
  [ticket/11010] adding type="url" to 'site_home_url'
  [ticket/11010] fixing inputs types in memberlist_search.html
  ...
2013-05-21 09:49:53 -05:00
Senky
721bc03b2b [ticket/11010] properly tabifying 'max_autologin_time'
PHPBB3-11010
2013-05-21 11:57:33 +02:00
Senky
930f4c70ed [ticket/11010] resolving latest comments
PHPBB3-11010
2013-05-21 11:55:45 +02:00
Vjacheslav Trushkin
67053d0b4e [ticket/11279] Log error in console
PHPBB-11279
2013-05-20 22:12:20 +03:00
Vjacheslav Trushkin
a9c9448ebb [ticket/11279] Clearer AJAX errors
Display clearer AJAX errors rather than generic error

PHPBB3-11279
2013-05-20 21:35:51 +03:00
Vjacheslav Trushkin
809c51f30d [feature/editor-code-tabs] Check for browser support in function
Check for browser support and valid textarea in function instead of
before applying function.

PHPBB3-11557
2013-05-20 20:33:51 +03:00
Vjacheslav Trushkin
b2e5cc8934 [feature/editor-code-tabs] Apply code editor to everything
Move code editor from prosilver to assets
Apply code editor to subsilver2
Apply code editor to ACP elements where bbcode is allowed

PHPBB3-11557
2013-05-20 20:29:37 +03:00
Vjacheslav Trushkin
3dae0cfcae [feature/editor-code-tabs] Correctly count indentation on first line
Correctly count indentation on first line of code tag

PHPBB3-11557
2013-05-20 19:59:40 +03:00