Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'prep-release-3.1.0-a3' into develop | Joas Schilling | 2014-02-05 | 7 | -30/+169 |
|\ | |||||
| * | [prep-release-3.1.0-a3] Update version to 3.1.0-a4-dev for future development | Joas Schilling | 2014-02-05 | 2 | -2/+2 |
| | | |||||
| * | [prep-release-3.1.0-a3] Commit changelog for 3.1.0-a3 | Joas Schilling | 2014-02-05 | 1 | -0/+106 |
| | | |||||
| * | [prep-release-3.1.0-a3] Prepare Changelog | Joas Schilling | 2014-02-05 | 1 | -23/+26 |
| | | |||||
| * | [prep-release-3.1.0-a3] Add migration for 3.1.0-a3 | Joas Schilling | 2014-02-05 | 1 | -0/+30 |
| | | |||||
| * | [prep-release-3.1.0-a3] Update version to 3.1.0-a3 | Joas Schilling | 2014-02-05 | 5 | -7/+7 |
| | | |||||
* | | Merge pull request #1995 from EXreaction/ticket/11880 | Nils Adermann | 2014-02-05 | 3 | -22/+113 |
|\ \ | |/ |/| | Schema changes can take too long and cause a timeout | ||||
| * | [ticket/11880] migration helper file | Nathan Guse | 2014-02-05 | 1 | -0/+82 |
| | | | | | | | | PHPBB3-11880 | ||||
| * | [ticket/11880] Move get_schema_steps function to a migrator helper class | Nathan Guse | 2014-02-05 | 2 | -67/+11 |
| | | | | | | | | PHPBB3-11880 | ||||
| * | [ticket/11880] Break up schema changes in the migrator | Nathan Guse | 2014-02-03 | 1 | -21/+86 |
| | | | | | | | | PHPBB3-11880 | ||||
* | | [ticket/12163] Use posts_per_page to calculate current page in viewtopic.php | Cesar G | 2014-02-04 | 1 | -1/+1 |
| | | | | | | | | PHPBB3-12163 | ||||
* | | [ticket/12159] Fix codesniffer complaints due to profilefields and passwords | Marc Alexander | 2014-02-03 | 5 | -5/+3 |
| | | | | | | | | | | | | | | 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 | ||||
* | | Merge pull request #1942 from nickvergessen/ticket/11996 | Nathan Guse | 2014-02-03 | 2 | -3/+33 |
|\ \ | |/ |/| | [ticket/11996] Add explanation how to correctly remove and update an extension | ||||
| * | [ticket/11996] Remove note until we really do disable the board | Joas Schilling | 2014-02-03 | 1 | -1/+1 |
| | | | | | | | | PHPBB3-11996 | ||||
| * | [ticket/11996] Use a table for better styling | Joas Schilling | 2014-01-13 | 2 | -14/+27 |
| | | | | | | | | PHPBB3-11996 | ||||
| * | [ticket/11996] Add explanation how to correctly remove and update an extension | Joas Schilling | 2013-12-27 | 2 | -3/+20 |
| | | | | | | | | | | | | | | See http://area51.phpbb.com/phpBB/viewtopic.php?f=81&t=44001 for more information about the decision. PHPBB3-11996 | ||||
* | | [ticket/12156] Add missing passwords manager to oauth | Marc Alexander | 2014-02-03 | 2 | -2/+12 |
| | | | | | | | | PHPBB3-12156 | ||||
* | | [ticket/12154] Update schema files with lastest database schema | Joas Schilling | 2014-02-02 | 2 | -5/+5 |
| | | | | | | | | PHPBB3-12154 | ||||
* | | Merge branch 'develop-olympus' into develop | Andreas Fischer | 2014-02-02 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12146] Added a missing # to inline css-style of <span> Conflicts: phpBB/styles/prosilver/template/ucp_groups_manage.html | ||||
| * | | [ticket/12146] Added a missing # to inline css-style of <span> | Crizz0 | 2014-02-02 | 1 | -1/+1 |
| | | | | | | | | | | | | PHPBB3-12146 | ||||
* | | | Merge remote-tracking branch 'github-nickvergessen/ticket/11201' into develop | Nils Adermann | 2014-02-02 | 40 | -1794/+2978 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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] Remove empty calls section from .yml | Joas Schilling | 2014-02-02 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | PHPBB3-11201 | ||||
| * | | | [ticket/11201] Split template file into multiple files | Joas Schilling | 2014-02-02 | 8 | -33/+36 |
| | | | | | | | | | | | | | | | | PHPBB3-11201 | ||||
| * | | | [ticket/11201] Remove dependency from types on the manager | Joas Schilling | 2014-02-02 | 6 | -86/+48 |
| | | | | | | | | | | | | | | | | PHPBB3-11201 | ||||
| * | | | [ticket/11201] Rename profilefields class to manager | Joas Schilling | 2014-02-02 | 13 | -33/+33 |
| | | | | | | | | | | | | | | | | PHPBB3-11201 | ||||
| * | | | [ticket/11201] Fix parameter description | Joas Schilling | 2014-02-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | PHPBB3-11201 | ||||
| * | | | [ticket/11201] Use !== null, its faster | Joas Schilling | 2014-01-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | PHPBB3-11201 | ||||
| * | | | [ticket/11201] Also translate profile fields in UCP and ACP | Joas Schilling | 2014-01-19 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | PHPBB3-11201 | ||||
| * | | | [ticket/11201] Add parameters and variables to profile field class | Joas Schilling | 2014-01-19 | 1 | -1/+46 |
| | | | | | | | | | | | | | | | | PHPBB3-11201 | ||||
| * | | | [ticket/11201] Add commas on last array entry | Joas Schilling | 2014-01-19 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | PHPBB3-11201 | ||||
| * | | | [ticket/11201] Allow translation of profile field name and explanation | Joas Schilling | 2014-01-19 | 2 | -5/+5 |
| | | | | | | | | | | | | | | | | PHPBB3-11201 | ||||
| * | | | [ticket/11201] Fix some variable names | Joas Schilling | 2014-01-18 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | PHPBB3-11201 | ||||
| * | | | [ticket/11201] Add a method to return the translated full name of the type | Joas Schilling | 2014-01-18 | 10 | -13/+28 |
| | | | | | | | | | | | | | | | | PHPBB3-11201 | ||||
| * | | | [ticket/11201] Remove db depending code from field class | Joas Schilling | 2014-01-18 | 1 | -35/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | sql_build_array() should already take care of that PHPBB3-11201 | ||||
| * | | | [ticket/11201] Add variables to classes and add constructor doc blocks | Joas Schilling | 2014-01-18 | 7 | -0/+196 |
| | | | | | | | | | | | | | | | | PHPBB3-11201 | ||||
| * | | | [ticket/11201] Update copyright in class file | Joas Schilling | 2014-01-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | PHPBB3-11201 | ||||
| * | | | [ticket/11201] Add visibility and remove unused variable | Joas Schilling | 2014-01-18 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | PHPBB3-11201 | ||||
| * | | | [ticket/11201] Add some commas at the last array entry | Joas Schilling | 2014-01-18 | 2 | -6/+6 |
| | | | | | | | | | | | | | | | | PHPBB3-11201 | ||||
| * | | | [ticket/11201] Cast some variables to integer | Joas Schilling | 2014-01-18 | 2 | -9/+9 |
| | | | | | | | | | | | | | | | | PHPBB3-11201 | ||||
| * | | | [ticket/11201] Inject table names rather then using constants | Joas Schilling | 2014-01-18 | 4 | -10/+30 |
| | | | | | | | | | | | | | | | | PHPBB3-11201 | ||||
| * | | | [ticket/11201] Update schema files and unit test | Joas Schilling | 2014-01-17 | 8 | -16/+16 |
| | | | | | | | | | | | | | | | | PHPBB3-11201 | ||||
| * | | | [ticket/11201] Change type from integer to service name | Joas Schilling | 2014-01-17 | 12 | -34/+210 |
| | | | | | | | | | | | | | | | | PHPBB3-11201 | ||||
| * | | | [ticket/11201] Move custom template variable assignment to type class | Joas Schilling | 2014-01-17 | 8 | -55/+89 |
| | | | | | | | | | | | | | | | | PHPBB3-11201 | ||||
| * | | | [ticket/11201] Move preparation of hidden fields to type class | Joas Schilling | 2014-01-17 | 6 | -43/+106 |
| | | | | | | | | | | | | | | | | PHPBB3-11201 | ||||
| * | | | [ticket/11201] Allow manipulating the intended variables with the type class | Joas Schilling | 2014-01-17 | 8 | -99/+180 |
| | | | | | | | | | | | | | | | | PHPBB3-11201 | ||||
| * | | | [ticket/11201] Move type specific error messages to type class | Joas Schilling | 2014-01-17 | 5 | -9/+44 |
| | | | | | | | | | | | | | | | | PHPBB3-11201 | ||||
| * | | | [ticket/11201] Add abstract base class with shared methods | Joas Schilling | 2014-01-17 | 8 | -91/+59 |
| | | | | | | | | | | | | | | | | PHPBB3-11201 | ||||
| * | | | [ticket/11201] Move field type depending preparation of the options to class | Joas Schilling | 2014-01-17 | 7 | -27/+63 |
| | | | | | | | | | | | | | | | | PHPBB3-11201 | ||||
| * | | | [ticket/11201] Move grabbing the input of the language options to type class | Joas Schilling | 2014-01-16 | 8 | -27/+99 |
| | | | | | | | | | | | | | | | | PHPBB3-11201 | ||||
| * | | | [ticket/11201] Move language option determination into type class | Joas Schilling | 2014-01-15 | 8 | -26/+126 |
| | | | | | | | | | | | | | | | | PHPBB3-11201 |