1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

8338 Commits

Author SHA1 Message Date
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
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
Joas Schilling
995019a992 [ticket/12169] Add new option to display profile fields on memberlist
PHPBB3-12169
2014-02-10 16:28:21 +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
bbada27ee9 [ticket/12115] Also port user interests to profile fields
PHPBB3-12115
2014-02-06 11:32:11 +01:00
Joas Schilling
3c640e57c5 [ticket/12115] Convert user occupation to a profile field
PHPBB3-12115
2014-02-06 11:32:06 +01:00
Joas Schilling
bf93e20afb [prep-release-3.1.0-a3] Update version to 3.1.0-a4-dev for future development 2014-02-05 22:23:33 +01:00
Joas Schilling
127c0c4493 [prep-release-3.1.0-a3] Update version to 3.1.0-a3 2014-02-05 16:55:21 +01:00
Marc Alexander
6f92996d98 [ticket/12159] Fix codesniffer complaints due to profilefields and passwords
The two PRs regarding profilefields and passwords manager that were recently
merged caused a few codesniffer complaints that are fixed by these changes.

PHPBB3-12159
2014-02-03 22:25:43 +01:00
Nils Adermann
38af79dd30 Merge remote-tracking branch 'github-nickvergessen/ticket/11201' into develop
* github-nickvergessen/ticket/11201: (50 commits)
  [ticket/11201] Remove empty calls section from .yml
  [ticket/11201] Split template file into multiple files
  [ticket/11201] Remove dependency from types on the manager
  [ticket/11201] Rename profilefields class to manager
  [ticket/11201] Fix parameter description
  [ticket/11201] Use !== null, its faster
  [ticket/11201] Also translate profile fields in UCP and ACP
  [ticket/11201] Add parameters and variables to profile field class
  [ticket/11201] Add commas on last array entry
  [ticket/11201] Allow translation of profile field name and explanation
  [ticket/11201] Fix some variable names
  [ticket/11201] Add tables to constructor in tests
  [ticket/11201] Add a method to return the translated full name of the type
  [ticket/11201] Remove db depending code from field class
  [ticket/11201] Add variables to classes and add constructor doc blocks
  [ticket/11201] Update copyright in class file
  [ticket/11201] Add visibility and remove unused variable
  [ticket/11201] Add some commas at the last array entry
  [ticket/11201] Cast some variables to integer
  [ticket/11201] Inject table names rather then using constants
  ...

Conflicts:
	phpBB/config/services.yml
2014-02-02 16:34:55 +01:00
Nils Adermann
f8d6a07392 Merge pull request #1716 from marc1706/feature/passwords
[feature/passwords] Add password hashing manager with support for newer hashing algorithms
2014-02-02 06:26:35 -08:00
Joas Schilling
7bcbdfc1b1 [ticket/11201] Rename profilefields class to manager
PHPBB3-11201
2014-02-02 12:53:29 +01:00
Cesar G
779868e4f4 [ticket/12136] Use new pagination class in generate_smilies().
PHPBB3-12136
2014-01-26 17:57:16 -08:00
Joas Schilling
12932e8113 [ticket/11201] Use !== null, its faster
PHPBB3-11201
2014-01-20 00:15:06 +01:00
Joas Schilling
dea91108fe Merge remote-tracking branch 'EXreaction/ticket/12006' into develop
* EXreaction/ticket/12006:
  [ticket/12006] global $phpbb_dispatcher;
  [ticket/12006] Missing a space
  [ticket/12006] Add module_auth event
  [ticket/12006] Test for ext module auth
  [ticket/12006] Add extension enabled check token to module auth
  [ticket/12006] Cleanup the module auth function token replacement code
