Alexander Kampmann
1370ba5d16
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-09 14:28:21 +02:00
Alexander Kampmann
7187516718
fixed some typos
2012-04-09 14:27:52 +02:00
Alexander Kampmann
7ac4b83c39
made exceptions from the db optional
...
set address for updae mails correctly
2012-04-09 14:04:49 +02:00
friendica
c1e2596807
more sane defaults datetime_convert
2012-04-08 18:09:21 -07:00
friendica
129130b0f7
fix empty string timezone
2012-04-08 18:01:49 -07:00
Alexander Kampmann
0d60dbef31
added exceptions to dba class
...
added exception handling to index.php, please mind that there is no
recovery at the moment
added transactions to db update. Please mind that they might not be
supported by db table engines.
added admin email on failed updates
added german translation for admin email
2012-04-09 00:45:10 +02:00
Michael Vogel
cb4c7cdb3e
API: API is now enhanced. mentions, repeat and destroy now works.
2012-04-08 00:02:25 +02:00
Michael Vogel
cb05801a90
Merge commit 'upstream/master'
2012-04-07 18:35:29 +02:00
friendica
1440786c31
ignore utf8 offset error for unit tests
2012-04-07 02:31:41 -07:00
friendica
3a1c78bd75
some work on tests
2012-04-07 01:04:45 -07:00
friendica
ecabe1d505
ignore removed plugins
2012-04-06 05:21:42 -07:00
friendica
13dfb40128
fix messed up config tables w/ duplicate entries
2012-04-06 05:11:09 -07:00
friendica
665b2c8107
revert config changes, we're getting duplicate keys
2012-04-06 03:10:46 -07:00
friendica
4bee1859be
Merge branch 'pull'
2012-04-05 21:43:38 -07:00
friendica
221726392e
pass autoname(0) test
2012-04-05 18:44:36 -07:00
Michael Vogel
34d268544e
Merge commit 'upstream/master'
2012-04-06 00:00:46 +02:00
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
Alexander Kampmann
cbf4544887
added index to config and pconfig table
...
changed config.php to use REPLACE instead of INSERT,
this removes one db hit.
2012-04-05 13:27:09 +02:00
friendica
37801dd6ed
also block outbound
2012-04-04 20:48:35 -07:00
friendica
0c7710681c
log disabled requests
2012-04-04 18:49:39 -07:00
friendica
71671e5b9a
fix config storage of booleans
2012-04-04 17:51:59 -07:00
friendica
62c60fd53d
bug: diaspora_enabled setting turns it on but doesn't fully turn it off.
2012-04-04 14:13:34 -07: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
Michael Vogel
3dc317dcc6
Merge commit 'upstream/master'
2012-04-02 22:00:22 +02:00
friendica
62e528ba43
remove zrl from query string
2012-04-02 00:45:45 -07:00
friendica
1f74bd1b78
catch a couple more Oo smilies
2012-04-01 22:57:50 -07:00
friendica
5d35f0d54a
add title to D* posts
2012-04-01 19:16:13 -07:00
Michael Johnston
581b54c974
allow users to set categories on their posts
2012-04-01 21:28:31 -04:00
friendica
00bbb9ad36
slight improvement in handling of plaintext feeds
2012-04-01 15:43:57 -07:00
Michael Vogel
5409825fe7
New script that checks if a script is running
2012-04-01 20:56:27 +02:00
Michael Vogel
4cf1e5aa21
poller: An optional lockfile is used to check if the poller is already running
2012-04-01 20:52:33 +02:00
friendica
9b4bef8ac4
that didn't quite work out
2012-04-01 06:46:12 -07:00
Michael Vogel
7d23149a61
Merge commit 'upstream/master'
2012-04-01 14:11:37 +02:00
friendica
f0b8d01615
try slightly better detection of html in feeds
2012-04-01 03:19:37 -07:00
friendica
ae5e5bf1e4
Merge branch 'pull'
2012-04-01 01:03:05 -07:00
friendica
5c2fdc795f
send unverified private mail using zrl
2012-04-01 00:59:35 -07:00
Simon
e97d90820d
line 86: s/Friendika/Friendica/
2012-04-01 04:52:45 -03:00
friendica
e6fd6bfd89
more error handling
2012-03-31 17:44:34 -07:00
friendica
53f799f2bc
handle escaped file chars in display and search
2012-03-31 15:25:17 -07:00
friendica
0cf2e051bb
escape % in file_tag_query as it is ultimately embedded in a sprintf
2012-03-31 14:48:35 -07:00
Michael Vogel
59b45f7fc1
Several improvements
2012-03-31 16:28:39 +02:00
friendica
8c928e67ba
warning cleanup
2012-03-30 23:18:46 -07:00
17c908973f
catch OpenID login errors in cases when the OpenID server does not answers
2012-03-30 15:19:17 +02:00
friendica
bcc5801608
rename "file as" to "save to folder"
2012-03-30 02:42:36 -07:00
friendica
87539dbec4
bug #352 - qcomment plugin disabled, qcomments still allowed
2012-03-30 02:22:57 -07:00
friendica
e2c295c01f
another silly mistake
2012-03-29 21:44:30 -07:00
friendica
9332312ce9
silly mistake
2012-03-29 21:18:47 -07:00
friendica
168cf3b9d4
zrl on mentions
2012-03-29 21:08:10 -07:00
friendica
bb8beb26b4
use zrl to get home again
2012-03-29 20:58:32 -07:00
