mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-01-18 22:58:10 +01:00
Code Issues Releases Wiki Activity
20,416 Commits 17 Branches 190 Tags
Commit Graph

17788 Commits

Author SHA1 Message Date
Matt Friedman
60be502190 [ticket/12254] Use 'language' instead of 'set_lang' as the variable name 
PHPBB3-12254
 2014-04-11 08:50:15 -07:00
Matt Friedman
af6cabc106 [ticket/12254] Persist set_lang after reg only if changed from default 
PHPBB3-12254
 2014-04-07 13:58:47 -07:00
Matt Friedman
8af9092cf6 [ticket/12254] Add set_lang var changes to subsilver2 files 
PHPBB3-12254
 2014-04-07 09:21:28 -07:00
Matt Friedman
daae87d65a [ticket/12254] Use new set_lang var to avoid conflict with change_lang 
PHPBB3-12254
 2014-04-07 09:14:58 -07:00
Matt Friedman
a5940ede5b [ticket/12254] Stop using deprecated request_var in user class 
PHPBB3-12254
 2014-04-07 01:38:24 -07:00
Matt Friedman
41b0b8c5f9 [ticket/12254] Better language switching on registration page 
PHPBB3-12254
 2014-04-06 23:55:46 -07:00
Joas Schilling
1b16b8cd42 Merge remote-tracking branch 'Marc/ticket/10851-ascraeus' into develop-ascraeus 
* Marc/ticket/10851-ascraeus:
  [ticket/10851] Request index instead of logging in and out in tests
  [ticket/10851] Add unit and functional tests for checking attachments
  [ticket/10851] Set disallowed content to empty array if checking is disabled
 2014-04-05 10:00:40 +02:00
Joas Schilling
ced48a51a4 Merge remote-tracking branch 'Elsensee/ticket/7707' into develop-ascraeus 
* Elsensee/ticket/7707:
  [ticket/7707] Fix undefined variable: perm_from
  [ticket/7707] Add comma to last entry of arrays
  [ticket/7707] Remove unnecessary variables
  [ticket/7707] Add get_username_string() once more
  [ticket/7707] Remove unnecessary variables
  [ticket/7707] Add get_username_string() where possible
 2014-04-05 09:54:14 +02:00
Joas Schilling
bd36ca1016 Merge remote-tracking branch 'paybas/ticket/12338' into develop-ascraeus 
* paybas/ticket/12338:
  [ticket/12338] Add Template Event overall_footer_page_body_after

Conflicts:
	phpBB/docs/events.md
 2014-04-04 23:57:06 +02:00
Joas Schilling
b5db7d49a8 Merge remote-tracking branch 'paybas/ticket/12333' into develop-ascraeus 
* paybas/ticket/12333:
  [ticket/12333] Change event name
  [ticket/12333] Add Template Event overall_header_body_after
 2014-04-04 23:55:36 +02:00
Joas Schilling
1a82ce9f48 Merge remote-tracking branch 'paybas/ticket/12327' into develop-ascraeus 
* paybas/ticket/12327:
  [ticket/12327] Ajax fix
  [ticket/12327] Coding style fixes
  [ticket/12327] Changing poll result-bars width from absolute to relative
 2014-04-04 23:52:04 +02:00
Oliver Schramm
8f525e1ef5 [ticket/7707] Fix undefined variable: perm_from 
PHPBB3-7707
 2014-04-04 23:48:14 +02:00
Joas Schilling
1a3a296558 Merge remote-tracking branch 'paybas/ticket/12339' into develop-ascraeus 
* paybas/ticket/12339:
  [ticket/12339] removed return var
  [ticket/12339] more complete params and updated _since version
  [ticket/12339] Add Event core.page_header_after
 2014-04-04 23:21:18 +02:00
PayBas
20c18d08e9 [ticket/12327] Ajax fix 
PHPBB3-12327
 2014-04-04 18:53:00 +02:00
PayBas
e850e49a1b [ticket/12327] Coding style fixes 
PHPBB3-12327
 2014-04-04 18:53:00 +02:00
