projects
/
friendica.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Bugfix: Warning because of undefined constant
[friendica.git]
/
include
/
conversation.php
2015-12-13
Michael Vogel
Bugfix: Warning because of undefined constant
blob
|
commitdiff
|
raw
2015-12-01
Michael Vogel
Merge pull request #2125 from rabuzarus/2911_event_template
blob
|
commitdiff
|
raw
|
diff to current
2015-11-30
Michael Vogel
Merge pull request #2121 from rabuzarus/3011_viewcontac...
blob
|
commitdiff
|
raw
|
diff to current
2015-11-30
Michael Vogel
Merge pull request #2104 from rabuzarus/2611_contacts_d...
blob
|
commitdiff
|
raw
|
diff to current
2015-11-30
fabrixxm
Merge pull request #2119 from annando/1511-contact...
blob
|
commitdiff
|
raw
|
diff to current
2015-11-29
Michael Vogel
Redesign of the contact pages, new tab for contact...
blob
|
commitdiff
|
raw
|
diff to current
2015-11-19
Michael Vogel
Merge pull request #2087 from tobiasd/20151118-docevents
blob
|
commitdiff
|
raw
|
diff to current
2015-11-19
Tobias Diekershoff
Merge pull request #2088 from annando/1511-endless...
blob
|
commitdiff
|
raw
|
diff to current
2015-11-18
Michael Vogel
Prevention of endless loops in the conversation
blob
|
commitdiff
|
raw
|
diff to current
2015-10-19
Michael Vogel
Merge pull request #1971 from tobiasd/20151019-docs
blob
|
commitdiff
|
raw
|
diff to current
2015-10-17
rabuzarus
Merge dirfind into template_rework
blob
|
commitdiff
|
raw
|
diff to current
2015-10-17
rabuzarus
Merge dir into template_rework
blob
|
commitdiff
|
raw
|
diff to current
2015-10-17
Tobias Diekershoff
Merge pull request #1965 from rabuzarus/event-attendance
blob
|
commitdiff
|
raw
|
diff to current
2015-10-14
rabuzarus
fix translation bug for likers
blob
|
commitdiff
|
raw
|
diff to current
2015-10-12
Tobias Diekershoff
Merge pull request #1929 from rabuzarus/event-attendance
blob
|
commitdiff
|
raw
|
diff to current
2015-10-12
Michael Vogel
Merge pull request #1943 from tobiasd/20151007-adminname
blob
|
commitdiff
|
raw
|
diff to current
2015-10-11
rabuzarus
this got lost by merge
blob
|
commitdiff
|
raw
|
diff to current
2015-10-11
rabuzarus
Merge develop-new into event-attendance-new
blob
|
commitdiff
|
raw
|
diff to current
2015-10-11
Tobias Diekershoff
Merge pull request #1950 from annando/1510-contact...
blob
|
commitdiff
|
raw
|
diff to current
2015-10-11
Michael Vogel
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2015-10-10
Tobias Diekershoff
Merge pull request #1947 from annando/1510-diaspora...
blob
|
commitdiff
|
raw
|
diff to current
2015-10-10
Tobias Diekershoff
Merge pull request #1948 from annando/1510-more-escaping
blob
|
commitdiff
|
raw
|
diff to current
2015-10-10
Michael Vogel
Improved contact menu
blob
|
commitdiff
|
raw
|
diff to current
2015-10-10
Michael Vogel
Reworked contact relations between Friendica and Diaspora
blob
|
commitdiff
|
raw
|
diff to current
2015-10-09
rabuzarus
update attendance state on profile wall
blob
|
commitdiff
|
raw
|
diff to current
2015-10-09
Michael Vogel
Contact names with ">" and "<" are a problem ...
blob
|
commitdiff
|
raw
|
diff to current
2015-10-08
rabuzarus
translate attendance with localize_item()
blob
|
commitdiff
|
raw
|
diff to current
2015-10-08
Tobias Diekershoff
Merge pull request #1944 from annando/1510-proxy-pictur...
blob
|
commitdiff
|
raw
|
diff to current
2015-10-07
Michael Vogel
Bugfix: The contact names had to be escaped
blob
|
commitdiff
|
raw
|
diff to current
2015-10-07
Michael Vogel
Added resize possibility to proxy function
blob
|
commitdiff
|
raw
|
diff to current
2015-10-05
Tobias Diekershoff
Merge pull request #1937 from annando/1510-follow-notif...
blob
|
commitdiff
|
raw
|
diff to current
2015-10-04
Michael Vogel
Further improvement of the contact menu
blob
|
commitdiff
|
raw
|
diff to current
2015-10-04
Tobias Diekershoff
Merge pull request #1936 from annando/1510-contact...
blob
|
commitdiff
|
raw
|
diff to current
2015-10-04
Michael Vogel
The contact menu is now improved (for example a "Follow...
blob
|
commitdiff
|
raw
|
diff to current
2015-09-30
rabuzarus
port of the event attendance feature of red matrix...
blob
|
commitdiff
|
raw
|
diff to current
2015-09-30
rabuzarus
fixes like/dislike for photos
blob
|
commitdiff
|
raw
|
diff to current
2015-09-30
rabuzarus
rest of the consensus porting work and integration...
blob
|
commitdiff
|
raw
|
diff to current
2015-09-30
rabuzarus
make event confirmation work
blob
|
commitdiff
|
raw
|
diff to current
2015-09-30
rabuzarus
first work for consensus
blob
|
commitdiff
|
raw
|
diff to current
2015-09-29
Fabrixxm
Merge branch '3.4.2'
blob
|
commitdiff
|
raw
|
diff to current
2015-08-10
Michael Vogel
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2015-08-10
Tobias Diekershoff
Merge pull request #1802 from annando/1508-valid-username
blob
|
commitdiff
|
raw
|
diff to current
2015-08-10
Tobias Diekershoff
Merge pull request #1803 from annando/1508-accessibility
blob
|
commitdiff
|
raw
|
diff to current
2015-08-08
Michael Vogel
Better link descriptions.
blob
|
commitdiff
|
raw
|
diff to current
2015-08-08
Michael Vogel
Added many accesskeys ...
blob
|
commitdiff
|
raw
|
diff to current
2015-07-06
fabrixxm
Merge branch '3.4.1'
blob
|
commitdiff
|
raw
|
diff to current
2015-07-04
Tobias Diekershoff
Merge pull request #1724 from rabuzarus/theme_uid
blob
|
commitdiff
|
raw
|
diff to current
2015-07-02
fabrixxm
Merge pull request #1726 from rabuzarus/acl-var
blob
|
commitdiff
|
raw
|
diff to current
2015-06-30
Fabrixxm
Merge branch 'develop' into lang
blob
|
commitdiff
|
raw
|
diff to current
2015-06-30
fabrixxm
Merge pull request #1715 from rabuzarus/theme_uid
blob
|
commitdiff
|
raw
|
diff to current
2015-06-30
fabrixxm
Merge pull request #1714 from annando/1506-mail-link...
blob
|
commitdiff
|
raw
|
diff to current
2015-06-30
fabrixxm
Merge pull request #1713 from annando/1506-ostatus...
blob
|
commitdiff
|
raw
|
diff to current
2015-06-30
fabrixxm
Merge pull request #1712 from annando/1506-ostatus...
blob
|
commitdiff
|
raw
|
diff to current
2015-06-30
fabrixxm
Merge pull request #1716 from annando/1506-no-googlemap
blob
|
commitdiff
|
raw
|
diff to current
2015-06-30
Michael Vogel
Removed Google Maps
blob
|
commitdiff
|
raw
|
diff to current
2015-06-29
fabrixxm
Merge pull request #1696 from rabuzarus/acl-var
blob
|
commitdiff
|
raw
|
diff to current
2015-06-27
rabuzarus
Merge acl-var into develop
blob
|
commitdiff
|
raw
|
diff to current
2015-06-27
rabuzarus
restore jotplugins
blob
|
commitdiff
|
raw
|
diff to current
2015-06-26
rabuzarus
cleanup of some unused code
blob
|
commitdiff
|
raw
|
diff to current
2015-06-25
rabuzarus
make notes work
blob
|
commitdiff
|
raw
|
diff to current
2015-06-15
Tobias Diekershoff
Merge remote-tracking branch 'frank/2015-06-12-fraengii...
blob
|
commitdiff
|
raw
|
diff to current
2015-05-20
fabrixxm
Merge branch 'master' into develop
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-05-02
Michael Vogel
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2015-04-22
Tobias Diekershoff
Merge pull request #1527 from fraengii/2015-04-22-Chats...
blob
|
commitdiff
|
raw
|
diff to current
2015-04-21
Tobias Diekershoff
Merge pull request #1526 from fraengii/20150421-Bugs...
blob
|
commitdiff
|
raw
|
diff to current
2015-04-17
Tobias Diekershoff
Merge pull request #1512 from fraengii/2015-04-12-Accou...
blob
|
commitdiff
|
raw
|
diff to current
2015-04-17
Tobias Diekershoff
Merge pull request #1503 from fraengii/20150408-H-de...
blob
|
commitdiff
|
raw
|
diff to current
2015-04-13
Michael Vogel
Merge pull request #1487 from fabrixxm/projects
blob
|
commitdiff
|
raw
|
diff to current
2015-04-12
Michael Vogel
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2015-04-12
fabrixxm
Merge pull request #1505 from annando/1504-unified...
blob
|
commitdiff
|
raw
|
diff to current
2015-04-12
fabrixxm
Merge pull request #1509 from annando/1504-code-rework
blob
|
commitdiff
|
raw
|
diff to current
2015-04-11
Michael Vogel
Code reworks: replaced hardcoded network text with...
blob
|
commitdiff
|
raw
|
diff to current
2015-04-05
fabrixxm
Merge branch 'release/3.4'
blob
|
commitdiff
|
raw
|
diff to current
2015-03-22
fabrixxm
Merge pull request #1433 from tugelbend/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-23
fabrixxm
Merge pull request #1356 from silke/develop
blob
|
commitdiff
|
raw
|
diff to current
2015-02-17
Michael Vogel
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2015-02-11
Michael Vogel
Merge remote-tracking branch 'upstream/develop' into...
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
2015-02-09
Tobias Diekershoff
Merge pull request #1382 from fabrixxm/localize-activit...
blob
|
commitdiff
|
raw
|
diff to current
2015-02-09
Fabrixxm
fix translation of poke activity body
blob
|
commitdiff
|
raw
|
diff to current
2015-01-25
fabrixxm
Merge pull request #1305 from tobiasd/20150123-quaddro
blob
|
commitdiff
|
raw
|
diff to current
2015-01-25
fabrixxm
Merge pull request #1317 from tobiasd/20150125cs
blob
|
commitdiff
|
raw
|
diff to current
2015-01-25
Michael Vogel
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2015-01-25
Tobias Diekershoff
Merge pull request #1314 from annando/1501-better-diasp...
blob
|
commitdiff
|
raw
|
diff to current
2015-01-25
Tobias Diekershoff
Merge pull request #1315 from annando/1501-issue-1283
blob
|
commitdiff
|
raw
|
diff to current
2015-01-24
Michael Vogel
issue 1283 - Share-it button support for friendica
blob
|
commitdiff
|
raw
|
diff to current
2014-09-04
Beanow
Merge branch 'feature/edit-profile-improvements' into...
blob
|
commitdiff
|
raw
|
diff to current
2014-08-20
fabrixxm
Merge pull request #1070 from annando/master
blob
|
commitdiff
|
raw
|
diff to current
2014-08-12
Michael Vogel
Merge remote-tracking branch 'upstream/master'
blob
|
commitdiff
|
raw
|
diff to current
2014-08-12
Michael Vogel
Moved "privacy_image_cache" into the core. Enabled...
blob
|
commitdiff
|
raw
|
diff to current
2014-08-10
tobiasd
Merge pull request #1067 from Beanow/feature/noscrape
blob
|
commitdiff
|
raw
|
diff to current
2014-07-10
tobiasd
Merge pull request #1042 from annando/master
blob
|
commitdiff
|
raw
|
diff to current
2014-07-09
Michael Vogel
Adding preview value to "prepare_body" hook. (Will...
blob
|
commitdiff
|
raw
|
diff to current
2014-06-22
tobiasd
Merge pull request #1028 from tugelbend/master
blob
|
commitdiff
|
raw
|
diff to current
2014-05-12
fabrixxm
Merge pull request #954 from fabrixxm/issue_936
blob
|
commitdiff
|
raw
|
diff to current
2014-05-10
tobiasd
Merge pull request #965 from annando/master
blob
|
commitdiff
|
raw
|
diff to current
next
projects / friendica.git / history