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

21230 commits

This branch
This branch
All branches
Author SHA1 Message Date
Cesar G
a589c88d25 [ticket/12206] Fix mismatched Plupload language vars preventing localization. 
PHPBB3-12206
 2014-02-17 12:33:19 -08:00
Cesar G
b3ecb9e1e4 Merge remote-tracking branch 'Zoddo/ticket/12003' into develop 
* Zoddo/ticket/12003:
  [ticket/12003] ACP broken when error thrown
 2014-02-17 10:27:23 -08:00
Zoddo
b942615c3b [ticket/12003] ACP broken when error thrown 
Fix display of ACP when error is outputted before <html> tag.

PHPBB3-12003
 2014-02-17 19:21:20 +01:00
Marc Alexander
f1c913f176 [ticket/12183] Move user_newpasswd, user_actkey below user_pass_convert 
PHPBB3-12183
 2014-02-17 16:28:36 +01:00
Marc Alexander
3cb702f4ab [ticket/12183] Test activating new password after reset 
PHPBB3-12183
 2014-02-17 16:18:56 +01:00
Cesar G
b8c836836b [ticket/12080] Stop responsive ACP sig textarea from dropping to second line. 
PHPBB3-12080
 2014-02-16 13:27:48 -08:00
Cesar G
bfbf0fefbf [ticket/12080] Reduce the palette options in all locations when responsive. 
PHPBB3-12080
 2014-02-16 13:27:01 -08:00
Cesar G
5ef55d9e45 [ticket/12080] Add classes to color palette table to identify it more easily. 
PHPBB3-12080
 2014-02-16 13:25:43 -08:00
Cesar G
3bdc1e9e1c [ticket/12138] Replace old code and generate pagination using filetime limit. 
PHPBB3-12138
 2014-02-16 10:21:10 -08:00
Cesar G
e4685ac80d [ticket/12138] Add methods for attachment manage functionality. 
PHPBB3-12138
 2014-02-16 10:21:02 -08:00
Cesar G
d6ec463977 [ticket/12160] Check if phpBB is installed before creating phpBB container. 
PHPBB3-12160
 2014-02-15 17:14:16 -08:00
Cesar G
d002d31b86 [ticket/12160] Add function to check if phpBB is installed. 
PHPBB3-12160
 2014-02-15 17:09:13 -08:00
Andreas Fischer
9f923f2359 Merge pull request #2032 from prototech/ticket/12192 
[ticket/12192] Fix call to undefined method get_user_avatar().

* prototech/ticket/12192:
  [ticket/12192] Fix call to undefined method get_user_avatar().
 2014-02-15 12:30:03 +01:00
Cesar G
d4affedaab [ticket/12192] Fix call to undefined method get_user_avatar(). 
PHPBB3-12192
 2014-02-14 19:19:53 -08:00
Andreas Fischer
ccf12ba166 Merge pull request #1964 from prototech/ticket/12136 
[ticket/12136] Use new pagination class in generate_smilies().

* prototech/ticket/12136:
  [ticket/12136] Use new pagination class in generate_smilies().
 2014-02-15 02:35:19 +01:00
Andreas Fischer
8960e6d777 [ticket/12176] Display correct message when trying to delete founder. 
PHPBB3-12176
 2014-02-15 02:27:54 +01:00
Andreas Fischer
587241f3a9 [ticket/12176] Add functional test for founder deletion message. 
PHPBB3-12176
 2014-02-15 02:27:54 +01:00
Nils Adermann
06581ba927 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/12188] Add php 5.6 to travis enviroments

Conflicts:
	.travis.yml
 2014-02-13 15:43:31 +01:00
Nils Adermann
f245198652 Merge remote-tracking branch 'github-nickvergessen/ticket/12188' into develop-olympus 
* github-nickvergessen/ticket/12188:
  [ticket/12188] Add php 5.6 to travis enviroments
 2014-02-13 15:42:50 +01:00
lucifer4o
c20a313ab0 [ticket/12177] Add ucp_friend_list_before/after 
Add events before and after list of friends in UCP template
Change Since part from a3 to a4

PHPBB3-12177
 2014-02-13 16:23:42 +02:00
Joas Schilling
9d1d90e336 [ticket/12188] Add php 5.6 to travis enviroments 
PHPBB3-12188
 2014-02-13 14:47:51 +01:00
lucifer4o
89007db505 [ticket/12177] Add ucp_friend_list_before/after 
Add events before and after list of friends in UCP template

PHPBB3-12177
 2014-02-13 14:51:53 +02:00
Cesar G
13e7bd76a5 Merge remote-tracking branch 'vinny/ticket/12134' into develop 
* vinny/ticket/12134:
  [ticket/12134] Add ucp_pm_viewmessage_print_head_append event to subsilver2
 2014-02-12 18:39:39 -08:00
Cesar G
965b3365fe Merge remote-tracking branch 'vinny/ticket/12132' into develop 
* vinny/ticket/12132:
  [ticket/12132] Add the event to events.md doc
  [ticket/12132] Add viewtopic_print_head_append event to subsilver2
 2014-02-12 18:38:40 -08:00
Joas Schilling
75fa467b7b Merge remote-tracking branch 'bantu/ticket/12180' into develop 
* bantu/ticket/12180:
  [ticket/12180] Add "Each file MUST end with exactly one newline character" rule
 2014-02-12 22:12:30 +01:00
