Commit graph

1061 commits

Author SHA1 Message Date
Domovoy
66848b0471 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
Conflicts:
	update.php
2012-08-03 18:57:37 +02:00
friendica
864b5fc256 rev update 2012-08-02 14:15:56 -07:00
friendica
4cbde6a75d rev update 2012-08-02 01:23:16 -07:00
friendica
49ad9b355c rev update 2012-07-31 18:01:55 -07:00
friendica
27ee8620f9 rev update 2012-07-30 14:14:20 -07:00
Domovoy
07f87848b4 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-07-30 13:36:33 +02:00
friendica
299f9e3d9e rev update 2012-07-29 15:32:26 -07:00
Domovoy
283e91cd6a Update the thr-parent field in the item table 2012-07-29 21:01:04 +02:00
friendica
5e64bccd5c don't show birthday/event details on mobile devices 2012-07-28 17:48:33 -07:00
friendica
fe19890c3c Merge https://github.com/friendica/friendica into pull 2012-07-28 16:13:25 -07:00
friendica
61115d7a07 rev update 2012-07-28 16:12:12 -07: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
50e20a1494 rev update 2012-07-27 17:52:43 -07:00
friendica
b9f13400d9 rev update 2012-07-25 15:52:26 -07:00
friendica
00043f3f1e Merge https://github.com/friendica/friendica into pull 2012-07-24 17:25:36 -07:00
friendica
f48e491ba0 rev update 2012-07-24 17:24:53 -07:00
Zach Prezkuta
657347254f use regular theme choosing logic if no mobile theme is specified 2012-07-24 18:13:19 -06:00
friendica
aa5e60248a Merge pull request #405 from fermionic/support-for-mobile-themes
changes to support a mobile theme
2012-07-23 20:18:23 -07:00
Zach Prezkuta
5cb979f5e4 changes to support a mobile theme 2012-07-23 20:37:00 -06:00
friendica
dbdcbaa7ef Merge https://github.com/friendica/friendica into pull 2012-07-23 16:51:02 -07:00
Domovoy
c052c6afca Database can now be automatically updated 2012-07-24 01:21:02 +02:00
friendica
0d631cc08c hopefully better update handling - never update the current DB version or continue with other updates if there was a failure of any individual update. 2012-07-23 15:57:40 -07:00
friendica
b20a80bf39 rev update 2012-07-23 15:27:25 -07:00
friendica
cdf67ce725 rev update 2012-07-22 15:39:25 -07:00
friendica
5255a5c9a9 rev update 2012-07-21 16:44:15 -07:00
friendica
8c83828f83 rev update 2012-07-20 15:12:21 -07:00
friendica
a54278649f poke notifications 2012-07-19 20:13:40 -07:00
friendica
d442bbc482 have fun... 2012-07-19 18:17:16 -07:00
friendica
b6a3471608 rev update 2012-07-19 15:27:22 -07:00
friendica
ac47edb775 rev update 2012-07-18 16:28:19 -07:00
friendica
749ae9b297 filter the protocol specifier in bbcode links. 2012-07-17 18:33:04 -07:00
friendica
e477683987 rev update 2012-07-16 17:03:23 -07:00
friendica
3408a56dd3 rev update 2012-07-15 14:22:45 -07:00
friendica
c87d3cb86f rev update 2012-07-14 14:16:24 -07:00
friendica
bbb022f564 rev update 2012-07-13 13:52:23 -07:00
friendica
ce5ca967c1 rev update 2012-07-12 16:11:43 -07:00
friendica
9a299920eb language detection - result is stored in item['postopts'] 2012-07-11 22:45:14 -07:00
friendica
24ea480276 rev update 2012-07-11 17:55:39 -07:00
friendica
12255dded5 rev update 2012-07-10 18:05:13 -07:00
friendica
1fda9e9365 rev update 2012-07-10 01:06:11 -07:00
friendica
caabb43326 diaspora message receive security issue - check message crypto signer against purported message author and bail if they don't match. 2012-07-08 22:32:04 -07:00
friendica
e94f7ed23d rev update 2012-07-07 16:20:34 -07:00
friendica
d7920c4c25 term (tag, mention, category, file, etc.) table 2012-07-05 17:59:56 -07:00
friendica
8af78079cb Merge https://github.com/friendica/friendica into pull 2012-07-05 16:06:43 -07:00
friendica
9951071b5b rev update 2012-07-05 16:06:01 -07:00
Zach Prezkuta
2edfc3b539 final db updates after testing 2012-07-05 14:31:19 -06:00
friendica
5589bca1e0 fix !@#$ tinymce linebreaks for the thousandth time 2012-07-04 17:15:43 -07:00
friendica
c726a92a3f punycode hostname 2012-07-03 21:40:13 -07:00
friendica
b550b1326b Merge https://github.com/friendica/friendica into pull 2012-07-03 16:26:58 -07:00
friendica
7926a0d171 add link to shares 2012-07-03 16:26:14 -07:00