2014-01-18 21:20:01 +01:00
Joas Schilling
f40f774b2e [ticket/11201] Fix some variable names
PHPBB3-11201
2014-01-18 13:28:17 +01:00
Joas Schilling
197e026699 [ticket/11201] Add a method to return the translated full name of the type
PHPBB3-11201
2014-01-18 13:16:18 +01:00
Cesar G
9c1cacae42 [ticket/11915] Provide the URL to the attachment when it's uploaded.
PHPBB3-11915
2014-01-17 19:20:36 -08:00
Cesar G
be52a823f8 [ticket/11915] Provide the attachment file size to the template.
PHPBB3-11915
2014-01-17 19:20:36 -08:00
Nathan Guse
8486d6a9d1 Merge pull request #1938 from prototech/ticket/12077
[ticket/12077] Ensure that valid upload methods are presented to user in language packs page.
2014-01-17 18:28:19 -08:00
Nathan Guse
2cf4b68351 [ticket/12006] global $phpbb_dispatcher;
PHPBB3-12006
2014-01-17 20:26:59 -06:00
Joas Schilling
39ff387d36 [ticket/11201] Update schema files and unit test
PHPBB3-11201
2014-01-17 21:53:08 +01:00
Joas Schilling
aa2f0a652f [ticket/11201] Change type from integer to service name
PHPBB3-11201
2014-01-17 21:13:59 +01:00
Joas Schilling
74d36591e1 [ticket/11201] Move custom template variable assignment to type class
PHPBB3-11201
2014-01-17 21:13:56 +01:00
Joas Schilling
af5c747f6f [ticket/11201] Move preparation of hidden fields to type class
PHPBB3-11201
2014-01-17 21:13:46 +01:00
Joas Schilling
67f477fc8f [ticket/11201] Allow manipulating the intended variables with the type class
PHPBB3-11201
2014-01-17 13:59:07 +01:00
Joas Schilling
ae38cfaa70 [ticket/11201] Move type specific error messages to type class
PHPBB3-11201
2014-01-17 10:20:00 +01:00
Joas Schilling
9653764fb1 [ticket/11201] Move field type depending preparation of the options to class
PHPBB3-11201
2014-01-17 09:55:52 +01:00
Joas Schilling
0bdec35cd4 [ticket/11201] Move grabbing the input of the language options to type class
PHPBB3-11201
2014-01-16 16:00:52 +01:00
Joas Schilling
78603bb96d [ticket/11201] Move language option determination into type class
PHPBB3-11201
2014-01-15 18:25:28 +01:00
Joas Schilling
bd1425d075 [ticket/11201] Use database type from the type class
PHPBB3-11201
2014-01-15 16:39:06 +01:00
Joas Schilling
d601aaad26 [ticket/11201] Remove type related code from build_insert_sql_array()
PHPBB3-11201
2014-01-14 13:38:24 +01:00
Joas Schilling
a7e3538e5b [ticket/11201] Move get_options to type classes
PHPBB3-11201
2014-01-13 21:09:07 +01:00
Joas Schilling
c665839636 [ticket/11201] Remove global use from admin class
PHPBB3-11201
2014-01-10 23:00:37 +01:00
Nathan Guse
7bac4bf9bd [ticket/12006] Missing a space
PHPBB3-12006
2014-01-10 13:15:37 -06:00
Nathan Guse
e3cba9ceba [ticket/12006] Add module_auth event
PHPBB3-12006
2014-01-10 13:14:50 -06:00
Joas Schilling
2471b19d73 [ticket/11201] Make profile field classes autoloadable
PHPBB3-11201
2014-01-10 16:11:11 +01:00
Joas Schilling
3e84fb76a3 Merge remote-tracking branch 'Marc/ticket/11997' into develop
* Marc/ticket/11997: (23 commits)
  [ticket/11997] Use functional test cases that should always work
  [ticket/11997] Fix redirect tests for mod rewrite
  [ticket/11997] Add user's page dir to redirect path and fix unit tests for it
  [ticket/11997] Remove obsolete function get_controller_redirect_url()
  [ticket/11997] Use path_helper in in foo/bar extension for redirect URLs
  [ticket/11997] Add remove_web_root_path() in order to prevent incorrect URLs
  [ticket/11997] Do not check if file or dir we redirect to exist
  [ticket/11997] Modifiy tests after adding path_helper clean_url method
  [ticket/11997] Add clean_url() method to path_helper
  [ticket/11997] Allow redirects to parent folders like previously
  [ticket/11997] Move expected redirect returns to controller and output to HTML
  [ticket/11997] Fix tests for path_helper's get_controller_redirect_url()
  [ticket/11997] Use get_controller_redirect_url() in redirect() function
  [ticket/11997] Add method for controller redirect URLs to path helper
  [ticket/11997] Undo changes to phpbb_own_realpath()
  [ticket/11997] Remove obsolete failover_flag in function redirect()
  [ticket/11997] Add functional test for redirects in controller
  [ticket/11997] Fix missing global
  [ticket/11997] Fix redirects from inside controllers
  [ticket/11997] Use $phpbb_filesystem->clean_path() for proper redirect paths
  ...
2014-01-08 16:17:48 +01:00
Nathan Guse
821f737560 Merge pull request #1890 from prototech/ticket/12034
[ticket/12034] AJAXify notifications popup.
2013-12-30 12:20:22 -08:00
Nathan Guse
b186d31ce6 Merge pull request #1920 from prototech/ticket/12038
[ticket/12038] AJAXify move up/down buttons for various ACP pages.
2013-12-30 11:23:22 -08:00
Cesar G
f4b832a27d [ticket/12034] AJAXify notifications popup.
PHPBB3-12034
2013-12-30 11:12:15 -08:00
Cesar G
06262aca54 [ticket/12038] Free query results.
PHPBB3-12038
2013-12-30 11:09:08 -08:00
Nathan Guse
be67124dc7 Merge pull request #1889 from prototech/ticket/11963
[ticket/11963] Remove stale MCP notifications.
2013-12-30 11:04:43 -08:00
Nathan Guse
05cf83aca7 [ticket/12006] Add extension enabled check token to module auth
PHPBB3-12006
2013-12-30 11:50:37 -06:00
Nathan Guse
7740ab5dc3 [ticket/12006] Cleanup the module auth function token replacement code
PHPBB3-12006
2013-12-30 11:46:02 -06:00
Marc Alexander
85f1e8afa5 [feature/passwords] Correct docblock of phpbb_hash() function
PHPBB3-11610
2013-12-29 20:52:25 +01:00
Marc Alexander
808c54fa89 [feature/passwords] Get rid of unneeded code complexity
Simplified a little bit of code as pointed out by imkingdavid on github.

PHPBB3-11610
2013-12-29 16:33:09 +01:00
Marc Alexander
382317b135 Merge branch 'develop' of https://github.com/phpbb/phpbb into feature/passwords
Conflicts:
	phpBB/config/services.yml
2013-12-29 13:46:42 +01:00
Marc Alexander
4c1569dd8a [ticket/11997] Add user's page dir to redirect path and fix unit tests for it
The user's page directory needs to be added to the redirect URL for proper
redirects outside of the forum root. Fix the unit tests accordingly.

PHPBB3-11997
2013-12-28 00:14:12 +01:00