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
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
friendica
5921dc6f16
typo in function name
2012-03-29 16:01:44 -07:00
friendica
4e4f7ac79f
some reported warnings cleaned up
2012-03-28 20:50:09 -07:00
friendica
a946b7cea3
Merge branch 'pull'
2012-03-28 19:57:28 -07:00
friendica
7956c2d08e
improved rw notifications
2012-03-28 17:21:56 -07:00
Michael Vogel
bdd2754740
Merge commit 'upstream/master'
2012-03-28 19:52:30 +02:00
Fabio Comuni
7aec2fd68d
filer: info() on item filed
2012-03-28 10:45:16 +02:00
friendica
0aa99acd35
profile_tabs hook
2012-03-27 20:15:15 -07:00
friendica
20f9733250
don't expire filed items
2012-03-27 00:54:34 -07:00
friendica
4c585f759f
theme description with preview (non-translatable unfortunately)
2012-03-26 18:15:10 -07:00
friendica
b5d0315d55
preparation for some possibly killer features
2012-03-26 17:57:27 -07:00
friendica
b240b8489a
language issues in enotify
2012-03-26 01:43:26 -07:00
friendica
021c647673
don't include friend suggestions for people with the same name as current contacts. This will remove a lot of #whoaretonybaldwin.
2012-03-25 21:43:17 -07:00
friendica
7ef1ed2d70
theme screenshots
2012-03-25 17:55:43 -07:00
friendica
873a55e918
enotify plugin hook
2012-03-25 05:06:11 -07:00
friendica
5bb7303408
NOTIFY_SYSTEM
2012-03-25 04:37:09 -07:00
friendica
6780b76b0c
improved the inivitations and added a bit of sales pitch.
2012-03-24 23:04:18 -07:00
friendica
d06ddeb1cc
bug #346 - add oembed maxwidth to oembed request
2012-03-24 21:26:50 -07:00
friendica
3ae43c2448
prevent duplicate friend suggestions
2012-03-24 15:53:53 -07:00
friendica
3aacc119a1
block filed items from deletion
2012-03-24 04:16:27 -07:00
friendica
528d795fb6
ability to change tags in edited posts
2012-03-22 16:17:10 -07:00
friendica
ebdf0ee99e
prevent re-registrations using a deleted username - not an issue with Friendica but could create a serious privacy issue with federated platforms
2012-03-22 01:46:52 -07:00
friendica
d81256d7b0
support lowercase :-p smilie
2012-03-21 21:45:45 -07:00
Michael Vogel
792edfe9c8
New parameter in html2plain for plain text exports. More compatibility in API
2012-03-21 10:08:40 +01:00
friendica
6c7b619b34
remove stray template variable from old code
2012-03-20 23:57:33 -07:00
friendica
810e69ef0a
more friend suggestions
2012-03-20 19:06:26 -07:00
friendica
894278dbcc
change default profile photo to something more interesting than a reddish brown square
2012-03-20 15:41:06 -07:00
friendica
5a5aadb743
add IP address to failed login log message
2012-03-19 21:58:21 -07:00
friendica
f7e380cdc6
Merge pull request #152 from beardy-unixer/84f8e2eaa87c90473ce79ebcd4f76f3657258f27
...
Smiley removal
2012-03-19 15:56:16 -07:00
Thomas
84f8e2eaa8
modified: include/text.php
...
Stupid bug fixed
2012-03-19 22:32:19 +00:00
friendica
a156ce196e
Merge pull request #150 from fabrixxm/master
...
Add "logging_out" hook
2012-03-19 15:29:32 -07:00
friendica
9e133d6412
refactor openid logins/registrations
2012-03-19 15:03:09 -07:00
Thomas
e9b33a6f1f
modified: include/text.php
...
deleted: images/diaspora.png
deleted: images/smiley-bangheaddesk.gif
deleted: images/smiley-beard.png
deleted: images/smiley-shaka.gif
deleted: images/smiley-whitebeard.png
Removed selected smiley per Mike's request. Also removed deprecated smileys that were just commented out.
2012-03-19 21:59:06 +00:00
friendica
139a86dbd3
some openid fixes, use identity url from openid server and normalise it.
2012-03-19 06:48:11 -07:00
Fabio Comuni
ea4be0db89
Merge remote-tracking branch 'friendica/master'
2012-03-19 12:24:40 +01:00
friendica
2349852b4a
support "no_smilies"
2012-03-19 03:18:39 -07:00
Simon
283bc51acf
Merge pull request #149 from CatoTH/master
...
Add a missing security token [Using photos as profile photos]
2012-03-19 00:40:51 -07:00
Tobias Hößl
0341078a73
Existing photos could not be used as profile photos anymore - should be fixed now. And some extra logging in the CSRF-Protection to make debugging easier
2012-03-19 07:37:09 +00:00
friendica
cca524495c
community discovery cont., cleanup of DB debugging
2012-03-18 22:12:36 -07:00
Michael Vogel
3393d80ac1
API: added max_id
2012-03-18 19:00:24 +01:00
Michael Vogel
77e77027b4
API: Now threading seems to work
2012-03-18 18:21:51 +01:00
Michael Vogel
6f10142b2e
API: Seesmic is now working. Optimizing text export.
2012-03-18 17:52:51 +01:00
Tobias Hößl
453b5b46a3
CSRF-Protection in the group-related form (creating, renaming and dropping a group, adding/removing members from it)
2012-03-18 15:44:33 +00:00
Tobias Hößl
72894b0e91
replace split() by explode(); split is deprecated
2012-03-18 10:36:49 +00:00
friendica
67fd539f53
bug #337 , call template_unescape() only at the end of template processing
2012-03-17 18:15:36 -07:00
Michael Vogel
f5db142d93
Quotes with author are now having an "open/close" link
2012-03-17 12:15:59 +01:00
friendica
94fac6d767
queue optimisation - back off delivery attempts to once per hour after the first 12 hours.
2012-03-17 03:43:02 -07:00
Michael Vogel
8a1f175df0
New bbcode element: "spoiler". Mail: Top post quotes are now embraced in "spoiler" elements
2012-03-17 11:07:49 +01:00
friendica
e0e008fb8d
template processor broken with foreach k=>v and k is integer 0
2012-03-17 02:26:52 -07:00
friendica
949c6d47b5
add "send pm" link to photo dropdown for Diaspora contacts
2012-03-16 15:19:38 -07:00
friendica
141ae076ad
Merge branch 'pull'
2012-03-16 15:08:32 -07:00
friendica
58940175e1
wrong link in d* comment notifications
2012-03-16 15:07:45 -07:00
Simon
1246a40ec2
Merge pull request #141 from CatoTH/master
...
Private messages - tabindex
2012-03-16 10:54:20 -07:00
Tobias Hößl
75823c2353
Use tabindex to enable easy navigation in the dialog to write private mails; Recipient -> Subject -> Text field (tabindex has to be set to the IFRAME element after TinyMCE started) -> Send button
2012-03-16 17:45:07 +00:00
friendica
224dfa848b
bug #335 network search broken after new ssl policy settings
2012-03-16 05:51:04 -07:00
friendica
805087af67
whitespace
2012-03-16 05:41:29 -07:00
friendica
be1bd9ff4e
notification for disapora comments
2012-03-16 05:19:29 -07:00
friendica
41d595d5bc
Merge branch 'pull'
2012-03-15 16:39:21 -07:00
friendica
7684f63ecd
track whether contact is a community page or not
2012-03-15 16:38:26 -07:00
Michael Vogel
b5120888cf
html2bbcode: Disabled size conversion
2012-03-15 21:17:51 +01:00
Michael Vogel
9243c9fc14
Merge commit 'upstream/master'
2012-03-15 21:11:58 +01:00
friendica
110e8f2919
basic ssl_policy for important modules
2012-03-14 21:20:20 -07:00
friendica
f0a62d8908
ssl_policy stuff
2012-03-14 20:36:23 -07:00
friendica
4972d7ef6e
more work on filer, comment level and file tag removal
2012-03-13 20:46:37 -07:00
friendica
be48fff157
file as widget and basic filing implementation for duepuntozero,slackr
...
much more work needed - this is just for test/evaluation currently
2012-03-13 18:13:03 -07:00
friendica
acc4bbeb6e
Merge pull request #129 from CatoTH/master
...
CSRF-Protection and minor changes
2012-03-13 14:36:52 -07:00
friendica
5a41676465
initial tag display for categories and save-to-file - suitable for testing but needs cleanup, links to delete term, and theming.
2012-03-13 04:04:26 -07:00
Tobias Hößl
59766b944c
Some security against XSRF-attacks
2012-03-12 20:17:37 +00:00
Tobias Hößl
9574f7df03
Merge branch 'master' of git://github.com/friendica/friendica
2012-03-12 19:06:45 +00:00
Fabio Comuni
c30342e2f7
add 'loggin_out' hook
2012-03-12 15:58:59 +01:00
friendica
3bc990f718
more save to file backend
2012-03-11 21:32:11 -07:00
friendica
93058af4fc
backend for "save to file" feature
2012-03-11 20:19:56 -07:00
Michael Vogel
6e7a190e91
Mail: Subject are now with working "Re:"
2012-03-12 00:22:12 +01:00
Michael Vogel
2ed6b3531e
Removing test exports
2012-03-11 23:29:59 +01:00
Michael Vogel
d653e27e2d
Merge commit 'upstream/master'
...
Conflicts:
view/theme/diabook/wall_item.tpl
view/theme/diabook/wallwall_item.tpl
2012-03-11 20:22:28 +01:00
Michael Vogel
9ca5de8c28
Item cache now is one day.
2012-03-11 19:45:28 +01:00
Michael Vogel
9f76d96d46
Cache: item cache now has an autodelete of old files. The pages plugin now sets a link via redirection. So posting works.
2012-03-11 19:11:25 +01:00
Tobias Hößl
4df08433c6
Merge branch 'master' of git://github.com/friendica/friendica
2012-03-11 11:27:47 +00:00
friendica
5915325367
bug #328
2012-03-10 18:52:50 -08:00
Michael Vogel
670b571c8a
Caching improved.
2012-03-10 18:19:00 +01:00
Michael Vogel
74b3e9f273
Enabled Caching for items. Changed color of tags in diabook.
2012-03-10 15:50:35 +01:00
Michael Vogel
e098147c24
New config options if ostatus polling should use the priority in the contacts
2012-03-10 11:29:40 +01:00
Michael Vogel
15916a2cb7
Mail: Removing signatures, gpg, unnecessary line breaks
2012-03-10 09:52:20 +01:00
Michael Vogel
11c29e0cba
Merge commit 'upstream/master'
2012-03-09 11:41:23 +01:00
Tobias Hößl
635958e11d
Merge branch 'master' of git://github.com/friendica/friendica
2012-03-09 10:00:12 +00:00
friendica
312c175045
bug in check for private email comment to public conversation prevents authenticated visitor from seeing comments that should be allowed
2012-03-09 00:31:17 -08:00
friendica
2050f886cc
keep tony from talking to himself
2012-03-08 21:14:41 -08:00
friendica
395a9530dc
still getting parent relays on remote systems
2012-03-07 18:23:55 -08:00
friendica
dd3b3c2454
revup
2012-03-07 15:54:37 -08:00
friendica
7ad2dd6565
fix photos after permissions_sql change
2012-03-06 17:52:00 -08:00
friendica
1224e256b1
Merge branch 'pull'
2012-03-06 17:22:13 -08:00
friendica
88cd5800cf
[privacy] rework latest fix
2012-03-06 17:21:14 -08:00
Simon L'nu
415ca107fd
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
fix html reshares when editplain in use
* master:
2012-03-06 18:38:44 -05:00
Simon
1fae778421
Merge pull request #94 from beardy-unixer/master
...
Documentation changes
2012-03-06 15:24:15 -08:00
Simon
decc9e5798
Merge pull request #99 from tomtom84/master
...
fixes in theme diabook
2012-03-06 15:22:55 -08:00
tommy tomson
6a5c4bab9c
messages-menu translation, add scroll-to-top and theme-bug-report in theme
2012-03-07 00:07:27 +01:00
friendica
8fb0ea4048
bugs #312 , #313
2012-03-06 14:27:53 -08:00
Thomas
67456bad06
Fixed...merged with mainline THEN added beards.
2012-03-06 20:50:38 +00:00
Thomas
a265afe7eb
added beard smileys
2012-03-06 20:44:53 +00:00
friendica
eec4cff84b
remove "smilie" expansion for Diaspora logo
2012-03-06 04:28:45 -08:00
friendica
23718bfc25
prevent duplicate likes
2012-03-06 02:17:55 -08:00
friendica
c37ffd2999
can_write_wall documentation
2012-03-05 15:04:43 -08:00
friendica
fba089012a
correct owner info from misconfigured installs, duepuntozero title block misplaced in editplain mode
2012-03-04 18:50:32 -08:00
friendica
4134fd3dce
unused replacement variable displays %1 in all html2bbcode 'code' blocks
2012-03-04 16:26:16 -08:00
Fabio Comuni
685686b3e8
template proc: fix variables regexp
2012-03-03 00:00:38 +01:00
Fabio Comuni
aef737f376
template proc: allow isolation of var name between [ and ]
...
$var.name -> $[var.name]
2012-03-02 15:53:48 +01:00
Fabio Comuni
0bf087c895
template proc: remove unused function and commented out code
2012-03-02 12:36:22 +01:00
Fabio Comuni
60e5dda1b5
template proc: first optimization
2012-03-02 12:24:35 +01:00
Michael
52ea842e87
html2bbcode: don't convert sizes and fonts.
2012-03-02 10:33:39 +01:00
friendica
f1bf6dcdfb
expand multiple heart smilies e.g. <3333
2012-03-02 01:24:20 -08:00
fabrixxm
3a609adfb7
Merge pull request #55 from fabrixxm/master
...
Some minor and one majior mod in templates
2012-03-02 00:00:03 -08:00
friendica
8207272fbc
Merge branch 'pull'
2012-03-01 18:54:50 -08:00
friendica
58e3372b23
probe for very old (0.97 or 1.0) RSS feed with an incorrect or generic content-type
2012-03-01 18:49:23 -08:00
Alexander Kampmann
dd9432903d
Merge remote-tracking branch 'upstream/master'
2012-03-01 11:49:22 +01:00
Fabio Comuni
b6b7742579
Merge remote-tracking branch 'friendica/master' into randomerror
2012-03-01 11:47:45 +01:00
Fabio Comuni
ed42fa7d59
conversation: remove templating items in code and move it to template.
2012-03-01 11:46:08 +01:00
Alexander Kampmann
e0c659b34b
Enabled automated doc building. Changes:
...
-build.xml, phing build file
-@package tags at acl_selector.php and db_update.php
-added documentation and some IDE files to .gitignore
-automated tool to find files that corrupt the doc build process
-removed ansi characters from SSH1.php, docBlox could not handle them
2012-03-01 11:44:33 +01:00
Fabio Comuni
c462ed9fc5
template proc: avoid a notice and allow template name to include to be passed with a variable value
2012-03-01 11:32:49 +01:00
friendica
bd2c8c92f1
yet more work on notifications
2012-02-29 19:23:01 -08:00
friendica
bbebb4c2a0
notification enhancements
2012-02-29 18:19:08 -08:00
friendica
21803e0cd3
call time pass by reference deprecated
2012-02-28 14:54:17 -08:00
friendica
4dd4a22582
From Tobias H - catch some irregularities caused by cut/paste code
2012-02-28 14:52:23 -08:00
Tobias Hößl
5bb8ed4b8b
Mostly some checks in order to avoid Notices; 1 real bugfix in /mod/network.php
2012-02-28 21:56:42 +00:00
Tobias Hößl
3d249f0edd
Merge remote branch 'upstream/master'
2012-02-28 21:19:02 +00:00
Tobias Hößl
1204210c69
wasn't actually changed before
2012-02-28 13:01:58 +00:00
Tobias Hößl
e55d13c2b4
Avoid a notice
2012-02-28 12:56:16 +00:00
friendica
6c0fa7a166
Merge branch 'pull'
2012-02-27 17:18:53 -08:00
friendica
d7407f8daa
cleanup notify subject lines
2012-02-27 17:18:19 -08:00
Tobias Hößl
e33c2b8f89
Avoid a Notice
2012-02-27 22:08:00 +00:00
Tobias Hößl
35128ef2c9
Avoid a Notice
2012-02-27 22:01:17 +00:00
Fabio Comuni
42d591d257
revert 01a2791e3a to avoid random preg internal errors. fix contact_template
2012-02-27 18:48:59 +01:00
friendica
153e7beb19
add plugin hooks to enotify
2012-02-26 23:54:04 -08:00
friendica
a1861d1128
tagging missing from wallwall and a couple of themes, star missing from dispy
2012-02-26 16:29:06 -08:00
friendica
89560edde2
Merge pull request #50 from annando/master
...
massive changes in mail and design updates in "vier"
2012-02-26 15:07:34 -08:00
friendica
6ddd444afd
Merge pull request #49 from CatoTH/master
...
Bugfix for del_config
2012-02-26 14:49:56 -08:00
Michael
fe3dfbee56
Mail: New options for actions after importing mails.
2012-02-26 23:39:29 +01:00
friendica
bdb14d5aad
relative link redirects
2012-02-26 14:34:01 -08:00
Michael
437e18d7a7
Merge remote branch 'upstream/master'
2012-02-26 21:47:47 +01:00
Tobias Hößl
4b1de0f538
Avoid some notices
2012-02-26 20:43:51 +00:00
Tobias Hößl
ac86407fdf
Bugfix
2012-02-26 20:43:35 +00:00
Tobias Hößl
cbc6ca642a
1 Bugfix (missing $ character) and avoid some notices
2012-02-26 20:41:41 +00:00
root
aa92901b11
Wrong variable name
2012-02-26 14:29:17 +00:00
friendica
5f7858a688
show experimental and unsupported theme status on theme admin page
2012-02-26 04:17:02 -08:00
Abinoam P. Marques Jr
f3a225437b
Comment notifications by e-mail now are threaded
2012-02-25 16:59:44 -08:00
Abinoam P. Marques Jr
bcfac6c72f
include/items.php pass 'parent' to notification
2012-02-25 16:59:44 -08:00
friendica
2c7da5d0de
scale external images
2012-02-25 14:22:51 -08:00
Michael
1cf1870512
poller.php: Test for moving to archive, vier-style: notifications fixed
2012-02-25 19:40:05 +01:00
Michael
dccefb3c36
"vier": The contacts are now working again. Line break before closing bbcodes removed.
2012-02-25 11:00:35 +01:00
friendica
18bf5d1402
theme info (like plugin info)
2012-02-25 00:30:14 -08:00
friendica
9441ff5142
string update for 2.38
2012-02-24 22:47:43 -08:00
friendica
a3cf563b68
update author name across items if changed.
2012-02-24 20:40:09 -08:00
friendica
f5c5da742d
attribution issue - don't take author name from contact if available from item.
2012-02-24 20:03:13 -08:00
Michael
01301a6169
Bug fixed where mails where nearly empty. HTML mails can now be received.
2012-02-25 02:37:39 +01:00
Michael
a74b0746b1
multipart messages complete, message-id conversion done.
2012-02-25 01:10:45 +01:00
Michael
0ba45eb745
Sending mail as multipart/alternative (html and plain text) (very basic by now)
2012-02-24 08:50:42 +01:00
Michael
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
Michael
484a442f2b
GIT problems ...
2012-02-23 20:59:34 +01:00
Michael
0409b5cdba
Merge remote branch 'upstream/master'
...
Conflicts:
include/bbcode.php
2012-02-23 20:53:22 +01:00
Michael
311e35731c
bbcode.php: A list or quote at the beginning wasn't detected
2012-02-23 20:51:44 +01:00
85d09f48d0
fix img tag with size attribute
2012-02-23 11:12:36 +01:00
friendica
d9e9fd0359
Merge branch 'master' into notify
2012-02-23 00:30:17 -08:00
friendica
fd43e2c563
more theme notify fixes
2012-02-23 00:28:26 -08:00
friendica
41636a50aa
new notify sort of working in testbubble
2012-02-22 23:34:30 -08:00
Michael Vogel
9f92bbb04c
Removed the export of markdown articles. That was for testing purposes only.
2012-02-23 07:53:45 +01:00
friendica
808b886a3e
Merge branch 'master' into notify
2012-02-22 22:36:07 -08:00
friendica
3c6b127d40
nested quote check fails to account for strpos returning position 0
2012-02-22 20:58:04 -08:00
friendica
d75d49a4c1
restore poller normal operation
2012-02-22 20:31:33 -08:00
friendica
58a9c652de
Merge pull request #45 from annando/master
...
New HTML to BBCode converter, changes to BBCode, nginx support, ...
2012-02-22 20:21:05 -08:00
friendica
f9eddad44f
allow forum posts by followers on Diaspora
2012-02-22 19:56:28 -08:00
Michael
e34a648cad
German translation more gender friendly. Some more logging in poller.php
2012-02-22 15:20:49 +01:00
friendica
390eb15e7d
never enough documentation
2012-02-22 01:50:06 -08:00
friendica
a19ddb48ee
waitman gobble media upload via api patch
2012-02-21 23:35:50 -08:00
friendica
91c3349025
escape smiley conversion in code and pre blocks
2012-02-21 23:13:03 -08:00
friendica
3f2497ad20
add full email link to notification
2012-02-21 18:10:15 -08:00
friendica
f03aaf554e
mark all notifications read
2012-02-21 16:59:57 -08:00
Fabio Comuni
01a2791e3a
template: add support for variable filters
2012-02-21 11:25:22 +01:00
friendica
5910fbf420
fill in notify msg with redirect link after we get the id
2012-02-21 00:02:42 -08:00
friendica
32d9008dd4
more cleanup of community followup detection. Remote worked well but local didn't.
2012-02-20 21:07:40 -08:00
friendica
b821399f00
email notify now redirected through mod_notify, weirdness in local deliver caused by community page changes
2012-02-20 19:50:05 -08:00
friendica
6edd6d8ae1
Merge branch 'pull'
2012-02-20 18:07:16 -08:00
friendica
11871195be
fix twitter title showing up occasionally
2012-02-20 18:06:43 -08:00
Abinoam P. Marques Jr
3ef6344d41
include/nav.php - Friendika -> Friendica
2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr
fed6330ea6
include/api.php - Friendika -> Friendica
2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr
19fea9c2ce
poller.php - Friendika -> Friendica
2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr
7ed1e3f177
acl_selectors.php - Friendika -> Friendica
2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr
03834b2433
text.php - Friendika -> Friendica (just to prepare for deprecate the friendika.png at the future)
2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr
0bca36109a
Scrape.php - Friendika -> Friendica
2012-02-20 19:38:42 -03:00
Michael
e2f276881e
Some testing stuff
2012-02-20 11:15:22 +01:00
friendica
15e9933ddf
include item links in web notification messages
2012-02-19 20:27:32 -08:00
Michael
0fb22e1284
API is now working on my nginx server.
2012-02-20 01:53:22 +01:00
root
b6d7777226
New version of markdown. Playing with stylesheet. Testing line breaks.
2012-02-19 22:47:32 +01:00
Michael
064c843119
Handling nested bbcodes. Some small design changes in html2bbcode. Change in poller.php is just for testing purposes.
2012-02-19 21:07:45 +01:00
Michael
31653aef64
Brand new html2bbcode. Some other changes in diaspora to bbcode handling
2012-02-19 20:36:59 +01:00
Simon L'nu
49179f9033
add :headdesk and fix doc/Pages.md to remove the absolute URL to /
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-02-19 05:17:26 -05:00
friendica
5734d5f357
change notify messages for web
2012-02-18 03:18:20 -08:00
friendica
1b9c03f6fc
new notifications - implement storage
2012-02-18 02:57:42 -08:00
friendica
4222f506a8
deprecating two-char smilies
2012-02-17 23:44:25 -08:00
Fabio Comuni
7bd43613fa
oembed: revert changes from 48f5bd492d
2012-02-17 15:34:05 +01:00
friendica
48f5bd492d
naked link with no protocol being passed from Diaspora
2012-02-16 23:14:36 -08:00
friendica
2abbd81ce1
a few fixes for offsite community members
2012-02-16 18:29:09 -08:00
friendica
7dcef67492
facepalm smiley
2012-02-16 15:15:28 -08:00
friendica
1b445d511b
another sql typo
2012-02-16 00:08:38 -08:00
friendica
ada2a555dc
sql typo in auto-friend with D*
2012-02-15 23:58:28 -08:00
friendica
b1d31aca51
quick comments
2012-02-15 18:13:41 -08:00
friendica
d054426101
encode email headers on message deliveries
2012-02-15 15:28:32 -08:00
fabrixxm
16f00cb73b
Merge pull request #36 from fabrixxm/master
...
Missing icons in 'quattro' and ajax events calendar
2012-02-15 03:51:44 -08:00
Fabio Comuni
fe3e8ee854
quattro: icons for attachments
2012-02-15 11:10:02 +01:00
friendica
03171fd7de
preliminary qcomment support, [nosmile] tag to disable smiley processing
2012-02-14 23:13:18 -08:00
friendica
f865939653
localise links to private photos inside messages
2012-02-14 18:07:13 -08:00
friendica
134fdda75f
refactor smilie code to allow for extensions and generation of a table of the entire list
2012-02-14 15:31:08 -08:00
Vasudev Kamath
e4b1c07727
cry, foot in mouth, cool, undecided and embarassed smiley's are mapped
2012-02-14 23:10:11 +05:30
friendica
803a7425ea
make hr bbtag shareable, stray quote in duepuntozero wall_item
2012-02-13 18:40:28 -08:00
friendica
23f5abfa1f
Merge branch 'pull'
2012-02-13 14:17:20 -08:00
friendica
dc4420c5ec
hr bbcode tag
2012-02-13 14:16:51 -08:00
Fabio Comuni
850560519a
Merge remote-tracking branch 'friendica/master' into mobile
2012-02-13 09:46:42 +01:00
friendica
85c831bcbf
finish translation of 'xxxxx wrote:'
2012-02-12 20:56:44 -08:00
Abinoam P. Marques Jr
9697e82331
Merge branch 'master' into bbcode
2012-02-12 18:56:53 -08:00
Abinoam P. Marques Jr
135005571f
Added [th] bbcode tag support.
2012-02-12 17:27:08 -08:00
friendica
3e85c1d330
make 'x minutes ago' fully translateable with argument ordering. string update.
2012-02-12 17:15:09 -08:00
Abinoam P. Marques Jr
e575a3a02c
Fixed bbcode [li] and [*] handling.
2012-02-12 17:10:06 -08:00
Abinoam P. Marques Jr
10e66d293d
Added [quote=Name] bbcode support.
2012-02-12 16:18:58 -08:00
Abinoam P. Marques Jr
3a07973ffa
Added [center] bbcode support.
2012-02-12 15:51:17 -08:00
Abinoam P. Marques Jr
74b529bda2
BBCode [size=50] --> font-size: 50px (with the unit px).
...
This [size=number] without unit is kind of a standard.
It was being rendered like "font-size: 50" and that's not valid CSS style.
2012-02-12 14:59:07 -08:00
Abinoam P. Marques Jr
92a585ed23
Added support to [noparse], [nobb] and [pre] as bbcode escape tags.
2012-02-12 14:35:29 -08:00
friendica
330a876d81
bug #281
2012-02-12 14:18:32 -08:00
Abinoam P. Marques Jr
6a17a3a8e2
Added support for [ol] standard ordered list bbcode.
2012-02-12 12:00:23 -08:00
Abinoam P. Marques Jr
5479142efc
Added support for [ul] standard unordered list bbcode.
2012-02-12 11:59:51 -08:00
Abinoam P. Marques Jr
5107ee52d3
Regexp fix for [LIST=i], [list=i], [LIST=I] and [LIST=i] bbcodes
2012-02-12 06:13:49 -08:00
Vasudev Kamath
495d0fb80f
Merge branch 'master' of git://github.com/friendica/friendica
2012-02-12 15:06:41 +05:30
Vasudev Kamath
cbf53beec1
;) :D and :-O are also enabled for wink laugh and surprised smiley's
2012-02-12 15:06:12 +05:30
friendica
8b101c6cb8
do not display contact_block if config for num shown is 0
2012-02-11 23:49:05 -08:00
friendica
bb19c8ba4e
kissing smilie may need escaping (thanks - Abinoam)
2012-02-11 21:46:48 -08:00
friendica
75a62db9c5
show tags (pub_keywords) in advanced profile
2012-02-11 01:24:29 -08:00
friendica
d79c3351ea
db installation sync
2012-02-10 13:43:35 -08:00
Fabio Comuni
ed38808aae
hidden jot in "display" to allow reshare
2012-02-10 17:30:22 +01:00
friendica
b346f4464c
send notify emails to community pages as well as people
2012-02-10 00:08:23 -08:00
friendica
2f2e331c33
bug #274
2012-02-09 22:44:59 -08:00
friendica
ffe7d8b1e9
item tag notifications
2012-02-09 21:18:50 -08:00
friendica
5859f9dcf6
add render_location hook to both sets of conversations
2012-02-09 18:09:28 -08:00
friendica
7b0a005441
edit post not working after plaintext editor fixes, missing some recent editor template changes
2012-02-09 15:58:26 -08:00
friendica
ec26f88be9
render_location hook
2012-02-09 15:02:59 -08:00
friendica
171249966e
add tag notifications to enotify
2012-02-09 14:06:17 -08:00
friendica
c506bb42a9
:coffee extended smilie
2012-02-07 17:03:09 -08:00
friendica
8a3c1f7930
beer smilie
2012-02-07 15:41:06 -08:00
friendica
a869bd2fe5
don't link tags enclosed inside Diaspora links
2012-02-07 02:16:28 -08:00
friendica
2b77002471
basic support for plaintext editor configuration (disable tinymce), currently only zero themes - and not all the post tools currently work (as some of them emit html).
2012-02-06 20:28:50 -08:00
friendica
3d099bd99a
beer
2012-02-06 01:08:00 -08:00
friendica
4cf6bd5469
do an optimise after an expunge
2012-02-02 18:02:08 -08:00
friendica
9fc36d3da4
improvements in d* markdown conversion
2012-02-01 17:09:53 -08:00
friendica
86c0eac27d
transport for email contacts phase II
2012-01-31 20:03:46 -08:00
friendica
4993f4f1d6
allow plugin to abort message posting, fix half-duplex D* relationship
2012-01-30 20:49:54 -08:00
friendica
c76b224d8a
prune old expired and deleted items
2012-01-30 15:13:24 -08:00
friendica
d54042dd38
mime_content_type requires access to the file, not just the name
2012-01-28 12:09:17 -08:00
friendica
5161be67e9
logging of manage identities
2012-01-27 12:56:36 -08:00
friendica
94b9e9ce6d
for people whose DB's are not updating
2012-01-26 23:08:51 -08:00
friendica
3197a6e8aa
fix some changes lost from another branch
2012-01-26 23:03:27 -08:00
friendica
8fe5168259
restore diaspora test mode
2012-01-26 20:46:42 -08:00
friendica
167ab537b5
backend for delegating forums
2012-01-26 16:52:12 -08:00
friendica
10f768630b
D* event formatting
2012-01-25 15:16:43 -08:00
friendica
e2d0eb4a88
redirect to a useful location after deleting or ignoring a friend request, begin comment moderation logic
2012-01-24 18:59:55 -08:00
friendica
dae0c1ded2
more robust cache api handling (was throwing errors on occasion)
2012-01-24 17:04:49 -08:00
friendica
8ff2bb4cd3
backtrace errant input to base64url_decode
2012-01-24 16:45:58 -08:00
friendica
3a1a4d62d9
bug #254
2012-01-24 16:23:30 -08:00
friendica
a76a497d92
implement "moderate" flag on items
2012-01-23 20:56:11 -08:00
friendica
1f074cb44c
shaka, slackr theme
2012-01-23 15:07:40 -08:00
Fabio Comuni
9047840ec2
nav: fix "See all notifications"
2012-01-23 09:23:37 +01:00
friendica
11aa83742e
more logging of D* photo transactions
2012-01-22 15:25:29 -08:00
Fabio Comuni
30fcda7576
nav: fix intro notification url, fix "See all notifications" url and make it translatable
2012-01-22 19:27:56 +01:00
friendica
b5ec475906
bug #253 use MSQLI_ASSOC, not MYSQL_ASSOC
2012-01-21 14:07:28 -08: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
friendica
d840943621
use reltoabs - primarily for github activity feeds
2012-01-17 16:30:32 -08:00
friendica
e12341b716
api post broken with recent change to use REQUEST vars in mod_item
2012-01-15 13:57:00 -08:00
friendica
4b6990e1ff
modularise successful authentication
2012-01-12 15:46:39 -08:00
friendica
aa1c28cf39
fine tuning diaspora markdown to bbcode
2012-01-11 22:49:17 -08:00
friendica
6573c94d6c
modified item_photo_menu hook
2012-01-11 17:34:02 -08:00
friendica
c5f41d8b6c
fix D* links+text smushed together
2012-01-11 14:03:27 -08:00
friendica
cf7008e575
post preview to loozah
2012-01-10 17:47:11 -08:00
friendica
7011f71e8f
post preview
2012-01-09 20:03:00 -08:00
friendica
a13156c0f3
bypass D* markdown bug for now
2012-01-09 18:52:49 -08:00
friendica
3bdcb52471
markdown bug is Diaspora's. We can't fix it.
2012-01-08 17:20:03 -08:00
friendica
df0f7ef560
make network_to_name extensible
2012-01-08 02:08:20 -08:00
