friendica
|
4bee1859be
|
Merge branch 'pull'
|
2012-04-05 21:43:38 -07:00 |
|
friendica
|
6bc7e6e09f
|
add network_tabs hook
|
2012-04-05 21:42:47 -07: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 |
|
friendica
|
9b6e91086b
|
make 'PHP "register_argc_argv"' easier to translate, may require fix for po2php
|
2012-04-05 02:15:03 -07:00 |
|
friendica
|
b45327b856
|
let's catch d* disabled at a higher level and not waste any resources on it.
|
2012-04-04 20:45:48 -07:00 |
|
Michael Johnston
|
da0eb2d4c9
|
correct some filer dialog weirdness caused by introduction of categories
|
2012-04-04 23:08:16 -04:00 |
|
friendica
|
f63636ed14
|
well that was a stupid mistake...
|
2012-04-04 17:19:46 -07:00 |
|
friendica
|
60c57704c6
|
better handling of reshares containing embeds
|
2012-04-04 02:02:23 -07:00 |
|
friendica
|
8e928d101b
|
display settings hooks
|
2012-04-03 22:01:52 -07:00 |
|
friendica
|
466188ebd7
|
re-opened bug #363
|
2012-04-03 20:14:37 -07:00 |
|
friendica
|
96abee53e4
|
this is better
|
2012-04-03 19:20:39 -07:00 |
|
friendica
|
dbe16afcd4
|
include contact_widgets for categories_widget when doing updates
|
2012-04-03 19:16:02 -07:00 |
|
friendica
|
4b762ff923
|
suppress duplicates in search
|
2012-04-03 02:44:29 -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 |
|
friendica
|
e1de2e3de0
|
don't change ssl settings on local photos for remote contact
|
2012-04-02 19:38:13 -07:00 |
|
friendica
|
9391fc965d
|
bug #363 and a couple of other reported ssl link issues
|
2012-04-02 17:43:11 -07:00 |
|
friendica
|
2352e6c1cb
|
make the "new calendar" (javascript interactive) the default
|
2012-04-02 01:46:35 -07:00 |
|
Michael Johnston
|
581b54c974
|
allow users to set categories on their posts
|
2012-04-01 21:28:31 -04:00 |
|
Thomas Willingham
|
210586eaed
|
Merge remote-tracking branch 'upstream/master'
|
2012-04-02 00:29:27 +01:00 |
|
Thomas Willingham
|
8406803473
|
modified: mod/newmember.php
Add a link to the quick start
|
2012-04-02 00:27:47 +01:00 |
|
friendica
|
f95db4382e
|
check for style.php existence before inclusion
|
2012-04-01 16:21:55 -07:00 |
|
Thomas Willingham
|
d0ddd380e7
|
Moved Diaspora notes away from top, per user request
|
2012-04-02 00:18:03 +01:00 |
|
friendica
|
5c2fdc795f
|
send unverified private mail using zrl
|
2012-04-01 00:59:35 -07:00 |
|
friendica
|
ea10bba147
|
fix "between yourself and You" in mail list
|
2012-03-31 20:08:32 -07:00 |
|
friendica
|
2147e0a71f
|
ensure all new users get a timezone. We'll use UTC until they choose otherwise.
|
2012-03-31 16:08:40 -07:00 |
|
friendica
|
53f799f2bc
|
handle escaped file chars in display and search
|
2012-03-31 15:25:17 -07:00 |
|
friendica
|
adebc2793e
|
register hooks for a COPA plugin
|
2012-03-31 06:15:33 -07:00 |
|
friendica
|
b4b1055b50
|
settings for unknown private mail acceptance
|
2012-03-31 00:57:59 -07:00 |
|
friendica
|
8c928e67ba
|
warning cleanup
|
2012-03-30 23:18:46 -07:00 |
|
friendica
|
aace55df0a
|
Merge branch 'pull'
|
2012-03-30 15:12:20 -07:00 |
|
friendica
|
cfdfcb37cb
|
don't delete contact from a friend request if friendship was already established
|
2012-03-30 15:10:50 -07:00 |
|
Fabio Comuni
|
01af7d355a
|
allow themes to use "style.php" instead of "style.css".
Load style.php trhu mod/view.php to pass it friendica framework.
|
2012-03-30 21:18:25 +02:00 |
|
Fabio Comuni
|
054d21a2e8
|
settings: add "display settings" tab, with UI-related settings.
Load optional "config.php" from theme folder and show in page.
Loading of "config.php" follow theme_info['extends'] property.
|
2012-03-30 15:45:02 +02:00 |
|
friendica
|
bcc5801608
|
rename "file as" to "save to folder"
|
2012-03-30 02:42:36 -07:00 |
|
friendica
|
d83bfd464b
|
zrl into people searches
|
2012-03-29 22:20:14 -07:00 |
|
friendica
|
bb8beb26b4
|
use zrl to get home again
|
2012-03-29 20:58:32 -07:00 |
|
friendica
|
75f778a504
|
provide a way to specify an admin account for siteinfo if more than one have admin email address
|
2012-03-29 18:22:20 -07:00 |
|
fabrixxm
|
3ee529d095
|
Merge pull request #185 from fabrixxm/master
Updated private message pages
|
2012-03-28 23:47:23 -07:00 |
|
friendica
|
3f89adfd62
|
wrong var for notify total
|
2012-03-28 17:51:43 -07:00 |
|
friendica
|
77715c0c65
|
fix notification total
|
2012-03-28 17:44:24 -07:00 |
|
friendica
|
7956c2d08e
|
improved rw notifications
|
2012-03-28 17:21:56 -07:00 |
|
friendica
|
4fe0b56d76
|
bug #349 - email notls setting
|
2012-03-28 14:54:00 -07:00 |
|
Fabio Comuni
|
50711040cb
|
message: remove tabs, move new message link to aside, all message with gmail-style
|
2012-03-28 15:31:58 +02:00 |
|
friendica
|
e894775a39
|
Merge branch 'pull'
|
2012-03-28 05:16:25 -07:00 |
|
friendica
|
b58dc43148
|
Merge branch 'pull'
|
2012-03-28 03:19:42 -07:00 |
|
friendica
|
b18086097e
|
title not updated when editing post
|
2012-03-28 03:18:26 -07:00 |
|
Fabio Comuni
|
767245e9ff
|
viewsrc: return only body if page is requested via ajax
|
2012-03-28 11:42:04 +02:00 |
|
Fabio Comuni
|
0a2675d8b6
|
filer: replace "file as" prompt with combobox opened in fancybox
|
2012-03-28 10:49:34 +02:00 |
|
friendica
|
117d2165f5
|
form security error when using existing photo
|
2012-03-27 04:51:20 -07:00 |
|