projects
/
friendica.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
wrapping up 2019.12
[friendica.git]
/
.htaccess
2019-10-17
Michael
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
2018-09-23
Tobias Diekershoff
Merge branch '2018.08-rc'
blob
|
commitdiff
|
raw
2018-07-21
Tobias Diekershoff
Merge pull request #5433 from annando/mysqli
blob
|
commitdiff
|
raw
2018-07-21
Roland Häder
renamed .htaccess to .htaccess-dist and ignored .htacce...
blob
|
commitdiff
|
raw
2018-07-14
Hypolite Petovan
Merge pull request #16 from MrPetovan/imgbot
blob
|
commitdiff
|
raw
|
diff to current
2018-06-22
Hypolite Petovan
Merge pull request #4836 from Angristan/patch-1
blob
|
commitdiff
|
raw
|
diff to current
2018-06-11
Michael
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-06-01
Michael
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-06-01
Hypolite Petovan
Merge branch 'master' into develop
blob
|
commitdiff
|
raw
|
diff to current
2018-05-16
Hypolite Petovan
Merge pull request #5022 from Rudloff/feature/test_api
blob
|
commitdiff
|
raw
|
diff to current
2018-05-15
Hypolite Petovan
Merge pull request #5057 from M-arcus/patch-2
blob
|
commitdiff
|
raw
|
diff to current
2018-05-15
Marcus Müller
[BUGFIX] .htaccess: Rename file
blob
|
commitdiff
|
raw
|
diff to current
2018-05-15
Marcus Müller
Revert "[BGUFIX] .htaccess: Add file"
blob
|
commitdiff
|
raw
2018-05-15
Marcus Müller
[BGUFIX] .htaccess: Add file
blob
|
commitdiff
|
raw
|
diff to current
2018-05-15
Hypolite Petovan
Merge pull request #5042 from Quix0r/rewrites/curly...
blob
|
commitdiff
|
raw
2018-05-14
Roland Häder
Continued:
blob
|
commitdiff
|
raw
2018-04-04
utzer
Merge pull request #2 from friendica/master
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
2016-11-12
Silke Meyer
Merge branch 'develop' of https://github.com/friendica...
blob
|
commitdiff
|
raw
|
diff to current
2016-09-18
Roland Haeder
This merge brings back dbm::is_result() where I could...
blob
|
commitdiff
|
raw
|
diff to current
2016-07-22
Michael Vogel
Reverted some strange stuff
blob
|
commitdiff
|
raw
|
diff to current
2016-07-21
Michael Vogel
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2016-07-21
Michael Vogel
Merge remote-tracking branch 'upstream/master' into...
blob
|
commitdiff
|
raw
|
diff to current
2016-07-02
Michael Vogel
Merge branch 'rewrites/is_filled_array_introduced'...
blob
|
commitdiff
|
raw
|
diff to current
2016-06-23
Michael Vogel
Merge pull request #2631 from rabuzarus/1906-event...
blob
|
commitdiff
|
raw
|
diff to current
2016-06-21
Michael Vogel
Merge pull request #2628 from rabuzarus/1906-event...
blob
|
commitdiff
|
raw
|
diff to current
2016-06-20
Michael Vogel
Merge pull request #2625 from rabuzarus/1906-event...
blob
|
commitdiff
|
raw
|
diff to current
2016-06-20
Michael Vogel
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2016-06-20
Michael Vogel
Merge pull request #2623 from rabuzarus/1906-event...
blob
|
commitdiff
|
raw
|
diff to current
2016-06-19
Tobias Diekershoff
Merge pull request #2620 from dissolve/2617
blob
|
commitdiff
|
raw
|
diff to current
2016-06-18
Ben Roberts
recreate fix for #2617 on correct branch
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
2016-02-02
Michael Vogel
Merge pull request #2305 from nerdoc/patch-1
blob
|
commitdiff
|
raw
2016-01-31
Christian González
really uncomment the lines.
blob
|
commitdiff
|
raw
2016-01-30
Christian González
additional blank line
blob
|
commitdiff
|
raw
|
diff to current
2016-01-30
Christian González
add simple option for HTTPS in .htaccess
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-07
fabrixxm
Merge remote-tracking branch 'friendica/master' into...
blob
|
commitdiff
|
raw
|
diff to current
2014-09-07
hauke
Merge branch 'master' of https://github.com/friendica...
blob
|
commitdiff
|
raw
|
diff to current
2014-09-07
fabrixxm
Merge pull request #1119 from annando/1409-issue-881
blob
|
commitdiff
|
raw
|
diff to current
2014-09-07
fabrixxm
Merge pull request #1118 from tugelbend/master
blob
|
commitdiff
|
raw
|
diff to current
2014-09-07
fabrixxm
Merge pull request #1117 from annando/1409-suppress...
blob
|
commitdiff
|
raw
|
diff to current
2014-09-07
fabrixxm
Merge pull request #1114 from annando/1409-api-search...
blob
|
commitdiff
|
raw
|
diff to current
2014-09-07
Michael Vogel
API: The command "users/search" is now supported.
blob
|
commitdiff
|
raw
|
diff to current
2014-04-29
Michael Vogel
Merge remote-tracking branch 'upstream/master'
blob
|
commitdiff
|
raw
|
diff to current
2014-04-26
tobiasd
Merge pull request #944 from annando/master
blob
|
commitdiff
|
raw
|
diff to current
2014-04-24
fabrixxm
Merge pull request #941 from annando/master
blob
|
commitdiff
|
raw
|
diff to current
2014-04-23
fabrixxm
Merge pull request #940 from annando/master
blob
|
commitdiff
|
raw
|
diff to current
2014-04-22
fabrixxm
Merge pull request #938 from annando/master
blob
|
commitdiff
|
raw
|
diff to current
2014-04-12
tobiasd
Merge pull request #935 from annando/master
blob
|
commitdiff
|
raw
|
diff to current
2014-04-07
fabrixxm
Merge pull request #932 from annando/master
blob
|
commitdiff
|
raw
|
diff to current
2014-04-04
fabrixxm
Merge pull request #927 from annando/master
blob
|
commitdiff
|
raw
|
diff to current
2014-03-02
tobiasd
Merge pull request #919 from annando/master
blob
|
commitdiff
|
raw
|
diff to current
2014-02-24
tobiasd
Merge pull request #914 from annando/master
blob
|
commitdiff
|
raw
|
diff to current
2014-02-22
tobiasd
Merge pull request #913 from friendica/20140222
blob
|
commitdiff
|
raw
|
diff to current
2014-02-17
tobiasd
Merge pull request #912 from annando/master
blob
|
commitdiff
|
raw
|
diff to current
2014-02-16
tobiasd
Merge pull request #911 from annando/master
blob
|
commitdiff
|
raw
|
diff to current
2014-02-05
tobiasd
Merge pull request #909 from annando/master
blob
|
commitdiff
|
raw
|
diff to current
2014-02-04
tobiasd
Merge pull request #907 from annando/master
blob
|
commitdiff
|
raw
|
diff to current
2014-02-02
tobiasd
Merge pull request #906 from annando/master
blob
|
commitdiff
|
raw
|
diff to current
2014-01-29
tobiasd
Merge pull request #904 from annando/master
blob
|
commitdiff
|
raw
|
diff to current
2014-01-28
tobiasd
Merge pull request #902 from annando/master
blob
|
commitdiff
|
raw
|
diff to current
2014-01-27
pixelroot
modified: view/theme/smoothly/style.css
blob
|
commitdiff
|
raw
|
diff to current
2012-11-04
Thomas Willingham
Merge remote-tracking branch 'upstream/master'
blob
|
commitdiff
|
raw
|
diff to current
2012-09-19
Fabrixxm
Merge branch 'master' into blog-like
blob
|
commitdiff
|
raw
|
diff to current
2012-09-17
Alex
Merge pull request #482 from pixelroot/master
blob
|
commitdiff
|
raw
|
diff to current
2012-09-17
Alex
Merge pull request #481 from pixelroot/master
blob
|
commitdiff
|
raw
|
diff to current
2012-09-17
Alex
Merge pull request #480 from pixelroot/master
blob
|
commitdiff
|
raw
|
diff to current
2012-09-14
Alex
Merge pull request #476 from pixelroot/master
blob
|
commitdiff
|
raw
|
diff to current
2012-09-14
Alex
Merge pull request #475 from pixelroot/master
blob
|
commitdiff
|
raw
|
diff to current
2012-09-14
Alex
Merge pull request #474 from pixelroot/master
blob
|
commitdiff
|
raw
|
diff to current
2012-09-14
Alex
Merge pull request #473 from pixelroot/master
blob
|
commitdiff
|
raw
|
diff to current
2012-09-14
Alex
Merge pull request #472 from pixelroot/master
blob
|
commitdiff
|
raw
|
diff to current
2012-09-14
Alex
Merge pull request #471 from pixelroot/master
blob
|
commitdiff
|
raw
|
diff to current
2012-09-13
Thomas Willingham
Merge pull request #469 from pixelroot/master
blob
|
commitdiff
|
raw
|
diff to current
2012-09-13
friendica
Merge pull request #468 from pixelroot/master
blob
|
commitdiff
|
raw
|
diff to current
2012-09-12
tobiasd
Merge pull request #466 from pixelroot/master
blob
|
commitdiff
|
raw
|
diff to current
2012-09-11
fermionic
Merge pull request #464 from pixelroot/master
blob
|
commitdiff
|
raw
|
diff to current
2012-09-10
Michael Vogel
Merge remote branch 'upstream/master'
blob
|
commitdiff
|
raw
|
diff to current
2012-09-10
fermionic
Merge pull request #463 from pixelroot/master
blob
|
commitdiff
|
raw
|
diff to current
2012-09-10
Domovoy
Merge branch 'master' of https://github.com/friendica...
blob
|
commitdiff
|
raw
|
diff to current
2012-09-08
fermionic
Merge pull request #461 from pixelroot/master
blob
|
commitdiff
|
raw
|
diff to current
2012-09-07
friendica
Merge https://github.com/friendica/friendica into pull
blob
|
commitdiff
|
raw
|
diff to current
2012-09-06
Thomas Willingham
Merge branch 'master' of https://github.com/friendica...
blob
|
commitdiff
|
raw
|
diff to current
2012-09-06
fermionic
Merge pull request #459 from fermionic/individual-choic...
blob
|
commitdiff
|
raw
|
diff to current
2012-09-06
fermionic
Merge pull request #458 from fermionic/twitter-profile...
blob
|
commitdiff
|
raw
|
diff to current
2012-09-06
Zach Prezkuta
small twitter improvements
blob
|
commitdiff
|
raw
|
diff to current
2012-09-06
fermionic
Merge pull request #456 from pixelroot/master
blob
|
commitdiff
|
raw
|
diff to current
2012-09-04
Michael Vogel
Merge remote branch 'upstream/master'
blob
|
commitdiff
|
raw
|
diff to current
2012-09-04
friendica
Merge https://github.com/friendica/friendica into pull
blob
|
commitdiff
|
raw
|
diff to current
2012-09-02
fermionic
Merge pull request #454 from CyberDomovoy/mass_vhost
blob
|
commitdiff
|
raw
|
diff to current
2012-09-02
Domovoy
Added comments in .htacces to help configuring installa...
blob
|
commitdiff
|
raw
|
diff to current
2012-05-16
friendica
Merge https://github.com/friendica/dir into dpull
blob
|
commitdiff
|
raw
|
diff to current
2012-04-24
Thomas Willingham
Merge remote-tracking branch 'upstream/master'
blob
|
commitdiff
|
raw
|
diff to current
2012-04-11
Michael
Merge branch 'master' of github.com:annando/friendica
blob
|
commitdiff
|
raw
|
diff to current
2012-04-08
zottel
Merge remote branch 'upstream/master'
blob
|
commitdiff
|
raw
|
diff to current
next