Michael Vogel
74b3e9f273
Enabled Caching for items. Changed color of tags in diabook.
2012-03-10 15:50:35 +01: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
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
Fabio Comuni
60e5dda1b5
template proc: first optimization
2012-03-02 12:24:35 +01:00
friendica
f1bf6dcdfb
expand multiple heart smilies e.g. <3333
2012-03-02 01:24:20 -08:00
friendica
bd2c8c92f1
yet more work on notifications
2012-02-29 19:23:01 -08:00
Tobias Hößl
ac86407fdf
Bugfix
2012-02-26 20:43:35 +00:00
friendica
390eb15e7d
never enough documentation
2012-02-22 01:50:06 -08:00
friendica
91c3349025
escape smiley conversion in code and pre blocks
2012-02-21 23:13:03 -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
03834b2433
text.php - Friendika -> Friendica (just to prepare for deprecate the friendika.png at the future)
2012-02-20 19:38:42 -03: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
4222f506a8
deprecating two-char smilies
2012-02-17 23:44:25 -08:00
friendica
7dcef67492
facepalm smiley
2012-02-16 15:15:28 -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
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
330a876d81
bug #281
2012-02-12 14:18:32 -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
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
3d099bd99a
beer
2012-02-06 01:08:00 -08:00
friendica
8ff2bb4cd3
backtrace errant input to base64url_decode
2012-01-24 16:45:58 -08:00
friendica
1f074cb44c
shaka, slackr theme
2012-01-23 15:07:40 -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
48a5a2484e
new smiley
2012-01-04 00:04:19 -08:00
Fabio Comuni
1fbffc76b1
text: "turn off" logger() if module is "install"
2012-01-02 20:11:06 +01:00
friendica
22d59350e9
improve the email regex a bit more
2011-12-16 14:31:39 -08:00
friendica
690b3f57b7
bug 241 - valid emails may contain + on lhs
2011-12-16 14:06:50 -08:00
friendica
834639ebab
\o/ smiley
2011-12-11 16:58:36 -08:00
friendica
c8d5274cee
data structures to support hidden friends
2011-12-05 02:16:59 -08:00
friendica
0f4a42f550
start on bug #227 - more to do
2011-11-25 22:41:50 -08:00
Fabio Comuni
962467ee68
item tags as array to templates
2011-11-15 17:41:38 +01:00
Friendika
bd48a016af
fix for multiple consecutive @ tags
2011-11-02 21:07:17 -07:00
Friendika
e4dd2a5a9a
begin the name change
2011-10-28 17:29:13 -07:00
Friendika
abe96155b4
hmmm - why won't poco xml work
2011-10-27 01:54:52 -07:00
Friendika
72d74b88be
some dspr fixes
2011-10-25 19:59:57 -07:00
Friendika
790c4a4e1a
tag display with item
2011-10-24 17:25:49 -07:00
Friendika
3b6b0eaa8b
social tag - add UI
2011-10-24 15:47:17 -07:00
Friendika
d1833cabf6
fix hex2bin for empty input
2011-10-20 19:11:34 -07:00
Friendika
557a7d0cec
stuff
...
- background the external network notifications (Facebook, Twitter, Statusnet)
- add vimeo support
- consolidate editor video options (insert video, regardless of source)
- add "Connector Settings" page purely for configuring connectors
- moved mailbox settings to Connectors
- Move the "Connect/Follow" dialogue out of "find people" and move to top.
- Add "Find People" dialogue
- minor theme edits on duepuntozero and testbubble to make all this stuff work
- A bit of theming on duepunto notifications to eliminate the gigantic Diaspora profile photos.
2011-10-11 18:24:37 -07:00
Friendika
7df6cb850e
Merge branch 'pull'
2011-10-05 15:37:17 -07:00
Friendika
b1e5dfad3c
clean up w3c validation and layout for priv mail and lang selector
2011-10-05 15:35:53 -07:00
Tobias Diekershoff
feaba3d300
point Diaspora* to the foundation homepage instead of joindiaspora.com
2011-10-05 21:01:48 +02:00
Friendika
924d419378
added prepare_body hooks
2011-10-05 02:35:25 -07:00
Fabio Comuni
e9638b6980
Adds theme info file to define 'parent' theme from where load tpl files
2011-09-27 09:32:20 +02:00
Fabio Comuni
5792b3d358
Merge branch 'master' into newui
2011-09-26 11:42:48 +02:00
Friendika
6a9e22550d
.
2011-09-24 05:45:34 -07:00
Friendika
542aa22eb9
provide ability to unset session language
2011-09-21 16:00:17 -07:00
Friendika
1c8e89bd03
social bookmark API, oexchange enhancements
2011-09-20 16:31:45 -07:00
Fabio Comuni
6b6f45f9f1
quattro: initial style of conversations
2011-09-16 12:51:14 +02:00
Fabio Comuni
9d2afc2d3c
Merge remote-tracking branch 'friendika/master' into newui
2011-09-16 09:39:29 +02:00
Friendika
1778e4a315
bloody ampersands
2011-09-14 20:47:49 -07:00
Friendika
ff572487a3
smilie hook
2011-09-12 03:21:39 -07:00
Friendika
ebb9af8946
One day we'll have ignored all purely numeric hashtags like #33 . Found yet another edge case.
2011-09-09 17:35:26 -07:00
Friendika
d7a2ab9c1f
send profile visits to 'redir' window
2011-09-09 16:22:32 -07:00
Fabio Comuni
0283cbfcd3
Merge remote-tracking branch 'friendika/master' into newui
2011-09-05 09:09:34 +02:00
Friendika
481853d2cc
saved searches on network page
2011-09-04 17:35:06 -07:00
Fabio Comuni
8b615133d5
remove html from profile vcard code
2011-08-31 17:31:44 +02:00
Friendika
0d9d576aa6
move encryption functions to crypto file
2011-08-20 04:53:11 -07:00
Friendika
457f8c3e95
use mb_strlen when iterating utf8
2011-08-18 19:14:13 -07:00
Friendika
b28b468b21
cleanup
2011-08-16 20:05:02 -07:00
Friendika
684ebd2ed8
enhance random_string, block public email replies
2011-08-10 21:06:35 -07:00
Friendika
06408664db
Diaspora logo
2011-08-10 05:28:39 -07:00
Friendika
1bfe1283aa
crypto stuff
2011-08-09 18:55:46 -07:00
Friendika
8812b7f4ca
item guids
2011-08-07 17:29:26 -07:00
Friendika
1eec10329a
guid functions
2011-08-07 16:56:26 -07:00
Friendika
d45a66e700
allow custom avatar sizes - needed for Diaspora hcard/vcard
2011-08-03 21:05:39 -07:00
Friendika
ad1e827169
several fixes for attachments
2011-08-03 19:18:58 -07:00
Friendika
8b31ff15f5
breaking up boot file (part of zot refactor)
2011-08-01 16:51:01 -07:00
Tobias Diekershoff