Skip to content
Navigation Menu
Sign in
Products
Platform
GitHub
Repository hosting, code review, and collaboration
Copilot
AI coding agent for tasks, projects, and automated work
Build & Ship
Actions
CI/CD and automation
Code Quality
Quality analysis, fixes, and enforcement
Codespaces
Cloud development environments
Secure
Code Security
Vulnerability detection and remediation
Secret Protection
Secret scanning and leak prevention
All Features
Developers
Learn
Documentation
Training
Certifications
Build
Build with Copilot
Customize Copilot
Integrations
Explore
Trending repos
GitHub Sponsors
Developer articles
Changelog
Changelog
Your source for the latest features, improvements, and fixes across GitHub products, all in one place.
Businesses
By Stage
Enterprises
Team
Startups
Nonprofits
By Industry
Healthcare
Financial services
Manufacturing
Government
See all industries
Evaluate GitHub
Why GitHub
Customer Stories
Business insights
Trust Center
Add-ons
GitHub Advanced Security
Enterprise-grade code security
Copilot for business
Enterprise-grade AI features
Premium Support
Enterprise-grade 24/7 support
Resources
Learn & Connect
Documentation
Resource center
Blog
Events & webinars
Community Forum
Customer Stories
Integrations
Support
Customer support
Training
GitHub Status
Company
About
Partners
Changelog
GitHub Universe
GitHub Universe
The event for developers, by developers — talks, workshops, and what’s next for GitHub.
Pricing
Search
/
Sign in
Sign up
Appearance settings
You signed in with another tab or window.
Reload
to refresh your session.
You signed out in another tab or window.
Reload
to refresh your session.
You switched accounts on another tab or window.
Reload
to refresh your session.
Dismiss alert
{{ message }}
alexlehm
dokuwiki
Repository navigation
Code
Pull requests
1
(1)
Actions
Projects
Security and quality
Insights
More
items
Commits
Branch selector
3waymerge
User selector
All users
Datepicker
All time
Commit history
Commits on Apr 30, 2011
Added localization for merge handling
splitbrain
committed
861b333
View commit details
Copy full SHA for 861b333
Browse repository at this point
Scroll to and select first merge conflict in editor
Show description for 9ae98fa
splitbrain
committed
9ae98fa
View commit details
Copy full SHA for 9ae98fa
Browse repository at this point
deny serving with merge conflicts present
splitbrain
committed
4e4618a
View commit details
Copy full SHA for 4e4618a
Browse repository at this point
make merge conflict labels completely customizable
splitbrain
committed
dd00f9d
View commit details
Copy full SHA for dd00f9d
Browse repository at this point
mark merge conflicts and let the user solve them
splitbrain
committed
795f500
View commit details
Copy full SHA for 795f500
Browse repository at this point
Try to automatically resolve conflicts using 3way merge
Show description for 4adfcfc
splitbrain
committed
4adfcfc
View commit details
Copy full SHA for 4adfcfc
Browse repository at this point
Added 3way merge from PEAR Text_Diff3
Show description for 72dbd63
splitbrain
committed
72dbd63
View commit details
Copy full SHA for 72dbd63
Browse repository at this point
Commits on Apr 28, 2011
Merged pull request #42 from lupo49/master.
Show description for 7146bcb
splitbrain
committed
7146bcb
View commit details
Copy full SHA for 7146bcb
Browse repository at this point
language updates: update.dokuwiki.org is currently used for update/msg-checks
Matthias Schulte
committed
84ddc6d
View commit details
Copy full SHA for 84ddc6d
Browse repository at this point
Commits on Apr 27, 2011
Czech language update
xmamut
authored and
splitbrain
committed
8eafbfc
View commit details
Copy full SHA for 8eafbfc
Browse repository at this point
Korean language update
erial
authored and
splitbrain
committed
f340134
View commit details
Copy full SHA for f340134
Browse repository at this point
Bulgarian language update
NEOhidra
authored and
splitbrain
committed
cf800b3
View commit details
Copy full SHA for cf800b3
Browse repository at this point
Merged pull request #41 from lupo49/master.
Show description for c34221f
splitbrain
committed
c34221f
View commit details
Copy full SHA for c34221f
Browse repository at this point
Remove deprecated call-time pass-by-reference in inc/common.php
Show description for a1bbd05
michitux
committed
a1bbd05
View commit details
Copy full SHA for a1bbd05
Browse repository at this point
eu: language updates
Matthias Schulte
committed
8e702eb
View commit details
Copy full SHA for 8e702eb
Browse repository at this point
Merge remote branch 'upstream/master'
Matthias Schulte
committed
fe537d1
View commit details
Copy full SHA for fe537d1
Browse repository at this point
Merge HEAD, branch 'master' of github.com:lupo49/dokuwiki
Matthias Schulte
committed
02901e5
View commit details
Copy full SHA for 02901e5
Browse repository at this point
Commits on Apr 26, 2011
Fix p_get_first_heading for when the search index is empty
Show description for 65f4051
michitux
committed
65f4051
View commit details
Copy full SHA for 65f4051
Browse repository at this point
allow tpl_getFavicon() returning the absolute path to the icon file
lupo49
committed
a7e5f74
View commit details
Copy full SHA for a7e5f74
Browse repository at this point
Commits on Apr 23, 2011
de/de-informal: language updates (added "packageinstalled")
lupo49
committed
549bcf6
View commit details
Copy full SHA for 549bcf6
Browse repository at this point
Commits on Apr 22, 2011
Make the page lookup by title case insensitive again
Show description for c66f16a
michitux
committed
c66f16a
View commit details
Copy full SHA for c66f16a
Browse repository at this point
Release preparations
adrianheine
committed
c991623
View commit details
Copy full SHA for c991623
Browse repository at this point
Make ft_pageLookup respect the namespace restriction again
Show description for 0c074a5
michitux
committed
0c074a5
View commit details
Copy full SHA for 0c074a5
Browse repository at this point
Commits on Apr 21, 2011
Fix HTML in DifferenceEngine tests
adrianheine
committed
9bd9209
View commit details
Copy full SHA for 9bd9209
Browse repository at this point
Make locktimer more robust
Show description for 4b1755b
adrianheine
committed
4b1755b
View commit details
Copy full SHA for 4b1755b
Browse repository at this point
Commits on Apr 20, 2011
Portuguese language update
José Carlos Campos
authored and
splitbrain
committed
30d5f02
View commit details
Copy full SHA for 30d5f02
Browse repository at this point
Enable metadata rendering in the indexer
Show description for 93475e6
michitux
committed
93475e6
View commit details
Copy full SHA for 93475e6
Browse repository at this point
Commits on Apr 19, 2011
Hungarian language update
Tihanyi Sándor
authored and
splitbrain
committed
c9fc06d
View commit details
Copy full SHA for c9fc06d
Browse repository at this point
Latvian language update
allefm
authored and
splitbrain
committed
02172c3
View commit details
Copy full SHA for 02172c3
Browse repository at this point
Commits on Apr 18, 2011
Merge https://github.com/akate/dokuwiki into akate-058f1c3
bug
committed
6929b6c
View commit details
Copy full SHA for 6929b6c
Browse repository at this point
Revert "correctly disable unfinished media options popup"
Show description for 1f663d3
splitbrain
committed
1f663d3
View commit details
Copy full SHA for 1f663d3
Browse repository at this point
Merge remote-tracking branch 'upstream/master'
akate
committed
f493983
View commit details
Copy full SHA for f493983
Browse repository at this point
Commits on Apr 17, 2011
Ukrainian language update
akate
committed
058f1c3
View commit details
Copy full SHA for 058f1c3
Browse repository at this point
Ukrainian language update
akate
committed
1ffa310
View commit details
Copy full SHA for 1ffa310
Browse repository at this point
correctly disable unfinished media options popup
Show description for 342e58c
splitbrain
committed
342e58c
View commit details
Copy full SHA for 342e58c
Browse repository at this point
Previous
Next
You can’t perform that action at this time.