mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-09 17:15:19 +02:00
Code Issues Releases Wiki Activity
19,764 Commits 18 Branches 192 Tags
6a8f110b5a
Commit Graph

19764 Commits

Author SHA1 Message Date
Nathan Guse
6a8f110b5a [ticket/9871] Use $request->variable instead of request_var 
PHPBB3-9871
 2014-03-05 19:00:52 -06:00
Nathan Guse
6c8589775b [ticket/9871] Update version check file to use json format 
PHPBB3-9871
 2014-02-19 16:13:23 -06:00
Nathan Guse
bd8951cfbe Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/12093] Check that document.selection is supported.

Conflicts:
	phpBB/adm/style/editor.js
	phpBB/assets/javascript/editor.js
	phpBB/styles/prosilver/template/editor.js
 2014-02-19 09:23:02 -06:00
Nathan Guse
823dca737f Merge remote-tracking branch 'remotes/prototech/ticket/12093' into develop-olympus 
* remotes/prototech/ticket/12093:
  [ticket/12093] Check that document.selection is supported.
 2014-02-19 09:06:57 -06:00
Nathan Guse
eaf9a41ed8 Merge pull request from prototech/ticket/12158 
[ticket/12158] The pagination start value should be 0 when there are no items.
 2014-02-18 14:25:46 -06:00
Nathan Guse
7015fc8a00 Merge pull request from prototech/ticket/12153 
[ticket/12153] Assign PAGE_NUMBER in pagination.generate_template_pagination()
 2014-02-18 14:11:48 -06:00
Cesar G
c7efadc26d [ticket/12153] Remove duplicate assignment of $u_previous_page & $u_next_page. 
PHPBB3-12153
 2014-02-18 12:04:31 -08:00
Nathan Guse
74d2d6c66a Merge pull request from lucifer4o/ticket/12177 
[ticket/12177] Add ucp_friend_list_before/after
 2014-02-18 12:36:55 -06:00
Nils Adermann
7a21d99b9b Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/12210] dbtools::sql_create_table incorrectly throws error related to auto-increment length on non auto-increment fields
 2014-02-18 19:34:08 +01:00
Nils Adermann
14017b7032 Merge remote-tracking branch 'github-exreaction/ticket/12210' into develop-olympus 
* github-exreaction/ticket/12210:
  [ticket/12210] dbtools::sql_create_table incorrectly throws error related to auto-increment length on non auto-increment fields
 2014-02-18 19:33:36 +01:00
Nathan Guse
061d9fba5a Merge pull request from prototech/ticket/12206 
[ticket/12206] Fix mismatched Plupload language vars preventing localization.
 2014-02-18 12:29:17 -06:00
Nathan Guse
74836f8c64 Merge pull request from prototech/ticket/12208 
[ticket/12208] Remove file from upload queue if deleted before being uploaded.
 2014-02-18 12:28:20 -06:00
Nathan Guse
69c119485a Merge pull request from rxu/ticket/12166 
Add template events before/after the textbox in quickreply_editor.html.
 2014-02-18 12:27:43 -06:00
Nathan Guse
5fc29e0d2b Merge pull request from marc1706/ticket/12167 
[ticket/12167] Allow users to change style via style parameter by default
 2014-02-18 12:26:49 -06:00
Nathaniel Guse
602f4a2b54 [ticket/12210] dbtools::sql_create_table incorrectly throws error 
related to auto-increment length on non auto-increment fields

PHPBB3-12210
 2014-02-17 23:46:39 -06:00
rxu
cab8181af1 [ticket/12166] Add template events to quickreply_editor.html. 
Add template event pair - quickreply_editor_message_before
and quickreply_editor_message_before to
quickreply_editor.html for both of prosilver and subsilver2 styles.
This allows extensions to modify quick reply
postform. For example, to add BBCode buttons and/or smilies
and so on.

PHPBB3-12166
 2014-02-18 10:51:34 +08:00
Cesar G
233bdfa5f6 Merge remote-tracking branch 'Zoddo/ticket/12207' into develop 
* Zoddo/ticket/12207:
  [ticket/12207] Forum broken when error thrown
 2014-02-17 17:30:44 -08:00
Cesar G
1c56d28d9b [ticket/12208] Remove file from upload queue if deleted before being uploaded. 
The table row is removed, but the files aren't actually removed from the
upload queue, so they get uploaded either way.

PHPBB3-12208
 2014-02-17 15:11:24 -08:00
Zoddo
fb662ebf50 [ticket/12207] Forum broken when error thrown 
Fix display of forum when error is outputted before <html> tag.

PHPBB3-12207
 2014-02-17 21:58:39 +01:00
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
Andreas Fischer
9f923f2359 Merge pull request 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 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
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 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
Nils Adermann
0b2b76f951 Merge pull request from nickvergessen/ticket/12169 
Ticket/12169  Convert location user field to profile field
 2014-02-11 02:18:16 +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 from nickvergessen/ticket/12115 
[ticket/12115] Convert occupation profile field to custom field
 2014-02-10 13:52:12 +01:00
Andreas Fischer
02674de893 Merge pull request 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 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
Joas Schilling
81c6ca7e4c [ticket/12141] Disable opcache on travis for php 5.5.8 aswell 
PHPBB3-12141
 2014-02-08 12:52:22 +01:00
Marc Alexander
9b1b6bd477 Merge remote-tracking branch 'exreaction/ticket/12170' into ticket/12170 2014-02-07 22:35:04 +01:00