git.mxchange.org Git - friendica.git/history

]> git.mxchange.org Git - friendica.git/history - Vagrantfile

2017-10-05	Tobias Diekershoff	Merge pull request #3743 from MrPetovan/task/update...	blob \| commitdiff \| raw
2017-10-05	Tobias Diekershoff	Merge pull request #3755 from tobiasd/CHANGELOG-3.5.5	blob \| commitdiff \| raw
2017-10-05	Tobias Diekershoff	Merge pull request #3757 from silke/develop	blob \| commitdiff \| raw
2017-10-04	Silke Meyer	Merge remote-tracking branch 'upstream/develop' into...	blob \| commitdiff \| raw
2017-09-06	Silke Meyer	Merge branch 'vagrant2' of https://github.com/silke...	blob \| commitdiff \| raw
2017-09-06	Silke Meyer	Vagrant only for Xenial, more RAM for debugging, no...	blob \| commitdiff \| raw
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 http://github.com/rebeka...	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
2014-06-20	Hauke Altmann	adjusted configuration due to problems with mailcatcher	blob \| commitdiff \| raw \| diff to current
2014-06-20	Hauke Altmann	added vagrant configuration for running a friendica...	blob \| commitdiff \| raw \| diff to current

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom