aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge PR #1294 branch 'VSEphpbb/ticket/10155' into developOleg Pudeyev2013-05-081-0/+31
|\ | | | | | | | | | | | | | | | | | | | | # By Matt Friedman # Via Matt Friedman * VSEphpbb/ticket/10155: [ticket/10155] Update copyright in new migration file to 2013 [ticket/10155] Make effectively installed test more specific [ticket/10155] Use more descriptive title for migration file [ticket/10155] Use new migration file for jQuery config update [ticket/10155] Update jQuery to 1.8.3
| * [ticket/10155] Update copyright in new migration file to 2013Matt Friedman2013-05-061-1/+1
| | | | | | | | PHPBB3-10155
| * [ticket/10155] Make effectively installed test more specificMatt Friedman2013-03-221-1/+1
| | | | | | | | PHPBB3-10155
| * [ticket/10155] Use more descriptive title for migration fileMatt Friedman2013-03-171-1/+1
| | | | | | | | PHPBB3-10155
| * [ticket/10155] Use new migration file for jQuery config updateMatt Friedman2013-03-152-1/+32
| |
| * [ticket/10155] Update jQuery to 1.8.3Matt Friedman2013-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | Currently included jQuery is old by now, v1.6.2. We should update to 1.8.3. This allows us to take advantage of the latest form of jQuery event delegation ($.on). I don't think it wise to update to jQuery 1.9.x yet, as many 3rd party scripts still need to be updated to cope with its deprecated features ($.browser). Therefor, 1.8.3 is the latest and most widely compatible stable version right now. PHPBB3-10155
* | Merge PR #1209 branch 'dhruvgoel92/ticket/10325' into developOleg Pudeyev2013-05-083-0/+34
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Dhruv # Via Dhruv * dhruvgoel92/ticket/10325: [ticket/10325] move migration into a new file [ticket/10325] fix acp language [ticket/10325] use assert_response_success parts [ticket/10325] fix language in acp and ucp [ticket/10325] add assert_response_success in test [ticket/10325] functional tests for forgot password functionality [ticket/10325] add logout function in functional_test_case [ticket/10325] fix language in acp and ucp [ticket/10325] improve acp option language [ticket/10325] fix language key [ticket/10325] fix language variable [ticket/10325] change language var [ticket/10325] fix language [ticket/10325] add new config value to database [ticket/10325] trigger error if forgot password option disabled [ticket/10325] add allow forgot password option in acp
| * | [ticket/10325] move migration into a new fileDhruv2013-05-082-2/+28
| | | | | | | | | | | | PHPBB3-10325
| * | [ticket/10325] fix language keyDhruv2013-04-251-1/+1
| | | | | | | | | | | | PHPBB3-10325
| * | [ticket/10325] fix language variableDhruv2013-04-251-1/+1
| | | | | | | | | | | | PHPBB3-10325
| * | [ticket/10325] change language varDhruv2013-04-253-3/+3
| | | | | | | | | | | | PHPBB3-10325
| * | [ticket/10325] fix languageDhruv2013-04-251-1/+1
| | | | | | | | | | | | PHPBB3-10325
| * | [ticket/10325] add new config value to databaseDhruv2013-04-251-0/+2
| | | | | | | | | | | | PHPBB3-10325
| * | [ticket/10325] trigger error if forgot password option disabledDhruv2013-04-251-0/+5
| | | | | | | | | | | | PHPBB3-10325
| * | [ticket/10325] add allow forgot password option in acpDhruv2013-04-251-0/+1
| | | | | | | | | | | | PHPBB3-10325
* | | [ticket/11450] Fix all instances of phpbb_extension_metadata_managerJoas Schilling2013-05-082-2/+2
| | | | | | | | | | | | PHPBB3-11450
* | | [ticket/11450] Fix doc blocks and add missing class var $configJoas Schilling2013-05-081-3/+41
| | | | | | | | | | | | PHPBB3-11450
* | | [ticket/11450] Sort parameters alphabeticallyJoas Schilling2013-05-081-3/+4
| | | | | | | | | | | | PHPBB3-11450
* | | [ticket/11450] Remove unused $db and $phpEx from metadata_manager construct()Joas Schilling2013-05-081-7/+1
| | | | | | | | | | | | PHPBB3-11450
* | | Merge remote-tracking branch 'p-push/ticket/11435' into developAndreas Fischer2013-05-061-15/+21
|\ \ \ | | | | | | | | | | | | | | | | * p-push/ticket/11435: [ticket/11435] Fit comment into 80 columns and link to php manual.
| * | | [ticket/11435] Fit comment into 80 columns and link to php manual.Oleg Pudeyev2013-05-011-15/+21
| | | | | | | | | | | | | | | | PHPBB3-11435
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-063-8/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11144] Add missing {FORUM_NAME} variable [ticket/11144] Add missing {FORUM_NAME} variable Conflicts: phpBB/download/file.php phpBB/styles/prosilver/template/login_forum.html
| * \ \ \ Merge remote-tracking branch 'MGaetan89/ticket/11144' into develop-olympusAndreas Fischer2013-05-062-7/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * MGaetan89/ticket/11144: [ticket/11144] Add missing {FORUM_NAME} variable [ticket/11144] Add missing {FORUM_NAME} variable
| | * | | | [ticket/11144] Add missing {FORUM_NAME} variableGaƫtan Muller2013-05-062-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The template variable {FORUM_NAME} was missing from the login page of a password protected forum PHPBB3-11144
* | | | | | Merge PR #1388 branch 'dhruvgoel92/ticket/11288' into developOleg Pudeyev2013-05-061-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Dhruv # Via Dhruv * dhruvgoel92/ticket/11288: [ticket/11288] fix regex in postgres [ticket/11288] add search tests cases
| * | | | | | [ticket/11288] fix regex in postgresDhruv2013-05-041-1/+1
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Postgres search backend now uses updated regex being used by mysql search backend. PHPBB3-11288
* | | | | | Merge pull request #1348 from nickvergessen/ticket/11495Nils Adermann2013-05-025-0/+1040
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Ticket/11495 Nested Set Implementation
| * | | | | [ticket/11495] Throw exception when item that should be deleted does not existJoas Schilling2013-04-301-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11495
| * | | | | [ticket/11495] Some more doc changesJoas Schilling2013-04-302-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11495
| * | | | | [ticket/11495] Fix more grammar issues in doc blocksJoas Schilling2013-04-301-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11495
| * | | | | [ticket/11495] Fix "as well" typo and remove bracketsJoas Schilling2013-04-302-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11495
| * | | | | [ticket/11495] Do not reset item_parent if not requiredJoas Schilling2013-04-301-15/+17
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11495
| * | | | | [ticket/11495] Fix @return doc of get_sql_where()Joas Schilling2013-04-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11495
| * | | | | [ticket/11495] Remove useless release_lock() methodJoas Schilling2013-04-301-24/+14
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11495
| * | | | | [ticket/11495] Use $lock->owns_lock() instead of own propertyJoas Schilling2013-04-301-16/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11495
| * | | | | [ticket/11495] Add owns_lock() method to lock classesJoas Schilling2013-04-302-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11495
| * | | | | [ticket/11495] Remove useless castJoas Schilling2013-04-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11495
| * | | | | [ticket/11495] Move lock code into two methods to allow easier handlingJoas Schilling2013-04-301-40/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also allows to simply remove the lock handling by overwriting the two methods acquire_lock() and release_lock(). PHPBB3-11495
| * | | | | [ticket/11495] Fix docs of add_item_to_nestedset() and take id as argumentJoas Schilling2013-04-301-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11495
| * | | | | [ticket/11495] Fix some more comments and the package tagJoas Schilling2013-04-303-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11495
| * | | | | [ticket/11495] Correctly distinguish between children and descendantsJoas Schilling2013-04-301-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11495
| * | | | | [ticket/11495] Use descendants and ancestors instead of parents/childrenJoas Schilling2013-04-302-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11495
| * | | | | [ticket/11495] Remove get_parent_data from interface and rename itJoas Schilling2013-04-302-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method is implementation specific and has no use, apart from cache, that is not covered by get_path_data(). PHPBB3-11495
| * | | | | [ticket/11495] Fix some docs and replace branch with other termsJoas Schilling2013-04-302-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11495
| * | | | | [ticket/11495] Fix doc blocks once moreJoas Schilling2013-04-262-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11495
| * | | | | [ticket/11495] Make method names for add/remove more descriptiveJoas Schilling2013-04-261-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11495
| * | | | | [ticket/11495] Fix comments and package docsJoas Schilling2013-04-253-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11495
| * | | | | [ticket/11495] Use constructor arguments over properties in implementationJoas Schilling2013-04-252-22/+47
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11495
| * | | | | [ticket/11495] Remove add/remove from the interfaceJoas Schilling2013-04-252-23/+13
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11495
| * | | | | [ticket/11495] Remove fixing function from tree interfaceJoas Schilling2013-04-252-29/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fixing function is implementation dependent. PHPBB3-11495