Andreas Fischer
0888df9520 Merge pull request #2026 from nickvergessen/ticket/12184 
[ticket/12184] Fix undefined variable tpl_fields in profile field manager

* nickvergessen/ticket/12184:
  [ticket/12184] Fix undefined variable tpl_fields in profile field manager
 2014-02-11 20:04:22 +01:00
Joas Schilling
30fbaab8de [ticket/12184] Fix undefined variable tpl_fields in profile field manager 
PHPBB3-12184
 2014-02-11 19:17:24 +01:00
Marc Alexander
4c62cb4989 [ticket/12183] Make sure to undo changes to config in forgot_password_test 
The forgot_password_test disables the password reset functionalty but doesn't
enable it again afterwards.

PHPBB3-12183
 2014-02-11 08:24:49 +01:00
Nils Adermann
0b2b76f951 Merge pull request #2010 from nickvergessen/ticket/12169 
Ticket/12169  Convert location user field to profile field
 2014-02-11 02:18:16 +01:00
Marc Alexander
488bd1a1b1 [ticket/12183] Add functional test for user password reset 
PHPBB3-12183
 2014-02-10 22:37:28 +01:00
Marc Alexander
c864d06ac6 [ticket/12183] Add migration file for updating user_newpasswd column 
PHPBB3-12183
 2014-02-10 22:10:31 +01:00
Marc Alexander
5ce0bb7630 [ticket/12183] Update user_newpasswd column to length of 255 in schema files 
PHPBB3-12183
 2014-02-10 22:06:42 +01:00
Joas Schilling
5550f0fa87 [ticket/12169] Split mode==headline into it's own function 
PHPBB3-12169
 2014-02-10 19:04:10 +01:00
Joas Schilling
995019a992 [ticket/12169] Add new option to display profile fields on memberlist 
PHPBB3-12169
 2014-02-10 16:28:21 +01:00
Joas Schilling
3c46aeb005 [ticket/12169] Allow displaying profile fields on memberlist 
We can not sort by profile field values atm. And also I'm not sure
whether this is possible at all.

PHPBB3-12169
 2014-02-10 15:58:55 +01:00
Andreas Fischer
1e86f71133 [ticket/12180] Add "Each file MUST end with exactly one newline character" rule 
PHPBB3-12180
 2014-02-10 15:01:50 +01:00
Joas Schilling
6bee91c429 [ticket/12169] Convert user_from to profile field location 
Missing changes on memberlist view due to missing functionality

PHPBB3-12169
 2014-02-10 14:38:43 +01:00
Joas Schilling
b088bf864b Merge remote-tracking branch 'Marc/ticket/12170' into develop 
* Marc/ticket/12170:
  [ticket/12170] Test for 12170
  [ticket/12170] Assign schema keys in migration helper with data_depth 1
 2014-02-10 14:23:09 +01:00
Nils Adermann
840ab75520 Merge pull request #1988 from nickvergessen/ticket/12115 
[ticket/12115] Convert occupation profile field to custom field
 2014-02-10 13:52:12 +01:00
Joas Schilling
09a17b4944 [ticket/12171] Add functional tests for downloading attachments 
PHPBB3-12171
 2014-02-10 12:56:46 +01:00
Joas Schilling
b5105363db [ticket/12171] Add functionality to upload attachments to submit_post() method 
PHPBB3-12171
 2014-02-10 12:56:46 +01:00
Joas Schilling
ee1c055b70 [ticket/12171] Send correct status 403 when forbidden and 404 when not found 
PHPBB3-12171
 2014-02-10 12:56:45 +01:00
Joas Schilling
c36b1c16f9 [ticket/12171] Check post visibility before being able to download attachments 
PHPBB3-12171
 2014-02-10 12:56:41 +01:00
Joas Schilling
e4129687cb [ticket/12171] Split post and pm download links 
PHPBB3-12171
PHPBB3-12172
 2014-02-10 12:37:10 +01:00
Joas Schilling
8744b0da6d [ticket/12171] Check topic visibility before allowing to download attachments 
PHPBB3-12171
 2014-02-10 12:36:01 +01:00
Andreas Fischer
02674de893 Merge pull request #2022 from nickvergessen/ticket/12175 
Ticket/12175 Fix and run functional upload tests

* nickvergessen/ticket/12175:
  [ticket/12175] Do not use admin account for file size limit test
  [ticket/12175] Fix test for uploading a valid file
  [ticket/12175] Fix upload test for empty file
 2014-02-10 02:16:27 +01:00
Joas Schilling
1fdd01275e [ticket/12175] Do not use admin account for file size limit test 
PHPBB3-12175
 2014-02-09 23:48:34 +01:00
Joas Schilling
07f19647f4 [ticket/12175] Fix test for uploading a valid file 
PHPBB3-12175
 2014-02-09 23:47:20 +01:00
Joas Schilling
ff57ecf0bc [ticket/12175] Fix upload test for empty file 
PHPBB3-12175
 2014-02-09 23:45:41 +01:00
Andreas Fischer
eb2d8fe6d8 Merge pull request #2017 from nickvergessen/ticket/12141 
[ticket/12141] Disable opcache on travis for php 5.5.8 aswell

* nickvergessen/ticket/12141:
  [ticket/12141] Disable opcache on travis for php 5.5.8 aswell
 2014-02-08 14:00:30 +01:00