1
1
Fork 0
Commit graph

116 commits

Author SHA1 Message Date
Michael Vogel c40c61c106 OStatus conversations: Fixed a bug when a message hadn't got an id.
vier: Some more changes to make the side menu static.
In the index.php I did a small change to make friendica compatible with the android client for diaspora.
2013-03-06 23:23:04 +01:00
friendica f07df4f667 merge 2013-03-02 15:46:54 -08: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
Michael Vogel 2cb576d305 Bugfixing after adding timestamps 2013-01-27 13:57:44 +01:00
Zach Prezkuta bf26af5ac6 insidious set_config bug 2013-01-18 23:38:49 -07:00
friendica 20eb767b7e don't run two processes for every web access (noticed that dbupdate is always started as a background task under normal operation). 2013-01-18 17:37:45 -08:00
Zach Prezkuta c32f754b6e remove commented-out check_config() 2013-01-14 20:34:28 -07:00
Zach Prezkuta 6d77237f06 check plugins in separate function 2013-01-14 20:31:32 -07:00
Zach Prezkuta 31c3bbf549 add maintenance mode 2013-01-14 16:35:41 -07:00
Zach Prezkuta 3e59b0715b better location for toggle_mobile code 2013-01-03 11:16:10 -07:00
Zach Prezkuta 708e7e51db missed an explicit include 2012-12-28 16:17:33 -07:00
Zach Prezkuta e684324032 use explicit include paths 2012-12-28 14:51:50 -07:00
Zach Prezkuta 999c3439e6 fix mobile photo uploads; better theme control; frost improvements 2012-11-06 08:43:19 -07:00
friendica a02e5f692e disabling auto_redir until we prevent it from infinite looping 2012-10-15 16:28:43 -07:00
Zach Prezkuta cee50502d3 toggle mobile on all themes; Frost updates 2012-09-29 17:47:47 -06:00
Domovoy 75d355a2aa Rendering is now done by Item objects 2012-08-10 19:57:39 +02:00
Zach Prezkuta 1f09e7ad23 Modify Javascript to improve page loading times
1. Add template category 'end' that places content right before final </body> tag
	2. Move most Javascript from tpl files into one cacheable file, theme.js
	3. Load scripts at end of the HTML document instead of in the header
	4. Minify several Javascript files

Note that the second and third things were only done for Frost and Frost Mobile. Doing it for every theme means going through every .tpl for every theme and rearranging the Javascript, which is tedious.
2012-07-28 09:57:16 -06:00
friendica e9aba87d76 add plugin hooks to every module_function (allows plugins to be triggered off specific pages/urls) 2012-06-18 20:57:43 -07:00
friendica 30295926b9 make sure default timezone is set in external processes 2012-06-11 19:52:46 -07:00
friendica 3811fe288f rename get_language() to get_browser_language() 2012-05-13 04:52:29 -07:00
friendica d48cd0f9a3 hidden plugins (add .hidden file to dir) 2012-04-30 23:07:52 -07:00
friendica f4ea764aaf zrl hook 2012-04-14 04:54:26 -07:00
friendica 3380ff3240 Merge pull request #223 from campino/master
bug fix
2012-04-10 15:21:37 -07:00
Alexander Kampmann 64cf2d089a fixed install bug 2012-04-10 17:10:24 +02:00
friendica 4c3b835307 path to default.php in theme dir was incorrect 2012-04-10 01:51:53 -07:00
Alexander Kampmann 7ac4b83c39 made exceptions from the db optional
set address for updae mails correctly
2012-04-09 14:04:49 +02:00
Alexander Kampmann 0d60dbef31 added exceptions to dba class
added exception handling to index.php, please mind that there is no
recovery at the moment
added transactions to db update. Please mind that they might not be
supported by db table engines. 
added admin email on failed updates

added german translation for admin email
2012-04-09 00:45:10 +02:00
friendica 5c04469755 prepare for using a master theme_init() 2012-04-08 06:20:57 -07:00
friendica 741a5dba57 provide theme_init() functions 2012-04-08 05:52:00 -07:00
Alexander Kampmann 355c42cb30 Merge branch 'master' of https://github.com/friendica/friendica
Conflicts:
	include/config.php
	update.php
2012-04-05 13:39:15 +02:00
friendica 62e528ba43 remove zrl from query string 2012-04-02 00:45:45 -07:00
friendica 7df6ab9a87 add page_content_top hook 2012-04-01 22:22:26 -07:00
friendica e2c295c01f another silly mistake 2012-03-29 21:44:30 -07:00
friendica bb8beb26b4 use zrl to get home again 2012-03-29 20:58:32 -07:00
friendica 7ee07daf04 use theme directory for page templates, not language directory 2012-03-27 18:39:52 -07:00
Alexander Kampmann 9ba5fff865 new lines removed 2012-03-22 13:05:34 +01:00
Alexander Kampmann 43f672877f removed some new lines to cut down number of changed files 2012-03-22 13:03:28 +01:00
Alexander Kampmann ad9d0dadb3 removed unneccessary stuff 2012-03-22 12:52:24 +01:00
Alexander Kampmann 9796e99fa8 added simple build-in profiling 2012-03-15 11:45:06 +01: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 4f254ffb5b system support for personal configurable ajax update interval 2011-12-11 20:32:43 -08:00
friendica fa4742e6ee comment boxes not work in alternate languages 2011-11-17 15:42:56 -08:00
friendica 02b11c5d59 several little nits in the hcard template output which could affect parsers 2011-11-12 12:28:21 -08:00
Friendika 9ec4f6e0c9 rename 2011-11-12 04:21:14 -08:00
Friendika d0f45bf281 apps broken in all themes, apps link misplaced in testbubble 2011-09-28 04:19:42 -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 542aa22eb9 provide ability to unset session language 2011-09-21 16:00:17 -07:00
Fabio Comuni 991656a3ef Show "404.tpl" instead of using 'notice()' in case of 404 2011-09-19 11:52:32 +02:00
Fabio Comuni abd65e00ab Load infos and notices via ping and show them with js popup 2011-09-05 14:01:21 +02:00