clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
8,052 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

8052 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
friendica 8fe82d35d4 Merge https://github.com/friendica/friendica into pull 2013-05-28 04:53:27 -07:00
friendica b60e42d2fa provide bbcode translation for imported red zmg tag (img tag with zot-id) 2013-05-28 04:52:22 -07:00
tobiasd f8d433685c Merge pull request #684 from tobiasd/rhash 
Rhash
 2013-05-26 23:37:20 -07:00
Tobias Diekershoff 2b09b8ae17 make red# available as a smilie 2013-05-27 08:34:12 +02:00
Tobias Diekershoff 53342dd7f9 red hash icon 16px imported from red 2013-05-27 08:32:55 +02:00
Tobias Diekershoff ca623641ca CS: update to the strings 2013-05-25 07:29:24 +02:00
friendica ec14d06647 Merge https://github.com/friendica/friendica into pull 2013-05-22 22:32:18 -07:00
friendica 0cc641fbbc messaging 2013-05-22 22:30:53 -07:00
Tobias Diekershoff 1732de5c64 PL: update to the strings 2013-05-23 06:30:34 +02:00
friendica 814ab32334 Update README 2013-05-23 10:10:49 +10:00
friendica ed6ca1d384 rev update 2013-05-21 22:37:51 -07:00
friendica 3381afab3d Merge https://github.com/friendica/friendica into pull 2013-05-20 17:37:23 -07:00
friendica a1c4d0ca93 fix include paths when started via cmdline 2013-05-20 17:36:29 -07:00
friendica c5ed831b6a Merge pull request #681 from annando/master 
Remove hashtag links when exporting to other networks
 2013-05-19 02:59:21 -07:00
Michael Vogel 0723933c1c removing of hashtag addresses is now hidden behind a configuration 2013-05-19 11:08:08 +02:00
friendica 024fe68d71 Merge https://github.com/friendica/friendica into pull 2013-05-18 16:03:35 -07:00
friendica 6ec1bd2fa8 double quotes in title mess up editpost 2013-05-18 16:02:31 -07:00
Michael Vogel 5ef6bdf88a Merge remote-tracking branch 'upstream/master' 2013-05-18 20:52:08 +02:00
friendica ba6faa91e2 Merge pull request #680 from fuzzgun/master 
Missing smarty3 directory prevents installation
 2013-05-18 05:33:06 -07:00
root 8e9852dcba Missing smarty3 directory prevents installation 2013-05-18 11:10:22 +01:00
Michael Vogel 03c489150c Merge remote-tracking branch 'upstream/master' 2013-05-17 08:08:34 +02:00
Tobias Diekershoff f840d72885 DE: update to the strings 2013-05-17 06:42:28 +02:00
Tobias Diekershoff 4d105f06e8 CA: update to the strings 2013-05-16 06:42:13 +02:00
Michael Vogel d4240a265b When converting to HTML, hashtag addresses are now removed (only when the message is exported) 2013-05-15 22:20:06 +02:00
Tobias Diekershoff 636fef1ffa DE: update to the strings 2013-05-14 19:17:44 +02:00
friendica 0ce68665c6 check_config is gone - use check_db 2013-05-13 17:22:07 -07:00
friendica aee7429967 Merge https://github.com/friendica/friendica into pull 2013-05-11 17:04:51 -07:00
friendica e8fc26e74e rev update 2013-05-11 17:04:23 -07:00
fermionic b4bedbd082 Merge pull request #679 from fermionic/20130511-update-videojs 
fix preloading
 2013-05-11 11:41:57 -07:00
Zach Prezkuta db0a891a97 fix preloading 2013-05-11 12:40:09 -06:00
fermionic d34445a0ea Merge pull request #678 from fermionic/20130511-update-videojs 
update to v4.0.0; point to local host of SWF
 2013-05-11 09:57:41 -07:00
Zach Prezkuta 35358baac9 update to v4.0.0; point to local host of SWF 2013-05-11 10:55:09 -06:00
fermionic 3ce41a78b4 Merge pull request #676 from fermionic/20130511-loading-home-page-for-image 
don't set img src in notifications to blank
 2013-05-11 09:04:45 -07:00
Zach Prezkuta 5d30008ab3 don't set img src in notifications to blank 2013-05-11 09:43:21 -06:00
fermionic 3a13aba62e Merge pull request #674 from fermionic/20130503-basic-video-support 
basic video playback support using VideoJS
 2013-05-11 08:33:36 -07:00
Tobias Diekershoff 06ab3eb44f DE: update to the strings 2013-05-09 19:07:20 +02:00
Tobias Diekershoff 218be8a3c0 DE: Update to the strings 2013-05-09 18:40:11 +02:00
Tobias Diekershoff ba6b2718cf DE: update to the strings 2013-05-09 18:38:57 +02:00
friendica ef4ebd8546 remove stub code 2013-05-09 01:17:11 -07:00
friendica 3339f55310 Merge https://github.com/friendica/friendica into pull 2013-05-09 01:15:40 -07:00
friendica 2c8d33a6e2 rev update 2013-05-09 01:15:22 -07:00
pixelroot b06dab97ba modified: view/theme/smoothly/default.php 
modified:   view/theme/smoothly/style.css
	new file:   view/theme/smoothly/templates/tools.tpl
	modified:   view/theme/smoothly/theme.php
 2013-05-08 14:46:42 +02:00
pixelroot a2102e1ca0 Merge remote branch 'upstream/master' 2013-05-08 11:09:39 +02:00
pixelroot e90c89f3fc new file: view/theme/smoothly/images/power.png 
new file:   view/theme/smoothly/images/up.png
 2013-05-08 11:09:08 +02:00
pixelroot 523548ff22 modified: view/theme/smoothly/default.php 
modified:   view/theme/smoothly/images/down.png
	modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
	view/theme/smoothly/images/power.png
	view/theme/smoothly/images/up.png
 2013-05-08 11:08:21 +02:00
fabrixxm 2da4f8268e fix smarty3 folder not writable message 2013-05-08 11:34:30 +03:00
fabrixxm 1e3455d71a Merge pull request #675 from fabrixxm/templateengine 
check if view/smarty3 folder is writable by webserver
 2013-05-08 00:29:02 -07:00
Fabrixxm 4bf41b8e5d check if view/smarty3 folder is writable by webserver 2013-05-08 03:26:20 -04:00
Zach Prezkuta bc57d7f64e bug in main.js for VideoJS on initial page load 2013-05-07 22:06:40 -06:00
pixelroot 258604f036 modified: view/theme/smoothly/css/typography.css 2013-05-07 14:30:04 +02:00