PayBas
bf37342c86 [ticket/12327] Changing poll result-bars width from absolute to relative 
PHPBB3-12327
 2014-04-04 18:52:59 +02:00
PayBas
084e6725f7 [ticket/12339] removed return var 
need to learn more about events... evidently

PHPBB3-12339
 2014-04-04 18:26:20 +02:00
Joas Schilling
82fa935d5d Merge remote-tracking branch 'vsephpbb/ticket/11962' into develop-ascraeus 
* vsephpbb/ticket/11962:
  [ticket/11962] Resize posted images to fit and give them a class
 2014-04-04 18:25:01 +02:00
Joas Schilling
e00a4b411d Merge remote-tracking branch 'vsephpbb/ticket/12342' into develop-ascraeus 
* vsephpbb/ticket/12342:
  [ticket/12342] Remove spinner and fix useage of ajax on memberlist
  [ticket/12342] Fix the Custom Dates function in UCP Prefs Global
  [ticket/12342] Fix Find a member show / hide script
  [ticket/12342] Use prop() instead of attr() for boolean properties
 2014-04-04 18:00:44 +02:00
Joas Schilling
9bfada03f3 Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/12353] Fix displayed attachments in ACP
 2014-04-04 17:40:18 +02:00
Oliver Schramm
744b39e6c4 [ticket/12353] Fix displayed attachments in ACP 
PHPBB3-12353
 2014-04-04 17:07:54 +02:00
PayBas
c6c5f7c874 [ticket/12339] more complete params and updated _since version 
PHPBB3-12339
 2014-04-04 13:45:57 +02:00
PayBas
069e515747 [ticket/12338] Add Template Event overall_footer_page_body_after 
implement

PHPBB3-12338
 2014-04-04 13:12:33 +02:00
Marc Alexander
e4e3df0b37 Merge branch 'ticket/10851' into ticket/10851-ascraeus 2014-04-04 11:48:17 +02:00
Matt Friedman
0c25c60381 [ticket/12342] Remove spinner and fix useage of ajax on memberlist 
PHPBB3-12342
 2014-04-03 08:32:46 -07:00
Marc Alexander
519adb5060 [ticket/10851] Set disallowed content to empty array if checking is disabled 
The disallowed content defaults to a standard set of mimetype triggers by
default. If one doesn't want to check the attachments mimetype triggers then
we need to set the disallowed content to an empty array.

PHPBB3-10851
 2014-04-03 16:06:46 +02:00
Joas Schilling
d88929210a Merge remote-tracking branch 'vsephpbb/ticket/12337' into develop-ascraeus 
* vsephpbb/ticket/12337:
  [ticket/12337] Fix jQuery update migration file
  [ticket/12337] Update jQuery to version 1.11.0
 2014-04-03 16:02:57 +02:00
Joas Schilling
b567c0a9e2 Merge remote-tracking branch 'vsephpbb/ticket/12043' into develop-ascraeus 
* vsephpbb/ticket/12043:
  [ticket/12043] Fix order of disabled extensions in unit tests
  [ticket/12043] Correct try/catch exceptions for invalid extensions
  [ticket/12043] Sort Extensions by Display Name in ACP Extension mananger
 2014-04-03 15:06:28 +02:00
Matt Friedman
6de0350836 [ticket/12342] Fix the Custom Dates function in UCP Prefs Global 
Function was being called before dE() function exists,
causing it to fail. Should be called when the page/window
is ready.

PHPBB3-12342
 2014-04-01 18:02:27 -07:00
Matt Friedman
18645aa069 [ticket/12342] Fix Find a member show / hide script 
PHPBB3-12342
 2014-04-01 18:00:17 -07:00
Matt Friedman
0f3e6ca676 [ticket/12342] Use prop() instead of attr() for boolean properties 
PHPBB3-12342
 2014-04-01 17:58:56 -07:00
Oliver Schramm
908057301c [ticket/7707] Add comma to last entry of arrays 
PHPBB3-7707
 2014-04-01 22:03:59 +02:00
Matt Friedman
025779ac62 [ticket/12337] Fix jQuery update migration file 
PHPBB3-12337
 2014-04-01 06:50:00 -07:00
