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 #10129 from annando/drop-tables
[friendica.git/.git]
/
Vagrantfile
2020-08-17
realkinetix
Merge pull request #1 from friendica/develop
blob
|
commitdiff
|
raw
2019-10-18
Hypolite Petovan
Merge pull request #7752 from kPherox/develop
blob
|
commitdiff
|
raw
2019-10-17
Michael
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
2019-10-17
Michael
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
2019-10-15
Michael
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
2019-10-05
Philipp
Merge pull request #7699 from MrPetovan/task/4090-move...
blob
|
commitdiff
|
raw
2019-10-05
Hypolite Petovan
Merge pull request #7703 from tobiasd/20191001-Vagrant
blob
|
commitdiff
|
raw
2019-10-02
Tobias Diekershoff
Merge branch 'develop' of https://github.com/friendica...
blob
|
commitdiff
|
raw
2019-10-01
Tobias Diekershoff
switched from Ubuntu 16.04 to Debian 10 to get PHP 7.3
blob
|
commitdiff
|
raw
2018-06-22
Hypolite Petovan
Merge pull request #4836 from Angristan/patch-1
blob
|
commitdiff
|
raw
|
diff to current
2018-06-01
Tobias Diekershoff
Merge pull request #5096 from tobiasd/3.6.1
blob
|
commitdiff
|
raw
|
diff to current
2018-04-18
Michael
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-04-17
Hypolite Petovan
Merge pull request #4782 from Alkarex/fix-update-password
blob
|
commitdiff
|
raw
|
diff to current
2018-04-10
Michael Vogel
Merge pull request #4799 from MrPetovan/task/hide-ignor...
blob
|
commitdiff
|
raw
|
diff to current
2018-04-09
Michael Vogel
Merge pull request #4768 from MrPetovan/task/hide-ignor...
blob
|
commitdiff
|
raw
|
diff to current
2018-04-08
Michael Vogel
Merge pull request #4773 from MrPetovan/task/4629-move...
blob
|
commitdiff
|
raw
|
diff to current
2018-04-07
Hypolite Petovan
Update Vagrant script path
blob
|
commitdiff
|
raw
|
diff to current
2018-04-04
utzer
Merge pull request #7 from ben-utzer/patch-3
blob
|
commitdiff
|
raw
|
diff to current
2018-04-04
utzer
Merge pull request #2 from friendica/master
blob
|
commitdiff
|
raw
|
diff to current
2018-04-03
Michael Vogel
Merge pull request #4729 from MrPetovan/task/4604-add...
blob
|
commitdiff
|
raw
|
diff to current
2018-03-30
Michael
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-03-27
Hypolite Petovan
Merge pull request #4692 from Rudloff/patch-1
blob
|
commitdiff
|
raw
|
diff to current
2018-03-24
Michael
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-03-24
Hypolite Petovan
Merge pull request #4676 from annando/clean-url
blob
|
commitdiff
|
raw
|
diff to current
2018-03-24
Hypolite Petovan
Merge pull request #4675 from annando/group-delete
blob
|
commitdiff
|
raw
|
diff to current
2018-03-23
Michael Vogel
Merge pull request #4657 from MrPetovan/task/3878-move...
blob
|
commitdiff
|
raw
|
diff to current
2018-03-23
fabrixxm
Merge pull request #4651 from MrPetovan/develop
blob
|
commitdiff
|
raw
|
diff to current
2018-03-23
Hypolite Petovan
Merge pull request #4653 from fabrixxm/dev/update-vagrant
blob
|
commitdiff
|
raw
|
diff to current
2018-03-23
fabrixxm
Fix Vagrant dev env
blob
|
commitdiff
|
raw
|
diff to current
2018-03-23
Tobias Diekershoff
Merge pull request #4637 from tobiasd/3.6
blob
|
commitdiff
|
raw
|
diff to current
2018-02-26
Hypolite Petovan
Merge pull request #4491 from tobiasd/20180224-settinghelp
blob
|
commitdiff
|
raw
|
diff to current
2018-02-26
Hypolite Petovan
Merge pull request #4501 from annando/fix-tag-search
blob
|
commitdiff
|
raw
|
diff to current
2018-02-26
Hypolite Petovan
Merge pull request #4502 from annando/guid-from-mail
blob
|
commitdiff
|
raw
|
diff to current
2018-02-26
Hypolite Petovan
Merge pull request #4500 from annando/improve-network
blob
|
commitdiff
|
raw
|
diff to current
2018-02-24
Michael Vogel
Merge pull request #4493 from tobiasd/20180223-vagrant
blob
|
commitdiff
|
raw
|
diff to current
2018-02-23
Tobias Diekershoff
the host name in the VM does not need the xenial anymore
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-09-06
Silke Meyer
Merge branch 'vagrant2' of https://github.com/silke...
blob
|
commitdiff
|
raw
|
diff to current
2017-09-06
Silke Meyer
Vagrant only for Xenial, more RAM for debugging, no...
blob
|
commitdiff
|
raw
|
diff to current
2017-07-13
Michael
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2017-07-02
Michael Vogel
Merge pull request #3439 from tobiasd/20170506-token
blob
|
commitdiff
|
raw
|
diff to current
2017-06-28
Tobias Diekershoff
Merge pull request #3551 from annando/semaphore-locking
blob
|
commitdiff
|
raw
|
diff to current
2017-06-28
Michael Vogel
Merge pull request #3539 from AndyHee/20170617-admin_se...
blob
|
commitdiff
|
raw
|
diff to current
2017-06-26
rabuzarus
Merge pull request #3547 from tobiasd/20170626-Vagrantfile
blob
|
commitdiff
|
raw
|
diff to current
2017-06-26
Tobias Diekershoff
Vagrant > 1.5 needs an additional parameter
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-20
Silke Meyer
Switched to a vagrant box that works for Ubuntu Xenial
blob
|
commitdiff
|
raw
|
diff to current
2016-11-19
Silke Meyer
Vagrant: Allow to choose between Ubuntu 14.04 und 16.04
blob
|
commitdiff
|
raw
|
diff to current
2016-11-16
Michael
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2016-11-14
Jens Tautenhahn
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2016-11-13
Michael Vogel
Merge pull request #2899 from tobiasd/20161109-stats
blob
|
commitdiff
|
raw
|
diff to current
2016-11-12
Tobias Diekershoff
Merge pull request #2902 from tobiasd/20161110-lng
blob
|
commitdiff
|
raw
|
diff to current
2016-11-12
Tobias Diekershoff
Merge pull request #2904 from silke/vagrant
blob
|
commitdiff
|
raw
|
diff to current
2016-11-12
Silke Meyer
Increased memory of vagrant machine to 1024 MB
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
2014-12-27
hauke
Merge branch 'develop' of https://github.com/friendica...
blob
|
commitdiff
|
raw
|
diff to current
2014-11-18
Michael Vogel
Merge branch 'develop' of github.com:annando/friendica...
blob
|
commitdiff
|
raw
|
diff to current
2014-09-17
Fabrixxm
Merge branch 'feature/collapse-menulink' of https:...
blob
|
commitdiff
|
raw
|
diff to current
2014-09-17
fabrixxm
Merge pull request #1147 from tugelbend/master
blob
|
commitdiff
|
raw
|
diff to current
2014-09-15
hauke
made vagrant partly work again
blob
|
commitdiff
|
raw
|
diff to current
2014-09-07
fabrixxm
Merge remote-tracking branch 'friendica/master' into...
blob
|
commitdiff
|
raw
|
diff to current
2014-09-06
tobiasd
Merge pull request #1108 from tugelbend/master
blob
|
commitdiff
|
raw
|
diff to current
2014-09-06
hauke
make vagrant connect to the outside world on ubuntu
blob
|
commitdiff
|
raw
|
diff to current
2014-07-10
tobiasd
Merge pull request #1042 from annando/master
blob
|
commitdiff
|
raw
|
diff to current
2014-06-24
tobiasd
Merge pull request #1033 from annando/master
blob
|
commitdiff
|
raw
|
diff to current
2014-06-22
tobiasd
Merge pull request #1028 from tugelbend/master
blob
|
commitdiff
|
raw
|
diff to current
2014-06-21
hauke
remove NFS option for vagrant folder as this doesn...
blob
|
commitdiff
|
raw
|
diff to current
next