https://reisub.nsupdate.info/git
/
friendica.git
/
.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
Merge pull request #6703 from tobiasd/2019.03-CHANGELOG
[friendica.git/.git]
/
doc
/
Vagrant.md
2018-11-26
Michael Vogel
Merge pull request #6199 from MrPetovan/task/move-confi...
blob
|
commitdiff
|
raw
2018-11-25
Hypolite Petovan
Update documentation with new config style/name
blob
|
commitdiff
|
raw
2018-09-23
Tobias Diekershoff
Merge branch '2018.08-rc'
blob
|
commitdiff
|
raw
|
diff to current
2018-07-18
Michael Vogel
Merge pull request #5394 from MrPetovan/bug/fix-config...
blob
|
commitdiff
|
raw
|
diff to current
2018-07-18
Michael Vogel
Merge pull request #5295 from MrPetovan/task/4889-move...
blob
|
commitdiff
|
raw
|
diff to current
2018-07-16
Hypolite Petovan
Move doc/htconfig.md to doc/Config.md
blob
|
commitdiff
|
raw
|
diff to current
2018-04-21
Tobias Diekershoff
Merge pull request #4887 from rabuzarus/20180421_-_frio...
blob
|
commitdiff
|
raw
|
diff to current
2018-04-21
Tobias Diekershoff
Merge pull request #4888 from friendica/revert-4883...
blob
|
commitdiff
|
raw
|
diff to current
2018-04-21
Tobias Diekershoff
Revert "Moved .htconfig.php file & extracted Install...
blob
|
commitdiff
|
raw
|
diff to current
2018-04-21
Hypolite Petovan
Merge pull request #4885 from rabuzarus/20180421_-_fix_...
blob
|
commitdiff
|
raw
|
diff to current
2018-04-21
Hypolite Petovan
Merge pull request #4883 from nupplaphil/install_config
blob
|
commitdiff
|
raw
|
diff to current
2018-04-21
Philipp Holzer
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-04-21
Philipp Holzer
Moved .htconfig file
blob
|
commitdiff
|
raw
|
diff to current
2018-04-04
utzer
Merge pull request #2 from friendica/master
blob
|
commitdiff
|
raw
|
diff to current
2017-10-16
Tobias Diekershoff
Merge pull request #3789 from Alkarex/french_regions
blob
|
commitdiff
|
raw
|
diff to current
2017-10-16
Tobias Diekershoff
Merge pull request #3788 from Alkarex/denmark_regions
blob
|
commitdiff
|
raw
|
diff to current
2017-10-05
Tobias Diekershoff
Merge pull request #3743 from MrPetovan/task/update...
blob
|
commitdiff
|
raw
|
diff to current
2017-10-05
Tobias Diekershoff
Merge pull request #3755 from tobiasd/CHANGELOG-3.5.5
blob
|
commitdiff
|
raw
|
diff to current
2017-10-05
Tobias Diekershoff
Merge pull request #3757 from silke/develop
blob
|
commitdiff
|
raw
|
diff to current
2017-10-04
Silke Meyer
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2017-10-04
Silke Meyer
Fixed settings for test mysql database and updated...
blob
|
commitdiff
|
raw
|
diff to current
2017-04-08
rebeka-catalina
Merge branch 'develop' of github.com/rebeka-catalina...
blob
|
commitdiff
|
raw
|
diff to current
2017-03-15
Michael
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2017-03-13
Michael
Merge branch 'master' of github.com:annando/friendica
blob
|
commitdiff
|
raw
|
diff to current
2017-03-13
Michael
Merge remote-tracking branch 'upstream/master'
blob
|
commitdiff
|
raw
|
diff to current
2017-02-24
Michael Vogel
Merge pull request #2841 from Hypolite/issue/#2103-alt
blob
|
commitdiff
|
raw
|
diff to current
2017-02-24
Michael Vogel
Merge pull request #2916 from tobiasd/20160925-changes
blob
|
commitdiff
|
raw
|
diff to current
2017-01-12
Tobias Diekershoff
Merge pull request #3088 from beardyunixer/patch-1
blob
|
commitdiff
|
raw
|
diff to current
2016-12-13
Roland Häder
Merge branch 'rewrites/dbm_is_result' of github.com...
blob
|
commitdiff
|
raw
|
diff to current
2016-12-13
Roland Häder
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2016-12-10
Michael
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2016-12-03
Hypolite Petovan
Merge branch 'develop' into issue/missing-private-image-src
blob
|
commitdiff
|
raw
|
diff to current
2016-11-25
Tobias Diekershoff
Merge pull request #2974 from rabuzarus/2511_frio_fix_d...
blob
|
commitdiff
|
raw
|
diff to current
2016-11-23
Michael Vogel
Merge pull request #2969 from gerhard6380/develop
blob
|
commitdiff
|
raw
|
diff to current
2016-11-23
Hypolite Petovan
Merge remote-tracking branch 'friendica/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2016-11-22
Michael Vogel
Merge pull request #2967 from Hypolite/issue/#2955
blob
|
commitdiff
|
raw
|
diff to current
2016-11-22
Tobias Diekershoff
Merge pull request #2960 from Hypolite/issue/#2955
blob
|
commitdiff
|
raw
|
diff to current
2016-11-21
Michael Vogel
Merge pull request #2896 from rabuzarus/0311_fix_photo_...
blob
|
commitdiff
|
raw
|
diff to current
2016-11-20
Tobias Diekershoff
Merge pull request #2950 from rabuzarus/berlin_fix_post...
blob
|
commitdiff
|
raw
|
diff to current
2016-11-20
Tobias Diekershoff
Merge pull request #2947 from annando/1611-nowarn-insecure
blob
|
commitdiff
|
raw
|
diff to current
2016-11-20
Tobias Diekershoff
Merge pull request #2949 from silke/vagrant-1604
blob
|
commitdiff
|
raw
|
diff to current
2016-11-19
Silke Meyer
Adapted documentation for Vagrant multiple machines
blob
|
commitdiff
|
raw
|
diff to current
2016-05-25
rabuzarus
Merge branch 'master' of ../save/merge/frio into frio_merge
blob
|
commitdiff
|
raw
|
diff to current
2015-12-24
Michael Vogel
Merge remote-tracking branch 'upstream/master'
blob
|
commitdiff
|
raw
|
diff to current
2015-12-22
Michael Vogel
Merge remote-tracking branch 'upstream/master'
blob
|
commitdiff
|
raw
|
diff to current
2015-12-22
Fabrixxm
Merge branch 'release-3.4.3-rc'
blob
|
commitdiff
|
raw
|
diff to current
2015-12-19
rebeka-catalina
Merge pull request #1 from friendica/develop
blob
|
commitdiff
|
raw
|
diff to current
2015-11-24
root
Merge branch 'develop' of https://github.com/gerhard638...
blob
|
commitdiff
|
raw
|
diff to current
2015-11-07
Michael Vogel
Merge pull request #2023 from tobiasd/20151107-registertext
blob
|
commitdiff
|
raw
|
diff to current
2015-11-07
Michael Vogel
Merge pull request #2005 from tobiasd/20151101-dev
blob
|
commitdiff
|
raw
|
diff to current
2015-11-07
Tobias Diekershoff
Merge pull request #2026 from silke/vagrant-update
blob
|
commitdiff
|
raw
|
diff to current
2015-11-07
Silke Meyer
Configuration for Vagrant running Ubuntu 14.04
blob
|
commitdiff
|
raw
|
diff to current
2015-09-30
Michael Vogel
Merge remote-tracking branch 'upstream/master'
blob
|
commitdiff
|
raw
|
diff to current
2015-09-29
Fabrixxm
Merge branch '3.4.2'
3.4.2
blob
|
commitdiff
|
raw
|
diff to current
2015-08-02
Tobias Diekershoff
Merge pull request #1791 from annando/1507-new-poco
blob
|
commitdiff
|
raw
|
diff to current
2015-07-23
Tobias Diekershoff
Merge pull request #1789 from silke/vagrant-fix-admin
blob
|
commitdiff
|
raw
|
diff to current
2015-07-23
Silke Meyer
Updated vagrant docs.
blob
|
commitdiff
|
raw
|
diff to current
2015-07-06
fabrixxm
Merge branch '3.4.1'
3.4.1
blob
|
commitdiff
|
raw
|
diff to current
2015-06-15
Tobias Diekershoff
Merge remote-tracking branch 'frank/2015-06-12-fraengii...
blob
|
commitdiff
|
raw
|
diff to current
2015-05-20
fabrixxm
Merge branch 'master' into develop
blob
|
commitdiff
|
raw
|
diff to current
2015-05-13
Tobias Diekershoff
Merge pull request #1554 from FlxAlbroscheit/develop-1
blob
|
commitdiff
|
raw
|
diff to current
2015-05-13
rabuzarus
Merge pull request #1 from friendica/develop
blob
|
commitdiff
|
raw
|
diff to current
2015-05-02
Michael Vogel
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2015-04-22
Tobias Diekershoff
Merge pull request #1527 from fraengii/2015-04-22-Chats...
blob
|
commitdiff
|
raw
|
diff to current
2015-04-21
Tobias Diekershoff
Merge pull request #1526 from fraengii/20150421-Bugs...
blob
|
commitdiff
|
raw
|
diff to current
2015-04-21
Michael Vogel
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2015-04-18
fabrixxm
Merge pull request #1516 from tobiasd/issue1429
blob
|
commitdiff
|
raw
|
diff to current
2015-04-18
Tobias Diekershoff
Merge pull request #1524 from silke/documentation
blob
|
commitdiff
|
raw
|
diff to current
2015-04-17
Silke Meyer
Proper markdown subheadings
blob
|
commitdiff
|
raw
|
diff to current
2015-04-17
fabrixxm
Merge pull request #1521 from tugelbend/develop
blob
|
commitdiff
|
raw
|
diff to current
2015-04-17
fabrixxm
Merge pull request #1520 from tugelbend/develop
blob
|
commitdiff
|
raw
|
diff to current
2015-04-17
Tobias Diekershoff
Merge pull request #1512 from fraengii/2015-04-12-Accou...
blob
|
commitdiff
|
raw
|
diff to current
2015-04-17
Tobias Diekershoff
Merge pull request #1503 from fraengii/20150408-H-de...
blob
|
commitdiff
|
raw
|
diff to current
2015-04-17
Tobias Diekershoff
Merge pull request #1519 from silke/documentation
blob
|
commitdiff
|
raw
|
diff to current
2015-04-17
Silke Meyer
Modified according to #1478 (line break after each...
blob
|
commitdiff
|
raw
|
diff to current
2015-04-17
Silke Meyer
Corrected typo
blob
|
commitdiff
|
raw
|
diff to current
2015-04-05
Michael Vogel
Merge remote-tracking branch 'upstream/master'
blob
|
commitdiff
|
raw
|
diff to current
2015-04-05
fabrixxm
Merge branch 'release/3.4'
3.4
blob
|
commitdiff
|
raw
|
diff to current
2015-03-29
Tobias Diekershoff
Merge pull request #1455 from pztrn/master
blob
|
commitdiff
|
raw
|
diff to current
2015-02-24
Michael Vogel
Merge remote-tracking branch 'upstream/master'
blob
|
commitdiff
|
raw
|
diff to current
2015-02-24
Fabrixxm
Merge branch 'master' into develop
blob
|
commitdiff
|
raw
|
diff to current
2015-02-24
Fabrixxm
Merge branch 'release-3.3.3'
blob
|
commitdiff
|
raw
|
diff to current
2015-02-18
Fabrixxm
Merge branch 'release-3.3.3' into develop
blob
|
commitdiff
|
raw
|
diff to current
2015-02-10
Fabrixxm
Merge branch 'release-3.3.3' into develop
blob
|
commitdiff
|
raw
|
diff to current
2015-02-10
Fabrixxm
Merge branch 'mat/mergerequest' of https://github.com...
blob
|
commitdiff
|
raw
|
diff to current
2015-02-07
fabrixxm
Merge branch 'release-3.3.3' into develop
blob
|
commitdiff
|
raw
|
diff to current
2015-02-04
Fabrixxm
Merge remote-tracking branch 'friendica/release-3.3...
blob
|
commitdiff
|
raw
|
diff to current
2015-02-03
Michael Vogel
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2015-02-03
Tobias Diekershoff
Merge pull request #1346 from tobiasd/20150202-strings
blob
|
commitdiff
|
raw
|
diff to current
2015-02-03
Tobias Diekershoff
Merge pull request #1350 from annando/1502-diabook...
blob
|
commitdiff
|
raw
|
diff to current
2015-02-03
Tobias Diekershoff
Merge pull request #1347 from silke/vagrant
blob
|
commitdiff
|
raw
|
diff to current
2015-02-02
Silke Meyer
Documented the Vagrant test data.
blob
|
commitdiff
|
raw
|
diff to current
2015-01-21
Michael Vogel
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2015-01-20
Michael Vogel
Merge pull request #1299 from fabrixxm/optional-text...
blob
|
commitdiff
|
raw
|
diff to current
2015-01-20
fabrixxm
Merge pull request #1298 from tobiasd/20150116installer
blob
|
commitdiff
|
raw
|
diff to current
2015-01-20
fabrixxm
Merge pull request #1297 from tobiasd/20150116vagrantdocs
blob
|
commitdiff
|
raw
|
diff to current
2015-01-16
Tobias Diekershoff
added info how to halt the VM to the vagrant docs.
blob
|
commitdiff
|
raw
|
diff to current
2015-01-15
fabrixxm
Merge pull request #1292 from silke/develop
blob
|
commitdiff
|
raw
|
diff to current
2015-01-14
Tobias Diekershoff
Merge pull request #1293 from silke/vagrant-docs
blob
|
commitdiff
|
raw
|
diff to current
2015-01-14
Silke Meyer
Added more explanation to developing with Vagrant
blob
|
commitdiff
|
raw
|
diff to current