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 #1 from friendica/2018.05-rc
[friendica.git/.git]
/
util
/
htconfig.vagrant.php
2018-04-30
rabuzarus
Merge develop into 20180425_-_fix_help_aside
blob
|
commitdiff
|
raw
2018-04-29
Michael Vogel
Merge pull request #4951 from MrPetovan/bug/4946-move...
blob
|
commitdiff
|
raw
2018-04-28
Michael Vogel
Merge pull request #4942 from MrPetovan/task/import...
blob
|
commitdiff
|
raw
2018-04-28
Philipp Holzer
Add Install Mode
blob
|
commitdiff
|
raw
2018-04-28
Michael
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
2018-04-28
Tobias Diekershoff
Merge pull request #4941 from MrPetovan/task/4938-updat...
blob
|
commitdiff
|
raw
2018-04-28
Hypolite Petovan
Update directory URL protocol
blob
|
commitdiff
|
raw
2018-04-18
Michael
Merge remote-tracking branch 'upstream/develop' into...
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
Hypolite Petovan
Merge pull request #4658 from fabrixxm/dev/update-vagrant
blob
|
commitdiff
|
raw
|
diff to current
2018-03-23
fabrixxm
Dev env: fix admin email
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-01-20
Michael
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-01-19
Michael Vogel
Merge pull request #4276 from MrPetovan/bug/4272-upgrad...
blob
|
commitdiff
|
raw
|
diff to current
2018-01-19
Hypolite Petovan
Remove RINO2 and RINO3
blob
|
commitdiff
|
raw
|
diff to current
2018-01-19
Hypolite Petovan
Update RINO settings
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 #3760 from friendica/revert-3743...
blob
|
commitdiff
|
raw
|
diff to current
2017-10-05
Michael Vogel
Merge pull request #3759 from tobiasd/20171005-en
blob
|
commitdiff
|
raw
|
diff to current
2017-10-05
Michael Vogel
Merge pull request #3758 from tobiasd/20171005-vagrant
blob
|
commitdiff
|
raw
|
diff to current
2017-10-05
Tobias Diekershoff
give the admin user the admin panel in the Vagrant VM
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-08-25
Tobias Diekershoff
Merge pull request #3654 from annando/externalpubsubhubbub
blob
|
commitdiff
|
raw
|
diff to current
2017-08-25
Michael
Removed external pubsubhubbub URL
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-13
Roland Häder
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2017-06-07
Andy H3
Merge pull request #1 from friendica/develop
blob
|
commitdiff
|
raw
|
diff to current
2017-06-06
Michael
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2017-06-06
Tobias Diekershoff
Merge branch 'master' into develop
blob
|
commitdiff
|
raw
|
diff to current
2017-06-06
Tobias Diekershoff
Merge pull request #3486 from tobiasd/3.5.2-CHANGELOG
blob
|
commitdiff
|
raw
|
diff to current
2017-06-06
Tobias Diekershoff
Merge pull request #3520 from AndyHee/3.5.2rc
blob
|
commitdiff
|
raw
|
diff to current
2017-06-06
Tobias Diekershoff
Merge pull request #3490 from tobiasd/20170524-credits
blob
|
commitdiff
|
raw
|
diff to current
2017-06-06
Tobias Diekershoff
Merge pull request #3518 from AndyHee/3.5.2rc
blob
|
commitdiff
|
raw
|
diff to current
2017-06-03
Tobias Diekershoff
Merge pull request #3514 from annando/worker-locking
blob
|
commitdiff
|
raw
|
diff to current
2017-06-03
Michael Vogel
Merge pull request #3513 from Hypolite/bug/update-direc...
blob
|
commitdiff
|
raw
|
diff to current
2017-06-03
Hypolite Petovan
Update remaining "dir.friendi.ca" instances
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
Activate logging in vagrant VM
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
Michael Vogel
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2015-09-29
Michael Vogel
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2015-09-29
Michael Vogel
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2015-09-29
Fabrixxm
Merge branch 'master' back into develop
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-09-25
fabrixxm
Merge pull request #1903 from annando/1509-bbcode-notif...
blob
|
commitdiff
|
raw
|
diff to current
2015-09-17
Michael Vogel
Merge pull request #1888 from fabrixxm/changelog-3.4.2
blob
|
commitdiff
|
raw
|
diff to current
2015-09-15
Tobias Diekershoff
Merge pull request #1890 from annando/1509-directory
blob
|
commitdiff
|
raw
|
diff to current
2015-09-15
Michael Vogel
There is now only one central parameter for the global...
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