rebeka-catalina
|
9817104ebc
|
Clarified description of ignore
|
2015-10-14 17:48:26 +02:00 |
|
Tobias Diekershoff
|
c855c9ba67
|
Merge pull request #1963 from annando/1510-feed-warning
Avoid a warning when a feed contains no items.
|
2015-10-14 08:49:02 +02:00 |
|
Michael Vogel
|
65228e37bb
|
Avoid a warning when a feed contains no items.
|
2015-10-14 08:10:06 +02:00 |
|
Tobias Diekershoff
|
a961c29d05
|
Merge pull request #1962 from annando/1510-attend-vier
Vier: Some small changes in the template for events
|
2015-10-14 06:42:50 +02:00 |
|
Michael Vogel
|
f3e1d12643
|
Merge pull request #1961 from tobiasd/20151013-typo
typo in markdown syntax
|
2015-10-13 21:42:01 +02:00 |
|
Michael Vogel
|
66ea33623b
|
Vier: Some small changes in the template for events
|
2015-10-13 20:15:01 +02:00 |
|
Tobias Diekershoff
|
e47acf83d2
|
typo in markdown syntax
|
2015-10-13 18:22:45 +02:00 |
|
Tobias Diekershoff
|
1e0aa4b22e
|
Merge pull request #1960 from tobiasd/20151013-deA
DE: update to the strings
|
2015-10-13 17:37:01 +02:00 |
|
Tobias Diekershoff
|
db14dc13c3
|
DE: update to the strings
|
2015-10-13 17:35:08 +02:00 |
|
Tobias Diekershoff
|
407560532c
|
Merge pull request #1959 from tobiasd/20151013-de
DE: translation of the attend strings THX to Abrax
|
2015-10-13 17:09:39 +02:00 |
|
Tobias Diekershoff
|
1df5a7212b
|
DE: translation of the attend strings THX to Abrax
|
2015-10-13 17:06:35 +02:00 |
|
Tobias Diekershoff
|
c0d0298b0f
|
Merge pull request #1958 from fabrixxm/event_firstday
default value for firstDay in events page
|
2015-10-12 21:17:03 +02:00 |
|
Tobias Diekershoff
|
154c55b36e
|
Merge pull request #1957 from fabrixxm/duepuntozeroattend
attend functionality for duepuntozero
|
2015-10-12 21:16:40 +02:00 |
|
fabrixxm
|
5299f25920
|
default value for firstDay in events page
|
2015-10-12 20:23:09 +02:00 |
|
fabrixxm
|
fd8e8d005a
|
attend functionality for duepuntozero
|
2015-10-12 20:09:33 +02:00 |
|
fabrixxm
|
6f2f024b17
|
Merge pull request #1954 from tobiasd/20151012-messages
regeneration of the messages.po file for attendance translation
|
2015-10-12 19:05:57 +02:00 |
|
fabrixxm
|
735755aa0e
|
Merge pull request #1956 from tobiasd/20151012-de
DE Update to the translation, thx Abrax
|
2015-10-12 19:04:51 +02:00 |
|
fabrixxm
|
8bf3a36737
|
Merge pull request #1955 from tobiasd/20151012-quattroattend
attend functionality for quattro theme (part of #1953)
|
2015-10-12 19:03:30 +02:00 |
|
Tobias Diekershoff
|
5839242792
|
DE Update to the translation, thx Abrax
|
2015-10-12 18:08:11 +02:00 |
|
Tobias Diekershoff
|
da8c81a12e
|
cleanup forgotten lines
|
2015-10-12 15:58:34 +02:00 |
|
Tobias Diekershoff
|
3debdf0a91
|
attend functionality for quattro theme (part of #1953)
|
2015-10-12 15:34:18 +02:00 |
|
Tobias Diekershoff
|
32a21bb02b
|
regeneration of the messages.po file for attendance translation
|
2015-10-12 15:15:39 +02:00 |
|
Tobias Diekershoff
|
ce03ccc95c
|
Merge pull request #1929 from rabuzarus/event-attendance
port of reds event attendance feature
|
2015-10-12 15:10:03 +02:00 |
|
Tobias Diekershoff
|
456e078021
|
Merge pull request #1952 from annando/1510-ifttt
Vier: Support for the new IFTTT addon
|
2015-10-12 08:18:11 +02:00 |
|
Michael Vogel
|
a58be37930
|
Merge pull request #1943 from tobiasd/20151007-adminname
personalise emails send from the server
|
2015-10-12 07:50:40 +02:00 |
|
Michael Vogel
|
adba75600a
|
Vier: Support for the new IFTTT addon.
|
2015-10-11 23:36:23 +02:00 |
|
rabuzarus
|
5c2923869a
|
this got lost by merge
|
2015-10-11 20:00:54 +02:00 |
|
rabuzarus
|
649578ae33
|
Merge develop-new into event-attendance-new
Conflicts:
include/conversation.php
|
2015-10-11 19:39:55 +02:00 |
|
rabuzarus
|
db7dca3d5f
|
Merge event-attendance into develop
Conflicts:
include/conversation.php
|
2015-10-11 19:28:54 +02:00 |
|
rabuzarus
|
a539455d81
|
correct a little mistake (delivery.php was not commited)
|
2015-10-11 18:20:06 +02:00 |
|
rabuzarus
|
6f04c57ed3
|
correct a little mistake (ACTIVITY_LIKE is supported)
|
2015-10-11 15:34:56 +02:00 |
|
rabuzarus
|
0b36b09823
|
don't send attendance activities to diaspora (unsupported)
|
2015-10-11 13:07:19 +02:00 |
|
Michael Vogel
|
78b8a081f3
|
Merge pull request #1951 from tobiasd/20151011-messagespo
regenerated messages.po file
|
2015-10-11 12:01:46 +02:00 |
|
Tobias Diekershoff
|
199bcdb7a0
|
regenerated messages.po file
|
2015-10-11 10:38:05 +02:00 |
|
Tobias Diekershoff
|
aded5e4127
|
Merge pull request #1950 from annando/1510-contact-menu
Some improvements to the contact menus
|
2015-10-11 08:53:15 +02:00 |
|
Michael Vogel
|
48309a25ec
|
Merge remote-tracking branch 'upstream/develop' into 1510-contact-menu
Conflicts:
include/conversation.php
|
2015-10-11 05:11:46 +02:00 |
|
Tobias Diekershoff
|
27fa20ab22
|
Merge pull request #1947 from annando/1510-diaspora-follower
Reworked contact relations between Diaspora and Friendica
|
2015-10-10 18:50:20 +02:00 |
|
Tobias Diekershoff
|
9e2b62b082
|
Merge pull request #1948 from annando/1510-more-escaping
Handling contact names with > and <
|
2015-10-10 18:48:20 +02:00 |
|
Tobias Diekershoff
|
0104c33d98
|
Merge pull request #1949 from annando/1510-feed-duplicates
Bugfix: Feeds weren't imported if a post with the same URI existed.
|
2015-10-10 18:47:02 +02:00 |
|
Michael Vogel
|
bb0dff2c75
|
Improved contact menu
|
2015-10-10 16:23:20 +02:00 |
|
Michael Vogel
|
ba06d659f1
|
Bugfix: Feeds weren't imported if a post with the same URI existed.
|
2015-10-10 14:26:07 +02:00 |
|
Michael Vogel
|
efbdb57f92
|
Reworked contact relations between Friendica and Diaspora
|
2015-10-10 11:06:18 +02:00 |
|
Michael Vogel
|
ab0fbc3a65
|
Bugfix: Unidirectional Diaspora connect request have to be followers - not sharers
|
2015-10-10 04:56:40 +02:00 |
|
Michael Vogel
|
1c21401751
|
acl lookup now works fine as well.
|
2015-10-09 23:27:00 +02:00 |
|
rabuzarus
|
0eae67ea48
|
update attendance state on profile wall
|
2015-10-09 14:20:01 +02:00 |
|
rabuzarus
|
d85d215bb8
|
attendance update in network stream
|
2015-10-09 13:46:08 +02:00 |
|
Michael Vogel
|
16da708e07
|
Contact names with ">" and "<" are a problem ...
|
2015-10-09 07:39:38 +02:00 |
|
rabuzarus
|
ba1207e6e1
|
translate attendance with localize_item()
|
2015-10-08 22:23:09 +02:00 |
|
rabuzarus
|
6a9ec14878
|
small bugfix in like.php
|
2015-10-08 20:26:11 +02:00 |
|
rabuzarus
|
d2d084b814
|
treat attendance as like activity
|
2015-10-08 18:35:33 +02:00 |
|