Joas Schilling
5a3d4109bb Merge remote-tracking branch 'paybas/ticket/12329' into develop-ascraeus 
* paybas/ticket/12329:
  [ticket/12329] changed all CSS classes to ".stat-block"
  [ticket/12329] Add <div> container to index blocks (stats, etc.)
 2014-04-01 15:07:19 +02:00
Joas Schilling
00a3eabc59 Merge remote-tracking branch 'paybas/ticket/12328' into develop-ascraeus 
* paybas/ticket/12328:
  [ticket/12328] Change "since" to B3
  [ticket/12328] Add Template Event index_body_stat_blocks_after
 2014-04-01 14:45:36 +02:00
Joas Schilling
e9eb456f1a Merge remote-tracking branch 'paybas/ticket/12322' into develop-ascraeus 
* paybas/ticket/12322:
  [ticket/12322] Added profile-custom-field class
  [ticket/12322] CSS classes for postprofile-profile <dd> items
 2014-04-01 14:37:13 +02:00
PayBas
205e098b38 [ticket/12339] Add Event core.page_header_after 
PHPBB3-12339
 2014-04-01 14:25:40 +02:00
PayBas
e0f64b7058 [ticket/12329] changed all CSS classes to ".stat-block" 
PHPBB3-12329
 2014-04-01 12:53:13 +02:00
PayBas
6dac8813d0 [ticket/12322] Added profile-custom-field class 
PHPBB3-12322
 2014-04-01 10:58:44 +02:00
PayBas
d561e6ddaa [ticket/12333] Change event name 
PHPBB3-12333
 2014-04-01 10:55:13 +02:00
PayBas
a87e576d1e [ticket/12328] Change "since" to B3 
PHPBB3-12328
 2014-04-01 10:32:01 +02:00
Matt Friedman
2b77dcfca6 [ticket/12337] Update jQuery to version 1.11.0 
PHPBB3-12337
 2014-03-31 21:09:47 -07:00
Joas Schilling
ba84268d4e Merge remote-tracking branch 'crizz0/ticket/9758' into develop-ascraeus 
* crizz0/ticket/9758:
  [ticket/9758] Clickable avatar in header and renamed class for avatar-img
  [ticket/9758] Remove unnessary if-question for include functions_display
  [ticket/9758] Slims the line 4775 in includes/functions.php
  [ticket/9758] Adds id and changes filter to fix travis CI test
  [ticket/9758] Removed the needless space after first ENDIF
  [ticket/9758] Adding impr. for overall_header display of avatar and username
  [ticket/9758] Fixed bug in mcp_warn.php
  [ticket/9758] Optimises the html code of avatar image in header
  [ticket/9758] Error because of missing functions_display.php fixed
  [ticket/9758] Removed useless if-conditions to include functions.php
  [ticket/9758] Changes class name of new "span" in overall_header.html
  [ticket/9758] Adds global template variable CURRENT_USER_AVATAR
 2014-03-31 20:29:45 +02:00
PayBas
f8b5b71890 [ticket/12333] Add Template Event overall_header_body_after 
PHPBB3-12333
 2014-03-31 12:27:19 +02:00
Matt Friedman
8ee37def81 [ticket/11962] Resize posted images to fit and give them a class 
PHPBB3-11962
 2014-03-30 14:19:16 -07:00
Joas Schilling
45f2efea19 [prep-release-3.1.0-b2] Prepare development of 3.1.0-b3 2014-03-30 22:53:09 +02:00
Joas Schilling
120aa3685f [prep-release-3.1.0-b2] Add changelog for 3.1.0-b2 2014-03-30 22:14:54 +02:00
Joas Schilling
d81c5437d1 [prep-release-3.1.0-b2] Prepare Changelog 2014-03-30 22:08:12 +02:00
Joas Schilling
fdbe5e2f42 [prep-release-3.1.0-b2] Add migration for 3.1.0-b2 2014-03-30 22:08:11 +02:00
Joas Schilling
254b7739a8 [prep-release-3.1.0-b2] Update version to 3.1.0-b2 2014-03-30 22:08:10 +02:00