Commit graph

1287 commits

Author SHA1 Message Date
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 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
friendica 2c8d33a6e2 rev update 2013-05-09 01:15:22 -07:00
Zach Prezkuta fec4581f34 basic video playback support using VideoJS 2013-05-03 18:17:56 -06: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 185d29c41e undefined element 2013-05-02 21:42:34 -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 1ed6a2bd3d rev update 2013-04-25 02:36:52 -07:00
friendica f090564f0f Merge https://github.com/friendica/friendica into pull 2013-04-23 18:51:50 -07:00
friendica f4b3cf980d rev update 2013-04-23 18:51:35 -07:00
Fabrixxm d36292c532 template: set smarty3 as default template engine in theme info array.
remove commented code from get_markup_template.
add check for $root/$filename in get_template_file.
2013-04-23 03:35:31 -04:00
Fabrixxm ddf1caf0fd template engine rework
- use smarty3 as default engine
- new pluggable template engine system
2013-04-23 03:27:52 -04:00
friendica bc68892cf9 rev update 2013-04-21 16:07:02 -07:00
friendica a13e7b8a38 rev update 2013-04-19 04:51:43 -07:00
friendica 9660117c70 sync username when changed in either the default profile or the settings page 2013-04-04 15:10:14 -07:00
friendica 8b51ffefc0 Merge https://github.com/friendica/friendica into pull 2013-04-03 16:29:13 -07:00
friendica db0bb50e37 rev update 2013-04-03 16:28:49 -07:00
Matthew Exon 5b158dbcfb Make the content type available after calling fetch_url 2013-04-01 12:36:43 +08:00
friendica 17cb682ed0 rm addon.old 2013-03-19 03:30:50 -07:00
friendica 1ff37ca4c1 double encode any text that is destined for meta fields. 2013-03-18 16:40:33 -07:00
friendica 59c03edbc9 fix util/config 2013-03-02 15:44:00 -08:00
friendica 5205a374ee block injection vector 2013-02-26 17:33:18 -08:00
friendica 6e21534f23 Merge https://github.com/friendica/friendica into pull 2013-02-22 17:12:14 -08:00
friendica c8717ede42 rev update 2013-02-22 17:12:03 -08:00
zottel a17dd541ee reorder the update of the item table as instructed by Michael Vogel 2013-02-22 13:26:11 +01:00
friendica 280b72b9e6 Merge https://github.com/friendica/friendica into pull 2013-02-21 16:43:01 -08:00
friendica 615b060352 rev update 2013-02-21 16:42:34 -08:00
Michael Vogel 0d4d15c73d Merge remote-tracking branch 'upstream/master'
Conflicts:
	mod/admin.php
2013-02-20 21:57:26 +01:00
friendica d653bc4dbd rev update 2013-02-17 17:23:19 -08:00
Michael Vogel 7e154d5e4c plugin: orphaned hooks weren't deleted.
update: fixing update job for tags.
2013-02-17 18:05:30 +01:00
Michael Vogel 93143702ed Merge remote-tracking branch 'upstream/master'
Conflicts:
	boot.php
	database.sql
	library/fancybox/jquery.fancybox-1.3.4.css
	mod/search.php
	update.php
2013-02-17 12:35:40 +01:00
Fabrixxm f1a0aeb480 Merge remote branch 'friendica/master' 2013-02-15 03:17:59 -05:00
friendica 6242f9a147 add .gif to fix_private_photos checking, try another tactic to reduce notification duplication - check for duplicates after storage rather than before. This tactic worked out well to reduce item duplication. 2013-02-07 23:43:55 -08:00
friendica b6008130c4 Merge pull request #600 from fermionic/20130204-message-button-on-own-profile
don't show Message button to user on own profile page
2013-02-05 17:22:25 -08:00
friendica 9bf8364506 rev update 2013-02-05 15:09:28 -08:00
Zach Prezkuta d5af6ebfc1 don't show Message button to user on own profile page 2013-02-04 20:14:50 -07:00
friendica de0098a6b4 rev update 2013-01-29 18:35:25 -08:00
Fabrixxm 5f80467a8f Merge remote branch 'friendica/master' 2013-01-29 05:57:53 -05:00
friendica ccb465eccd Merge pull request #594 from fermionic/20130127-add-event-id-index
add event-id index to prevent large CPU loads when visiting the events page
2013-01-27 19:11:58 -08:00
friendica a5ac69c65e Merge pull request #591 from fermionic/20130126-javascript-free-theme
Decaf mobile: an (almost) Javascript-free theme
2013-01-27 19:11:36 -08:00
Zach Prezkuta 3f77eb80fe add event-id index to prevent large CPU loads when visiting the events page 2013-01-27 17:52:44 -07:00
Michael Vogel bc972e16ce New function to complete threads from ostatus postings 2013-01-27 23:25:04 +01:00
friendica ce8f31504e rev update 2013-01-27 13:13:08 -08:00
Michael Vogel 2cb576d305 Bugfixing after adding timestamps 2013-01-27 13:57:44 +01:00
Zach Prezkuta 488a38cd85 Decaf mobile: an (almost) Javascript-free theme 2013-01-26 13:01:57 -07:00
Michael Vogel fdee002f73 Several improvements for performance measuring 2013-01-26 18:35:39 +01:00
Michael - piratica.eu 2c93067682 Performance: Adding several variables for performance measuring. 2013-01-26 16:46:43 +01:00
friendica 04b48688b6 add form security to invite page and set maximum per user invites 2013-01-25 13:48:57 -08:00