Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-16 08:53:54 +00:00
Code Issues Projects Releases Packages Wiki Activity
8879 commits 3 branches 64 tags 247 MiB
Commit graph

8879 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
pixelroot
8c8d3913cc modified: view/theme/smoothly/style.css 
modified:   view/theme/smoothly/theme.php
 2013-05-07 14:01:54 +02:00
pixelroot
5ac6e82e7d modified: view/theme/smoothly/default.php 
modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
 2013-05-07 09:39:14 +02:00
Zach Prezkuta
bd20f6ed9a add some styling for the video player 2013-05-03 19:09:12 -06:00
Zach Prezkuta
fec4581f34 basic video playback support using VideoJS 2013-05-03 18:17:56 -06:00
friendica
04681618da spelling 2013-05-02 22:21:06 -07:00
friendica
886c3d1472 bad checkin 2013-05-02 22:19:16 -07:00
friendica
ed5768c4a3 optimise cachefile logic - still not sure why the cachefile profiling was getting triggered on a site with no cachefile configured 2013-05-02 21:59:20 -07:00
friendica
2a3288b01e Merge https://github.com/friendica/friendica into pull 2013-05-02 21:42:54 -07:00
friendica
185d29c41e undefined element 2013-05-02 21:42:34 -07:00
friendica
cc8a4fbf16 Merge pull request #672 from cpfeiffer/email-notification-sitename-fix 
fix reading sitename config
 2013-04-29 22:41:32 -07:00
friendica
dc0376402d Merge pull request #673 from cpfeiffer/pgettext_missing_dba 
pgettext needs dba.php for q()
 2013-04-29 22:41:07 -07:00
Carsten Pfeiffer
5ee19401c4 pgettext needs dba.php for q() 2013-04-29 22:51:08 +02:00
tobiasd
b66d4b8cbd Merge pull request #670 from fabrixxm/help 
doc update
 2013-04-29 00:36:26 -07:00
friendica
c08e791e43 Merge https://github.com/friendica/friendica into pull 2013-04-28 21:03:21 -07:00
friendica
1d358fe6de system support for complete blocking 2013-04-28 21:02:53 -07:00
Tobias Diekershoff
0bbd0939e4 ZH-CN: update to the strings 2013-04-28 15:35:34 +02:00
friendica
2883c8bbc4 Merge https://github.com/friendica/friendica into pull 2013-04-28 04:31:11 -07:00
friendica
61a0f9c196 bug #540 and hush up a couple of log messages that are way too verbose 2013-04-28 04:30:20 -07:00
friendica
dd52acebba Merge pull request #671 from cpfeiffer/OAuthException 
Wrap class OAuthException with !class_exists
 2013-04-27 14:32:57 -07:00
Carsten Pfeiffer
7f6a7af2b3 fix reading sitename config 2013-04-27 21:40:40 +02:00
Carsten Pfeiffer
7e5ec9fceb Wrap class OAuthException with !class_exists 
Same problem and solution as discussed on
https://drupal.org/node/1334528
 2013-04-27 21:08:45 +02:00
Tobias Diekershoff
f84c57e7f2 DE: update to the strings 2013-04-27 10:57:06 +02:00
friendica
1ed6a2bd3d rev update 2013-04-25 02:36:52 -07:00