aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4 from nickvergessen/ticket/marc/11997Marc Alexander2013-11-137-2/+104
|\
| * [ticket/11997] Add functional test for redirects in controllerJoas Schilling2013-11-135-1/+72
| * [ticket/11997] Fix missing globalJoas Schilling2013-11-131-1/+1
| * [ticket/11997] Fix redirects from inside controllersJoas Schilling2013-11-132-0/+31
|/
* [ticket/11997] Use $phpbb_filesystem->clean_path() for proper redirect pathsMarc Alexander2013-11-122-34/+39
* [ticket/11997] Rename root_dirs_size to superordinate_dirs_countMarc Alexander2013-11-111-2/+10
* [ticket/11997] Remove obsolete if statement in phpbb_own_realpath()Marc Alexander2013-11-101-10/+0
* [ticket/11997] Correctly redirect to front controllersMarc Alexander2013-11-082-25/+21
* Merge pull request #1845 from nickvergessen/ticket/11994David King2013-11-077-143/+146
|\
| * [ticket/11994] Fix functional testsJoas Schilling2013-11-081-1/+7
| * [ticket/11994] "Delete data" is only available for disabled extensionsJoas Schilling2013-11-081-2/+2
| * [ticket/11994] Filter crawler for better search comparisonsJoas Schilling2013-11-081-13/+13
| * [ticket/11994] Change error level for missing .json fileJoas Schilling2013-11-081-1/+1
| * [ticket/11994] Fix more languageJoas Schilling2013-11-081-6/+6
| * [ticket/11994] Fix tests after uninstall renameJoas Schilling2013-11-081-8/+8
| * [ticket/11994] Rename "uninstall" to "delete data"Joas Schilling2013-11-083-20/+23
| * [ticket/11994] Make install/enable just one UI thingJoas Schilling2013-11-083-18/+9
| * [ticket/11994] Update functional tests with display nameJoas Schilling2013-11-081-3/+3
| * [ticket/11994] Use display name on confirmation screenJoas Schilling2013-11-081-3/+3
| * [ticket/11994] Fix some languageJoas Schilling2013-11-081-2/+2
| * [ticket/11994] Replace spaces with tabsJoas Schilling2013-11-081-55/+55
| * [ticket/11994] Fix functional extension testsJoas Schilling2013-11-081-18/+18
| * [ticket/11994] More language fixesJoas Schilling2013-11-081-5/+5
| * [ticket/11994] Make extension manager UI less misleadingJoas Schilling2013-11-086-69/+72
|/
* Merge pull request #1819 from marc1706/ticket/11534Nathan Guse2013-11-042-0/+40
|\
| * [ticket/11534] Check remote avatar content type if possibleMarc Alexander2013-10-242-0/+40
* | Merge pull request #1788 from VSEphpbb/ticket/11935Nathan Guse2013-11-0451-78/+96
|\ \
| * \ [ticket/11935] Merge remote-tracking branch 'upstream/develop'Matt Friedman2013-10-29118-1006/+2929
| |\ \
| * \ \ Merge branch 'develop' into ticket/11935Matt Friedman2013-10-2039-219/+1419
| |\ \ \
| * | | | [ticket/11935] Tweak colour swatch tableMatt Friedman2013-10-191-2/+9
| * | | | [ticket/11935] Replace obsolete table attributes in Admin with CSSMatt Friedman2013-10-1932-46/+51
| * | | | [ticket/11935] Remove obsolete table attributes from ProsilverMatt Friedman2013-10-1913-19/+19
| * | | | [ticket/11935] Fix invalid HTML usage of <label> tag in prosilverMatt Friedman2013-10-196-6/+12
| * | | | [ticket/11935] Fix stray </a> tagsMatt Friedman2013-10-191-2/+2
| * | | | [ticket/11935] Fix incorrect alt tags that should be title tagsMatt Friedman2013-10-191-2/+2
| * | | | [ticket/11935] Fix <p> tags not allowed inside <strong> tagsMatt Friedman2013-10-191-1/+1
* | | | | Merge pull request #1826 from imkingdavid/ticket/11975Nathan Guse2013-11-0410-16/+14
|\ \ \ \ \
| * | | | | [ticket/11975] Remove copy/paste fail, fix testsDavid King2013-11-021-1/+0
| * | | | | [ticket/11975] Change shortened ACP/MCP label to Administer/ModerateDavid King2013-11-025-8/+8
| * | | | | [ticket/11975] Make link text shorter on smaller resolutionsDavid King2013-11-025-5/+7
| * | | | | [ticket/11975] Add ACP link next to MCP link in headerDavid King2013-11-029-15/+12
* | | | | | Merge remote-tracking branch 'prototech/ticket/11899' into developDhruv2013-11-041-1/+1
|\ \ \ \ \ \
| * | | | | | [ticket/11899] Give indication of activity after voting in poll.Cesar G2013-10-171-1/+1
* | | | | | | Merge remote-tracking branch 'prototech/ticket/11928' into developDhruv2013-11-048-25/+67
|\ \ \ \ \ \ \
| * | | | | | | [ticket/11928] Javascript requires camel case.Cesar G2013-11-031-14/+14
| * | | | | | | [ticket/11928] Rename loadingAlert to loading_indicator.Cesar G2013-10-301-14/+14
| * | | | | | | [ticket/11928] Make sure the indicator is on top of other elements.Cesar G2013-10-292-0/+2
| * | | | | | | [ticket/11928] Replace AJAX loading popup with animation.Cesar G2013-10-298-15/+55
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/11973' into developDhruv2013-11-041-2/+3
|\ \ \ \ \ \ \
| * | | | | | | [ticket/11973] Remove logic from tokens language arrayJoas Schilling2013-10-261-2/+3