Alexander Kampmann
|
355c42cb30
|
Merge branch 'master' of https://github.com/friendica/friendica
Conflicts:
include/config.php
update.php
|
2012-04-05 13:39:15 +02:00 |
|
friendica
|
5d0d9f8772
|
make contact ssl_policy change a function since it is used in a few places
|
2012-04-02 23:07:26 -07:00 |
|
|
friendica
|
f4721955db
|
more ssl policy fixes and prevent delivery to soapbox when using local delivery
|
2012-04-02 21:01:19 -07:00 |
|
|
friendica
|
e1de2e3de0
|
don't change ssl settings on local photos for remote contact
|
2012-04-02 19:38:13 -07:00 |
|
|
friendica
|
7956c2d08e
|
improved rw notifications
|
2012-03-28 17:21:56 -07:00 |
|
|
friendica
|
7684f63ecd
|
track whether contact is a community page or not
|
2012-03-15 16:38:26 -07:00 |
|
|
friendica
|
f0a62d8908
|
ssl_policy stuff
|
2012-03-14 20:36:23 -07:00 |
|
|
friendica
|
8aa2552372
|
add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)
|
2012-01-18 16:21:30 -08:00 |
|
Friendika
|
2802c142cb
|
local_deliver testing
|
2011-10-06 19:10:57 -07:00 |
|
|
Friendika
|
e232c50c9e
|
check author url to see if it matches current contact before relay is accepted
|
2011-10-06 00:26:25 -07:00 |
|
|
Friendika
|
7d6a67f903
|
mostly cosmetic changes to make DB tables accurately reflect the conversation members
|
2011-10-05 19:16:05 -07:00 |
|
|
Friendika
|
b1e5dfad3c
|
clean up w3c validation and layout for priv mail and lang selector
|
2011-10-05 15:35:53 -07:00 |
|
|
Friendika
|
d709225b68
|
better check for orig post author
|
2011-10-05 13:11:45 -07:00 |
|
|
Friendika
|
6ff221d5a1
|
another typo
|
2011-10-04 21:53:33 -07:00 |
|
|
Friendika
|
c2d70d005b
|
and a typo fix
|
2011-10-04 21:45:15 -07:00 |
|
|
Friendika
|
159d06df82
|
notification issue after last checkin
|
2011-10-04 21:43:21 -07:00 |
|
|
Friendika
|
11ca81adba
|
keychecks
|
2011-09-21 05:43:26 -07:00 |
|
|
Friendika
|
d653d922b1
|
sorting through key issue
|
2011-09-19 21:24:16 -07:00 |
|
|
Friendika
|
fd18b42a5a
|
Check all keys before use
|
2011-09-19 03:30:59 -07:00 |
|
|
Friendika
|
2aef98f71d
|
cripple account when expired
|
2011-09-19 01:17:12 -07:00 |
|
|
Friendika
|
c0be5bea16
|
fix warning of self-signed cert for photos of our own contacts in comment notification emails
|
2011-08-20 18:27:12 -07:00 |
|
|
Friendika
|
b721fabc3c
|
show lock icon on private events
|
2011-07-27 02:21:55 -07:00 |
|
|
Friendika
|
d7154a4606
|
ability to link contacts that are "really me, but on another system/network".
|
2011-07-05 19:55:09 -07:00 |
|
|
Friendika
|
76e56fd44e
|
begin work on relocation conversation
|
2011-07-05 19:19:11 -07:00 |
|
|
Friendika
|
0b221e8945
|
bug #96 move libraries to library - better alignment of like rotator
|
2011-06-28 21:11:52 -07:00 |
|
|
Friendika
|
3fe1e19725
|
pass notify endpoint with friend suggestions
|
2011-06-26 19:30:57 -07:00 |
|
|
Friendika
|
59d9070d13
|
suggestion template
|
2011-06-25 19:10:38 -07:00 |
|
|
Friendika
|
a15bd91d17
|
don't update an event that hasn't changed.
|
2011-06-23 18:25:33 -07:00 |
|
|
Friendika
|
c23c366ff6
|
receive friendship suggestion over the wire (dfrn) and store
|
2011-06-22 19:08:30 -07:00 |
|
|
Friendika
|
ca84823437
|
Dear $username not expanded/replaced in text emails
|
2011-06-14 20:49:25 -07:00 |
|
|
Friendika
|
05eb9ceaba
|
avoid returning events from getting posted again
|
2011-06-13 20:42:37 -07:00 |
|
|
Friendika
|
d5fdd4287d
|
event sharing, cont.
|
2011-06-13 19:06:49 -07:00 |
|
|
Friendika
|
94af6fb064
|
correct nickname for display link on comment emails
|
2011-05-27 18:54:43 -07:00 |
|
|
Friendika
|
3710a6fd07
|
sort out a couple of email notify issues
|
2011-05-25 18:15:49 -07:00 |
|
Fabio Comuni
|
ad2aded259
|
Small tweak to a copule of translatable strings
|
2011-05-25 12:23:45 +02:00 |
|
|
Friendika
|
040fc247a0
|
bug #85
|
2011-05-23 20:30:37 -07:00 |
|
|
Friendika
|
576f8eda08
|
more buggy debugging code removed.
|
2011-05-22 20:18:39 -07:00 |
|
Chris Case
|
f4cb6b9b08
|
fixed a couple of bugs
|
2011-05-21 23:19:50 -07:00 |
|
|
Chris Case
|
4cff911939
|
merged multipart email changes
|
2011-05-21 21:40:16 -07:00 |
|
|
Chris Case
|
2cf696d0b5
|
image updates
|
2011-05-21 19:27:56 -07:00 |
|
|
Friendika
|
b2e92e0af3
|
deprecate load_view_file
|
2011-05-11 04:37:13 -07:00 |
|
|
Friendika
|
de131c9e58
|
set utf-8 on all emails
|
2011-04-14 17:13:13 -07:00 |
|
|
Friendika
|
3d51518a13
|
set writable flag on dfrn_poll
|
2011-04-10 19:29:21 -07:00 |
|
|
Friendika
|
940d216395
|
initial dfrn update to pass perms
|
2011-04-10 18:38:55 -07:00 |
|
|
Friendika
|
75ad3219e6
|
remote deletion - check contact-id
|
2011-03-30 17:50:18 -07:00 |
|
|
Fabio Comuni
|
7df8e18dd1
|
Update more strings
|
2011-03-18 11:02:42 +01:00 |
|
|
fabrixxm
|
a7af6df962
|
Fix spaces around t() and tt()
|
2011-03-13 13:50:44 +01:00 |
|
|
fabrixxm
|
9f7878057f
|
update source strings
|
2011-03-11 00:22:21 +01:00 |
|
|
Friendika
|
f089b1610e
|
feeds: update content when updated/edited changes
|
2011-02-28 18:24:32 -08:00 |
|
|
Friendika
|
755c2245e8
|
move php path setting inside proc_run
|
2011-02-23 15:16:12 -08:00 |
|