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 #4653 from fabrixxm/dev/update-vagrant
[friendica.git/.git]
/
util
/
vagrant_provision.sh
2018-03-23
Hypolite Petovan
Merge pull request #4653 from fabrixxm/dev/update-vagrant
blob
|
commitdiff
|
raw
2018-03-23
fabrixxm
Fix Vagrant dev env
blob
|
commitdiff
|
raw
2018-03-19
Tobias Diekershoff
Merge pull request #4633 from friendica/fabrixxm-36rc...
blob
|
commitdiff
|
raw
|
diff to current
2018-03-19
Tobias Diekershoff
Merge pull request #4630 from MrPetovan/task/4629-move...
blob
|
commitdiff
|
raw
|
diff to current
2018-03-19
Hypolite Petovan
Move scripts/worker.php to bin/
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
make /tmp writeable in the Vagrant VM
blob
|
commitdiff
|
raw
|
diff to current
2017-12-07
AndyHee
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2017-12-05
Hypolite Petovan
Merge pull request #4011 from annando/archive-cleanup
blob
|
commitdiff
|
raw
|
diff to current
2017-12-05
Michael Vogel
Merge pull request #4010 from tobiasd/20171205-chmod
blob
|
commitdiff
|
raw
|
diff to current
2017-12-05
Tobias Diekershoff
added some x permissions to scripts
blob
|
commitdiff
|
raw
|
diff to current
2017-11-30
AndyHee
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2017-11-19
Hypolite Petovan
Merge branch 'develop' into issue/3878-move-Contact...
blob
|
commitdiff
|
raw
|
diff to current
2017-11-19
Hypolite Petovan
Merge pull request #3920 from annando/scripts
blob
|
commitdiff
|
raw
|
diff to current
2017-11-19
Michael
The poller is now the worker
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-09-07
Silke Meyer
Calling apt-get install twice less
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-09-04
Silke Meyer
do not import test sql for the moment
blob
|
commitdiff
|
raw
|
diff to current
2017-04-21
rabuzarus
Merge develop into 20170407_-_group_edit
blob
|
commitdiff
|
raw
|
diff to current
2017-04-20
Hypolite Petovan
Merge pull request #3366 from annando/issue-3358
blob
|
commitdiff
|
raw
|
diff to current
2017-04-20
Michael
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2017-04-20
Michael Vogel
Merge pull request #3365 from Hypolite/issue/remove...
blob
|
commitdiff
|
raw
|
diff to current
2017-04-20
Michael Vogel
Merge pull request #3326 from Alkarex/utf8mb4
blob
|
commitdiff
|
raw
|
diff to current
2017-04-16
Alexandre Alapetite
Merge branch 'develop' into utf8mb4
blob
|
commitdiff
|
raw
|
diff to current
2017-04-16
Alexandre Alapetite
Default UTF8MB4 for CREATE DATABASE
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-03-13
Michael
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2017-03-12
Tobias Diekershoff
Merge pull request #3133 from mexon/mat/cidfix
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-02-23
Michael
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2017-02-19
Michael
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2017-02-19
Michael Vogel
Merge pull request #3171 from Hypolite/bug/fix-diaspora...
blob
|
commitdiff
|
raw
|
diff to current
2017-02-19
Michael Vogel
Merge pull request #3176 from eelcomaljaars/sql_mode_do...
blob
|
commitdiff
|
raw
|
diff to current
2017-02-19
Eelco Maljaars
Added missing mbstring php module to xenial setup in...
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
Vagrant does not download addons by default
blob
|
commitdiff
|
raw
|
diff to current
2016-11-19
Silke Meyer
Vagrant: corrected hostnames
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-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-17
Michael Vogel
Merge pull request #2086 from rabuzarus/0711_forumlist
blob
|
commitdiff
|
raw
|
diff to current
2015-11-17
Michael Vogel
Merge pull request #2061 from rabuzarus/0711_forumlist
blob
|
commitdiff
|
raw
|
diff to current
2015-11-07
fabrixxm
Merge pull request #2030 from tobiasd/20151107-shashape
blob
|
commitdiff
|
raw
|
diff to current
2015-11-07
Tobias Diekershoff
Merge pull request #2031 from tugelbend/develop
blob
|
commitdiff
|
raw
|
diff to current
2015-11-07
hauke
... and force the install
blob
|
commitdiff
|
raw
|
diff to current
2015-11-07
hauke
fix: wrong package name
blob
|
commitdiff
|
raw
|
diff to current
2015-11-07
hauke
adding Imagick to vagrant installation as it is needed...
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
Vagrant user doesn't have to tun the actual installatio...
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-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
next