aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-03-221-0/+1
|\ | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12035] Correcting the condition [ticket/12035] Adding necessary conditions [ticket/12035] Adding link to user posts to ACP page Conflicts: phpBB/adm/style/acp_users_overview.html
| * [ticket/12035] Correcting the conditiongeetakshi2014-03-201-1/+1
| | | | | | | | PHPBB3-12035
| * [ticket/12035] Adding necessary conditionsgeetakshi2014-03-201-1/+1
| | | | | | | | PHPBB3-12035
| * [ticket/12035] Adding link to user posts to ACP pagegeetakshi2014-03-171-0/+1
| | | | | | | | | | | | Adding link of posts behind displayed number of posts of the user PHPBB3-12035
* | [ticket/12292] Improve style details pageMatt Friedman2014-03-201-0/+3
| | | | | | | | | | | | | | | | | | http://tracker.phpbb.com/browse/PHPBB3-12292 Gave style details page a proper heading and back button. Also removed a few obsolete code leftovers in the style and CSS. PHPBB3-12292
* | Merge pull request #2137 from geetakshi/ticket/8309Dhruv Goel2014-03-201-2/+2
|\ \ | | | | | | [ticket/8309] Rename "Last visited" to "Last activity" on memberlist/viewprofile
| * | [ticket/8309] Changing $last_activity to $last_activegeetakshi2014-03-201-2/+2
| | | | | | | | | | | | PHPBB3-8309
| * | [ticket/8309] Rename $last_visit to $last_activitygeetakshi2014-03-161-2/+2
| | | | | | | | | | | | PHPBB3-8309
* | | Merge remote-tracking branch 'Elsensee/ticket/11169' into developJoas Schilling2014-03-191-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | * Elsensee/ticket/11169: [ticket/11169] Skip migration if "Users" category has been deleted [ticket/11169] Move module 'prune users' to users category
| * | | [ticket/11169] Move module 'prune users' to users categoryOliver Schramm2014-03-161-1/+1
| |/ / | | | | | | | | | PHPBB3-11169
* | | [ticket/11239] Removing hard-coded, language specific possessivegeetakshi2014-03-161-1/+1
| | | | | | | | | | | | PHPBB3-11239
* | | [ticket/11239] Including username before Overview titlegeetakshi2014-03-161-1/+2
|/ / | | | | | | | | | | | | Adding username to the page title to avoid confusion while managing multiple users in ACP PHPBB3-11239
* | Merge remote-tracking branch 'EXreaction/ticket/9871-2' into developJoas Schilling2014-03-142-49/+29
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/9871-2: [ticket/9871] Can set current version to use instead of the phpBB version [ticket/9871] Fix indentation on comment [ticket/9871] Fix test name [ticket/9871] Split fast and slow version tests [ticket/9871] Option to force the stability when checking for updates [ticket/9871] Allow setting the host/file to load for the version class [ticket/9871] Restore get_remote_file_test [ticket/9871] Fix tests [ticket/9871] Typehint and comment on var types [ticket/9871] Mark test as slow [ticket/9871] Restore phpbb_version_compare [ticket/9871] Restore get_remote_file [ticket/9871] Use $request->variable instead of request_var [ticket/9871] Update version check file to use json format
| * | [ticket/9871] Use $request->variable instead of request_varNathan Guse2014-03-052-3/+3
| | | | | | | | | | | | PHPBB3-9871
| * | [ticket/9871] Update version check file to use json formatNathan Guse2014-02-192-49/+29
| | | | | | | | | | | | PHPBB3-9871
* | | Merge pull request #2126 from nickvergessen/ticket/forumhulp/12241Dhruv Goel2014-03-141-1/+13
|\ \ \ | | | | | | | | [ticket/12241] Event to add and/or modify acp_board configurations
| * | | [ticket/12241] Add @var for the argumentsJoas Schilling2014-03-141-0/+3
| | | | | | | | | | | | | | | | PHPBB3-12241
| * | | [ticket/12241] Update event name and version match our guidelinesJoas Schilling2014-03-141-6/+4
| | | | | | | | | | | | | | | | PHPBB3-12241
| * | | [ticket/12241] Add submit to event variablesForumhulp.com2014-03-141-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12241
| * | | [ticket/12241] Move $phpbb_dispatcher to the topForumhulp.com2014-03-141-2/+1
| | | | | | | | | | | | | | | | PHPBB3-12241
| * | | [ticket/12241] Event to add and/or modify acp_board configurationsForumhulp.com2014-03-141-0/+12
| | | | | | | | | | | | | | | | PHPBB3-12241
* | | | Merge branch 'develop-olympus' into developJoas Schilling2014-03-131-2/+7
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12176] Reword comment about config entries. [ticket/12176] Add newest_user_colour to config array to ensure it exists [ticket/12176] Display correct message when trying to delete founder. [ticket/12176] Add functional test for founder deletion message. Conflicts: tests/test_framework/phpbb_functional_test_case.php
| * | | [ticket/12176] Display correct message when trying to delete founder.Andreas Fischer2014-02-151-2/+7
| | | | | | | | | | | | | | | | PHPBB3-12176
* | | | [ticket/12236] Move AOL Instant Messanger field to custom profile fieldJoas Schilling2014-03-051-5/+0
| | | | | | | | | | | | | | | | PHPBB3-12236
* | | | [ticket/12237] Convert yahoo messanger to custom profile fieldJoas Schilling2014-03-051-4/+0
| | | | | | | | | | | | | | | | PHPBB3-12237
* | | | [ticket/12235] Convert WLM to custom profile fieldJoas Schilling2014-03-041-4/+0
| | | | | | | | | | | | | | | | PHPBB3-12235
* | | | [ticket/12187] Remove user_website functionalityJoas Schilling2014-03-032-8/+0
| | | | | | | | | | | | | | | | PHPBB3-12187
* | | | [ticket/12234] Replace ICQ with custom profile fieldJoas Schilling2014-02-281-6/+0
| | | | | | | | | | | | | | | | PHPBB3-12234
* | | | [ticket/12233] Allow profile fields to be contact fieldsJoas Schilling2014-02-281-7/+19
| |/ / |/| | | | | | | | | | | | | | | | | | | | Contact fields are displayed with in the contact section of the user profile and are displayed differently in the mini profile next to posts and private messages PHPBB3-12233
* | | Merge pull request #2035 from prototech/ticket/12138Nathan Guse2014-02-201-62/+130
|\ \ \ | |_|/ |/| | [ticket/12138] Include file time limit when generating attachment management pagination and stats.
| * | [ticket/12138] Replace old code and generate pagination using filetime limit.Cesar G2014-02-161-60/+22
| | | | | | | | | | | | PHPBB3-12138
| * | [ticket/12138] Add methods for attachment manage functionality.Cesar G2014-02-161-2/+108
| | | | | | | | | | | | PHPBB3-12138
* | | Merge pull request #2002 from prototech/ticket/12153Nathan Guse2014-02-185-7/+0
|\ \ \ | |/ / |/| | [ticket/12153] Assign PAGE_NUMBER in pagination.generate_template_pagination()
| * | [ticket/12153] Remove redundant calls to pagination.on_page().Cesar G2014-02-035-7/+0
| | | | | | | | | | | | PHPBB3-12153
* | | [ticket/12169] Add new option to display profile fields on memberlistJoas Schilling2014-02-101-1/+5
| | | | | | | | | | | | PHPBB3-12169
* | | [ticket/12169] Convert user_from to profile field locationJoas Schilling2014-02-101-4/+0
| | | | | | | | | | | | | | | | | | Missing changes on memberlist view due to missing functionality PHPBB3-12169
* | | [ticket/12115] Also port user interests to profile fieldsJoas Schilling2014-02-061-4/+0
| | | | | | | | | | | | PHPBB3-12115
* | | [ticket/12115] Convert user occupation to a profile fieldJoas Schilling2014-02-061-4/+0
|/ / | | | | | | PHPBB3-12115
* | Merge remote-tracking branch 'github-nickvergessen/ticket/11201' into developNils Adermann2014-02-022-484/+68
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | [ticket/11201] Rename profilefields class to managerJoas Schilling2014-02-022-2/+2
| | | | | | | | | | | | PHPBB3-11201
| * | [ticket/11201] Use !== null, its fasterJoas Schilling2014-01-201-1/+1
| | | | | | | | | | | | PHPBB3-11201
| * | [ticket/11201] Fix some variable namesJoas Schilling2014-01-181-1/+1
| | | | | | | | | | | | PHPBB3-11201
| * | [ticket/11201] Add a method to return the translated full name of the typeJoas Schilling2014-01-181-3/+3
| | | | | | | | | | | | PHPBB3-11201
| * | [ticket/11201] Change type from integer to service nameJoas Schilling2014-01-171-18/+19
| | | | | | | | | | | | PHPBB3-11201
| * | [ticket/11201] Move custom template variable assignment to type classJoas Schilling2014-01-171-44/+7
| | | | | | | | | | | | PHPBB3-11201
| * | [ticket/11201] Move preparation of hidden fields to type classJoas Schilling2014-01-171-43/+5
| | | | | | | | | | | | PHPBB3-11201
| * | [ticket/11201] Allow manipulating the intended variables with the type classJoas Schilling2014-01-171-99/+6
| | | | | | | | | | | | PHPBB3-11201
| * | [ticket/11201] Move type specific error messages to type classJoas Schilling2014-01-171-9/+1
| | | | | | | | | | | | PHPBB3-11201
| * | [ticket/11201] Move field type depending preparation of the options to classJoas Schilling2014-01-171-27/+8
| | | | | | | | | | | | PHPBB3-11201
| * | [ticket/11201] Move grabbing the input of the language options to type classJoas Schilling2014-01-161-20/+5
| | | | | | | | | | | | PHPBB3-11201