Michael Vogel
eb27c32065
DBA: Nothing really done ..
2012-04-14 13:17:58 +02:00
Michael Vogel
4e220ec391
Merge commit 'upstream/master'
2012-04-14 13:15:25 +02:00
friendica
7c63ca8364
one more
2012-04-13 17:39:12 -07:00
friendica
0d0aa7495b
additional marital status selectors
2012-04-13 17:34:02 -07:00
Fabio Comuni
f6e1ddf7fb
Merge remote-tracking branch 'friendica/master'
2012-04-13 11:59:25 +02:00
Fabio Comuni
4496d075e5
move html out of lang_selector() and new template lang_selector.tpl
2012-04-13 11:56:21 +02:00
Fabio Comuni
67a2d5be77
validate_url allow naked subdomain if is "localhost"
2012-04-13 09:42:53 +02:00
friendica
df1904b204
stray debug statements, forgot to filter pending contacts
2012-04-12 23:14:41 -07:00
friendica
3c4e6d3461
bug #369 - show contacts who are not in any groups
2012-04-12 23:06:41 -07:00
Michael Vogel
572678fef9
Merge commit 'upstream/master'
...
Conflicts:
include/dba.php
2012-04-13 00:10:41 +02:00
Michael Vogel
138caa4380
DBA: Deactivation of the mysqli-class for testing purposes.
2012-04-13 00:05:52 +02:00
friendica
73487989c0
query to find un-grouped contacts
2012-04-12 07:48:28 -07:00
friendica
60871555f5
reverting recent db driver changes - won't install cleanly, won't update cleanly, and leaks DB credentials over the web if there's a connection problem
2012-04-12 06:50:11 -07:00
friendica
5a78400f37
table cleanup
2012-04-12 05:15:45 -07:00
Michael Vogel
ee714daf4d
Merge commit 'upstream/master'
2012-04-11 19:35:51 +02:00
Michael Vogel
c88c2515e4
API: Improved the timeline. Several (disabled) tests with caching of photos.
2012-04-11 19:31:01 +02:00
friendica
b02a671494
visit "random profile" feature
2012-04-10 20:50:31 -07:00
friendica
640f258f18
cleanup photo menus
2012-04-10 19:33:32 -07:00
friendica
19b636e7e8
more backend work on mail2 followers
2012-04-10 19:15:52 -07:00
friendica
9b1bb53234
fix_mce_lf on profiles
2012-04-10 16:31:49 -07:00
friendica
14d68a0dc0
set default on get_avatar
2012-04-10 15:33:43 -07:00
friendica
3c66816938
Merge branch 'libravatar' of https://github.com/dawnbreak/friendica into pull
2012-04-10 15:28:48 -07:00
Klaus Weidenbach
1f9fe8b5ee
Remove Gravatar from core and add new hook avatar_lookup.
...
This patch removes all occurances of Gravatar from friendica's core and adds a new hook "avatar_lookup" inside the function avatar_img($email) where the new *avatar-plugins should hook in.
I haven't touched the language files yet. Are they updated automatically somehow?
2012-04-09 21:22:09 +02:00
Klaus Weidenbach
93ffba58cc
Rename gravatar_img() more generic to avatar_img().
...
I would like to extend the Gravatar support to also use Libravatar, a decentralized avatar service.
First step to extract Gravatar from core and put it into its own plugin. Later the Libravatar plugin can be done, too as a plugin.
2012-04-09 21:22:09 +02:00
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
Michael Vogel
fe257a2032
html2plain: changed behaviour for the "hr" element.
2012-04-09 12:54:02 +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
269f21ddc1
API: Added Public Timeline
2012-04-08 20:19:14 +02:00
Michael Vogel
763729f11a
API: Now mentions could work as well - only my client doesn't really work
2012-04-08 17:51:05 +02:00
Michael Vogel
944f897d30
API: Basic support of the identica client added.
2012-04-08 17:23:38 +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
