Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-14 00:23:06 +00:00
Code Issues Projects Releases Packages Wiki Activity
1186 commits 3 branches 64 tags 246 MiB
Commit graph

1186 commits

This branch
This branch
All branches
Author SHA1 Message Date
fabrixxm
e7d87e4ab3 Merge branch 'master' of github.com:fabrixxm/friendika 2011-01-29 10:14:14 +01:00
fabrixxm
5b35ceefb9 Merge branch 'friendika-master' 2011-01-29 09:39:38 +01:00
Friendika
26cc2e02fe Merge branch 'fabrixxm-master' 
Conflicts:
	boot.php
 2011-01-28 18:50:20 -08:00
Fabio Comuni
302acda089 updated poormancron plugin 2011-01-28 14:04:40 +01:00
Fabio Comuni
ef33ca6750 modded scripts to be runned in cli so they can be included and executed in main program 2011-01-28 14:04:18 +01:00
Fabio Comuni
517d6812da cal proc_run hook before string escape 2011-01-28 14:01:50 +01:00
Fabio Comuni
bf8dadb970 Merge remote branch 'friendika-master/master' 2011-01-28 10:08:39 +01:00
fabrixxm
8257b1b684 Merge branch 'friendika-master' 2011-01-28 07:26:57 +01:00
Friendika
5d77bd9489 tag finder tweak 2011-01-27 21:24:21 -08:00
Friendika
33037754d8 removed java photo uploader from mainline. Photo uploaders are now plugins, but a single item upload is available by default. 2011-01-27 18:45:19 -08:00
Friendika
ebba294189 remote links 2011-01-27 14:34:11 -08:00
Friendika
58309829a1 Merge branch 'omigeot-master' 2011-01-27 13:10:43 -08:00
Friendika
1d9f677438 Merge branch 'master' of https://github.com/omigeot/friendika into omigeot-master 2011-01-27 13:09:58 -08:00
olivierm
bfe6380d90 More translation 2011-01-27 16:50:39 +01:00
olivierm
8c6319394c Done head.tpl 2011-01-27 16:48:54 +01:00
olivierm
e93385a355 French translation : Done strings.php, started template files. 2011-01-27 16:44:55 +01:00
Friendika
620aae5b50 still not quite ready for the big photos rollover 2011-01-27 03:55:40 -08:00
Friendika
076c25e103 Revert "Revert "roll version - now in alpha 2.1"" 
This reverts commit e8a3166fa9.
 2011-01-27 03:52:18 -08:00
Friendika
e8a3166fa9 Revert "roll version - now in alpha 2.1" 
This reverts commit df4f77dadd.
 2011-01-27 03:50:56 -08:00
Friendika
df4f77dadd roll version - now in alpha 2.1 2011-01-27 03:46:09 -08:00
fabrixxm
444d82a532 Merge branch 'friendika-master' 2011-01-27 07:14:55 +01:00
Friendika
d2dddd995a set update frequency to twice daily for 'feed' contacts, unable to set update frequency on contact edit form. 2011-01-26 20:29:32 -08:00
Friendika
b4642ca650 search icons (?) 2011-01-26 14:25:36 -08:00
Friendika
05350082fa Merge branch 'oembed' of https://github.com/fabrixxm/friendika into fabrixxm-oembed 2011-01-26 13:59:20 -08:00
Fabio Comuni
43be72297a Rewrite oembed plugin to use new bbcode tag [embed] and make discovery server-side 2011-01-26 17:17:02 +01:00
Fabio Comuni
6ca1e2ddfe remove fixed width from wall-item-content 2011-01-26 17:11:56 +01:00
Fabio Comuni
62fda0a120 oembed consumer plugin 2011-01-26 16:20:12 +01:00
Fabio Comuni
af8ab8cb53 add [img=wxh][/img] support in tinymce bbcode plugin 2011-01-26 16:19:40 +01:00
Fabio Comuni
4a2c0fcc36 Add 'jot_tool' hook, plugins can add tool icons. 2011-01-26 16:17:28 +01:00
Tobias Diekershoff
c3691b3331 Piwik plugin for Friendika 
This plugin allows you to enter the code necessary for Piwik analytics
at the bottom of every page that Friendika produces. Displaying an opt-out
link is possible (optional). For details about the configuration the the
header of the PHP file.
 2011-01-26 15:03:10 +01:00
Friendika
c7ace10ffb dissolve relationship (new protocol) working 2011-01-26 02:32:00 -08:00
Friendika
2fc89deaea work in progress js_uploader plugin, turn java uploader into plugin - not done yet 2011-01-26 00:34:39 -08:00
Friendika
abbd498a8b whitespace only 2011-01-26 00:19:54 -08:00
Friendika
696eff1031 no comment box if no notify, not no poll 2011-01-25 18:25:04 -08:00
fabrixxm
6558ee1e22 Merge branch 'friendika-master' 2011-01-25 19:03:41 +01:00
Friendika
bb5ad77e2a smilies on new item view 2011-01-25 05:26:12 -08:00
Friendika
b23de4fa90 greenzero stripped to bare essentials, imported from duepuntozero 2011-01-25 04:30:46 -08:00
Friendika
167ab039ab renamed theme - it was a bit too long 2011-01-25 04:03:47 -08:00
Friendika
e83db7876d Merge branch 'master' of https://github.com/tobiasd/friendika into tobiasd-master 2011-01-25 04:00:46 -08:00
Friendika
5a7ff660c4 "unfriend" protocol 2011-01-25 03:57:10 -08:00
Tobias Diekershoff
5eacc57800 Merge git://github.com/tobiasd/friendika 2011-01-25 12:47:02 +01:00
Tobias Diekershoff
529b036dbe some more strings translated into German 2011-01-25 12:44:14 +01:00
Fabio Comuni
1f95ba5c34 Merge remote branch 'friendika-master/master' 2011-01-25 10:16:47 +01:00
Fabio Comuni
f2789132ce fixed width on wall-item-wrapper 2011-01-25 10:16:15 +01:00
Tobias Diekershoff
ce6a2c83f9 a green variation of the duepuntozero theme 
for this variation of the theme the header image and the link colors
were set to some tone of green that fit my current likings.
 2011-01-25 09:04:08 +01:00
Tobias Diekershoff
4c717b38ae Merge branch 'master' of git://github.com/tobiasd/friendika 2011-01-25 08:54:10 +01:00
Tobias Diekershoff
bb1afd867d Merge branch 'master' of git://github.com/friendika/friendika 2011-01-25 08:53:39 +01:00
Friendika
b0ab3e468b leave room for vertical scrollbar (when needed) 2011-01-24 23:08:39 -08:00
Friendika
fc5316fe21 allow a video and/or photo to fit with scrollbars 2011-01-24 20:21:14 -08:00
Friendika
0f64e1e623 restrict post height, we may back this out later and replace with [show all] toggles 2011-01-24 20:13:52 -08:00