Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #624 from lisps/revisions | Andreas Gohr | 2014-09-29 |
|\ | | | | | date_at support | ||
| * | Merge remote-tracking branch master into revisions | lisps | 2014-09-26 |
| |\ | |||
| * \ | Merge remote-tracking branch 'remotes/origin/master' into revisions_local | lisps | 2014-03-19 |
| |\ \ | |||
| * \ \ | Merge remote-tracking branch 'origin/diff_navigation' into revisions | lisps | 2014-02-17 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: inc/parser/xhtml.php | ||
| * \ \ \ | Merge remote-tracking branch 'remotes/splitbrain/diff_navigation' into revisions | lisps | 2013-11-22 |
| |\ \ \ \ | |||
| * | | | | | add parameter at($DATE_AT) and mind revisions | lisps | 2013-11-21 |
| | | | | | | |||
* | | | | | | Merge remote-tracking branch 'origin/master' into FS#2697searchpagereadonly | Gerrit Uitslag | 2014-09-28 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: inc/lang/hr/searchpage.txt inc/lang/ko/searchpage.txt | ||
| * | | | | | add PHPDocs in html.php | Gerrit Uitslag | 2014-07-15 |
| | | | | | | |||
| * | | | | | Move colon from code to language strings | Gerrit Uitslag | 2014-05-16 |
| | | | | | | |||
| * | | | | | use plaintext authornames in diff navigation dropdowns | Gerrit Uitslag | 2014-04-16 |
| | |_|_|/ | |/| | | | |||
| * | | | | Merge branch 'master' into diff_navigation | Andreas Gohr | 2014-03-14 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (103 commits) Add a basic test case for the cache Events: Trigger a warning if the default action is not callable Fix caching (make the event callback public again) translation update translation update translation update translation update translation update translation update translation update avoid HTTP image screenshot urls. closes #595 translation update Extension manager: Fix cache extension to be .repo adjusted the office type color again another instance of empty() where an array key might not exist remove placeholder van denied.txt updated file icons once more removed 'not logged in' text, loginform is shown already Revert "added stripped bit to language file" fixed index file ... Conflicts: inc/html.php | ||
| | * \ \ \ | Merge pull request #574 from splitbrain/FS#2124deniedtext | Andreas Gohr | 2014-03-14 |
| | |\ \ \ \ | | | | | | | | | | | | | | | Improve denied access text FS#2124 | ||
| | | * | | | | removed 'not logged in' text, loginform is shown already | Gerrit Uitslag | 2014-03-06 |
| | | | | | | | |||
| | | * | | | | added login form at denied access page | Gerrit Uitslag | 2014-03-04 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | - restore lang string as well | ||
| | | * | | | | added new html_denied() method as well | Gerrit Uitslag | 2014-02-25 |
| | | | | | | | |||
| | * | | | | | use empty() where array values might not be set | Christopher Smith | 2014-03-05 |
| | |/ / / / | |||
| * | | | | | Merge remote-tracking branch 'origin/master' into diff_navigation | Gerrit Uitslag | 2014-02-23 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: inc/html.php | ||
| | * | | | | have most current revision always available in $INFO | Andreas Gohr | 2014-02-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | fixes fix for FS#2853 | ||
| * | | | | | improve comment in html_diff_navigation | Gerrit Uitslag | 2014-02-20 |
| | | | | | | |||
| * | | | | | diff of removed page, require handling right rev=0 | Gerrit Uitslag | 2014-02-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When page is removed, and diff can be requested between a revision and current situation. This results in right revision is 0. Similar case just after creating a page. A diff between the first version and nothing before, result in left revision is 0. In these cases a empty dummy revision is placed as selected value in dropdown. Otherwise user got distracted by the revisions details shown in select field, which are not related to the diff below. | ||
| * | | | | | improved positioning of diff options | Anika Henke | 2014-02-19 |
| | | | | | | |||
| * | | | | | Check if revision is defined at all before comparing | Gerrit Uitslag | 2014-02-18 |
| | | | | | | |||
| * | | | | | extract navigation html to separated method | Gerrit Uitslag | 2014-02-18 |
| | |_|_|/ | |/| | | | |||
| * | | | | Improve PHPDocs html.php | Gerrit Uitslag | 2014-02-17 |
| | | | | | |||
| * | | | | Reorganise generation and displaying of html. Added comments | Gerrit Uitslag | 2014-02-17 |
| | | | | | |||
| * | | | | Put diff navigation in diff view table | Gerrit Uitslag | 2014-02-17 |
| | | | | | |||
| * | | | | Code reformatting html_diff | Gerrit Uitslag | 2014-02-17 |
| | | | | | |||
| * | | | | roughly styled diff nav row | Anika Henke | 2014-02-17 |
| | | | | | |||
| * | | | | add comments to html_diff | Gerrit Uitslag | 2014-02-17 |
| | | | | | |||
| * | | | | replace arrows in names of diff links by texts | Gerrit Uitslag | 2014-02-17 |
| | | | | | |||
| * | | | | reverse revisions display order | Gerrit Uitslag | 2014-02-15 |
| | | | | | |||
| * | | | | remove close p tag in diffview | Gerrit Uitslag | 2014-02-15 |
| | | | | | |||
| * | | | | diff navigation: move prev/next on one side or both side | Gerrit Uitslag | 2014-02-15 |
| | | | | | |||
| * | | | | add disable options to form_makeListboxField. Disable out of range revisions | Gerrit Uitslag | 2014-02-15 |
| | | | | | |||
| * | | | | Merge remote-tracking branch 'origin/master' into diff_navigation | Gerrit Uitslag | 2014-02-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit. * include upstream change * added dropdowns | ||
| * | | | | Merge remote-tracking branch 'origin/master' into diff_navigation | Gerrit Uitslag | 2014-02-15 |
| |\| | | | |||
| * | | | | Merge remote-tracking branch 'origin/master' into diff_navigation | Gerrit Uitslag | 2014-02-15 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||
| * | | | | fix not updated call, renaming | Gerrit Uitslag | 2013-11-21 |
| | | | | | |||
| * | | | | refactor PageRevisionLog into Media- and PageChangelog extending Changelog | Gerrit Uitslag | 2013-11-21 |
| | |_|/ | |/| | | |||
| * | | | isCurrentPage is page dependent | Gerrit Uitslag | 2013-11-20 |
| | | | | |||
| * | | | update function calls to changelog functions | Gerrit Uitslag | 2013-11-20 |
| | | | | |||
| * | | | Merge remote-tracking branch 'origin/master' into diff_navigation | Gerrit Uitslag | 2013-11-19 |
| |\ \ \ | |||
| * \ \ \ | merge master in branch | Klap-in | 2013-07-14 |
| |\ \ \ \ | |||
| * | | | | | Added diff navigation | Klap-in | 2013-01-27 |
| | | | | | | | | | | | | | | | | | | | | | | | | Navigation links to move to previous edit before revision in left column or next/last edit after revision in right column. | ||
* | | | | | | use correct permission level for showing 'create page' text | Gerrit Uitslag | 2014-03-04 |
| | | | | | | |||
* | | | | | | Update text above searchresults, when only read-acl FS#2697 | Gerrit Uitslag | 2014-02-21 |
| |_|_|_|/ |/| | | | | |||
* | | | | | when creating a diff link always link to exact rev FS#2835 | Andreas Gohr | 2014-02-15 |
| |_|_|/ |/| | | | |||
* | | | | Add Apache module list to ?do=debug information | Christopher Smith | 2014-02-14 |
| | | | | | | | | | | | | | | | | | | | | This should make it possible to see if mod_security is involved, at least on servers running mod_php. | ||
* | | | | Merge remote-tracking branch 'origin/master' into extension_manager | Anika Henke | 2014-01-05 |
|\ \ \ \ | | |_|/ | |/| | | |||
| * | | | removed deprecated html_attbuild() | Anika Henke | 2013-11-04 |
| | | | |