This website requires JavaScript.
36d173ca98
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-02-27 00:56:41 -05:00
fc036210fb
spam db
2012-02-26 18:53:48 -08:00
6bc48b29cc
fix tag icon size
2012-02-26 16:40:21 -08:00
e994b990eb
typo in css
2012-02-26 16:31:51 -08:00
a1861d1128
tagging missing from wallwall and a couple of themes, star missing from dispy
2012-02-26 16:29:06 -08:00
89560edde2
Merge pull request #50 from annando/master
2012-02-26 15:07:34 -08:00
18679111f5
Merge remote branch 'upstream/master'
2012-02-27 00:03:51 +01:00
6ddd444afd
Merge pull request #49 from CatoTH/master
2012-02-26 14:49:56 -08:00
fe3dfbee56
Mail: New options for actions after importing mails.
2012-02-26 23:39:29 +01:00
b79380f906
Merge branch 'pull'
2012-02-26 14:34:58 -08:00
bdb14d5aad
relative link redirects
2012-02-26 14:34:01 -08:00
437e18d7a7
Merge remote branch 'upstream/master'
2012-02-26 21:47:47 +01:00
4b1de0f538
Avoid some notices
2012-02-26 20:43:51 +00:00
ac86407fdf
Bugfix
2012-02-26 20:43:35 +00:00
b102a1d5ec
is not always defined; but if defined, then always of type integer
2012-02-26 20:43:23 +00:00
cbc6ca642a
1 Bugfix (missing $ character) and avoid some notices
2012-02-26 20:41:41 +00:00
792abc3a24
necessare fields not loaded from DB
2012-02-26 20:40:41 +00:00
fd9c12128a
should probably be a->user['hidewall'] instead of profile['hidewall']
2012-02-26 20:39:37 +00:00
edc44933a4
"Vier-Theme" Some more design stuff.
2012-02-26 21:16:29 +01:00
2081e6d507
some revision to the German strings
2012-02-26 17:12:14 +01:00
0877fbb42a
German strings
2012-02-26 15:41:27 +01:00
aa92901b11
Wrong variable name
2012-02-26 14:29:17 +00:00
5f7858a688
show experimental and unsupported theme status on theme admin page
2012-02-26 04:17:02 -08:00
fb8675f349
jumping divs with no scrolling
2012-02-26 01:20:43 -08:00
484426d3e2
imrpove contrast on darkzero blockquotes
2012-02-26 00:53:31 -08:00
828034ad23
darkzero-NS theme
2012-02-26 00:48:11 -08:00
896f97b31a
Merge pull request #48 from abinoam/thmail-5
2012-02-25 18:01:09 -08:00
9b6afc2a38
one more attempt
2012-02-25 17:07:38 -08:00
35b5850af7
missed a spot
2012-02-25 17:04:31 -08:00
f3a225437b
Comment notifications by e-mail now are threaded
2012-02-25 16:56:14 -08:00
bcfac6c72f
include/items.php pass 'parent' to notification
2012-02-25 13:23:00 -08:00
2d5f8b4b48
mod/item.php pass 'parent' to notification
2012-02-25 13:10:33 -08:00
da52792d06
DB_UPDATE_VERSION incremented
2012-02-25 13:06:50 -08:00
edcc33ab5c
Added notify-threads to update.php
2012-02-25 13:06:06 -08:00
3d37a688c7
Added notify-threads to database.sql.
2012-02-25 12:33:08 -08:00
d075fd8a40
reverse order of links
2012-02-25 16:47:21 -08:00
da1411af47
do not set notify popup empty anymore (though another solution is needed for firehose mode)
2012-02-25 16:16:52 -08:00
2c7da5d0de
scale external images
2012-02-25 14:22:51 -08:00
579738aff7
fixed link for toggling plugin from detail page
2012-02-25 13:00:44 -08:00
1cf1870512
poller.php: Test for moving to archive, vier-style: notifications fixed
2012-02-25 19:40:05 +01:00
00edc89c47
notify positioning, theming
2012-02-25 05:00:48 -08:00
c90bac5727
sysnotify count in wrong location, and wrong number
2012-02-25 04:37:12 -08:00
4839c235da
theme seen,unseen notifications
2012-02-25 03:28:07 -08:00
3c68bf25ac
"vier" popup menu looks nicer now (more like quattro again)
2012-02-25 11:13:04 +01:00
dccefb3c36
"vier": The contacts are now working again. Line break before closing bbcodes removed.
2012-02-25 11:00:35 +01:00
aa67771eaa
photos in notifications
2012-02-25 00:42:25 -08:00
18bf5d1402
theme info (like plugin info)
2012-02-25 00:30:14 -08:00
6092567c97
notifications to zeros, bug in notify link
2012-02-24 23:44:55 -08:00
9441ff5142
string update for 2.38
2012-02-24 22:47:43 -08:00
a3cf563b68
update author name across items if changed.
2012-02-24 20:40:09 -08:00
cb9d0993f1
waitman gobble fix for escaping code blocks in tinymce
2012-02-24 20:07:57 -08:00
f5c5da742d
attribution issue - don't take author name from contact if available from item.
2012-02-24 20:03:13 -08:00
01301a6169
Bug fixed where mails where nearly empty. HTML mails can now be received.
2012-02-25 02:37:39 +01:00
a74b0746b1
multipart messages complete, message-id conversion done.
2012-02-25 01:10:45 +01:00
b95e3ac496
more privacy docs
2012-02-24 12:52:50 -08:00
0ba45eb745
Sending mail as multipart/alternative (html and plain text) (very basic by now)
2012-02-24 08:50:42 +01:00
f6320f3319
Encoding for incoming mails. Fixed invalid message id (with side effect at the moment). Sending mail as text mail. Encoding name when importing mail contact.
2012-02-24 07:11:26 +01:00
44c23cda8e
theme shakeup commences - themes are now administered in admin panel.
2012-02-23 20:29:09 -08:00
65ddefe9c5
system notifications to notify module, untranslated string in notifications.tpl
2012-02-23 17:37:03 -08:00
b4d38f6eed
implement firehose notify in ping, strip links so notify popup displays correctly in all themes
2012-02-23 16:50:29 -08:00
484a442f2b
GIT problems ...
2012-02-23 20:59:34 +01:00
0409b5cdba
Merge remote branch 'upstream/master'
2012-02-23 20:53:22 +01:00
311e35731c
bbcode.php: A list or quote at the beginning wasn't detected
2012-02-23 20:51:44 +01:00
f5b8654818
fix visualization in groupeditor
2012-02-23 16:21:28 +01:00
fd3274ff53
less html in mod/group.php, template for group members editor, quattro theme for group edit.
2012-02-23 16:17:36 +01:00
8cacff6985
Merge pull request #47 from fabrixxm/master
2012-02-23 06:44:06 -08:00
d45e26d6d9
Merge remote-tracking branch 'friendica/master'
2012-02-23 15:23:52 +01:00
1dacb2e570
quattro-green: removed contact_template.tpl
2012-02-23 14:16:20 +01:00
6a0c815c1f
Merge remote-tracking branch 'friendica/master'
2012-02-23 14:10:32 +01:00
edd946bcad
quattro: fix typos
2012-02-23 14:10:23 +01:00
c03b5b62c0
green-quattro: applied a color for shiny class and preview
2012-02-23 12:54:14 +01:00
d5adb67ef4
Merge pull request #46 from fabrixxm/master
2012-02-23 02:52:04 -08:00
cbc60d525e
quattro post preview, style contacts pages, style for "shiny" class, fix contacts list in profile aside. remove html from viewcontacts.php and contacts.php use contact_template.tpl to print contacts also in viewcontacts
2012-02-23 11:22:32 +01:00
85d09f48d0
fix img tag with size attribute
2012-02-23 11:12:36 +01:00
d9e9fd0359
Merge branch 'master' into notify
2012-02-23 00:30:17 -08:00
fd43e2c563
more theme notify fixes
2012-02-23 00:28:26 -08:00
734cdcef28
Merge branch 'master' of https://github.com/friendica/friendica
2012-02-23 09:04:00 +01:00
56f3c00eec
quattro: added styling to pivate message view
2012-02-23 09:02:40 +01:00
41636a50aa
new notify sort of working in testbubble
2012-02-22 23:34:30 -08:00
e1ecf48b8b
README file shortened because this was for my branch only.
2012-02-23 07:55:56 +01:00
9f92bbb04c
Removed the export of markdown articles. That was for testing purposes only.
2012-02-23 07:53:45 +01:00
808b886a3e
Merge branch 'master' into notify
2012-02-22 22:36:07 -08:00
3c6b127d40
nested quote check fails to account for strpos returning position 0
2012-02-22 20:58:04 -08:00
d75d49a4c1
restore poller normal operation
2012-02-22 20:31:33 -08:00
58a9c652de
Merge pull request #45 from annando/master
2012-02-22 20:21:05 -08:00
8b2189f67f
Merge branch 'pull'
2012-02-22 19:58:01 -08:00
f9eddad44f
allow forum posts by followers on Diaspora
2012-02-22 19:56:28 -08:00
e34a648cad
German translation more gender friendly. Some more logging in poller.php
2012-02-22 15:20:49 +01:00
700b8d2031
Merge pull request #44 from simonlnu/master
2012-02-22 03:59:37 -08:00
4e3506fce3
clean up Groups help file. there was a stray 'Freindika' in it
2012-02-22 06:05:48 -05:00
390eb15e7d
never enough documentation
2012-02-22 01:50:06 -08:00
a19ddb48ee
waitman gobble media upload via api patch
2012-02-21 23:35:50 -08:00
91c3349025
escape smiley conversion in code and pre blocks
2012-02-21 23:13:03 -08:00
9fe12d1724
some cleanup of tb notifications
2012-02-21 20:22:09 -08:00
53d3ee8852
new notifications
2012-02-21 19:03:55 -08:00
3f2497ad20
add full email link to notification
2012-02-21 18:10:15 -08:00
f03aaf554e
mark all notifications read
2012-02-21 16:59:57 -08:00
3e69b86bc1
Merge branch 'pull'
2012-02-21 14:32:17 -08:00
a97cb88b65
logger_debug was used as string instead of constant
2012-02-21 14:15:10 -08:00
2904a3265a
Merge pull request #43 from fabrixxm/master
2012-02-21 02:38:52 -08:00
Simon L'nu
friendica
Michael
Tobias Hößl
Tobias Diekershoff
root
Simon
Abinoam P. Marques Jr
Fabio Comuni