Michael Vogel
|
34e7206ba4
|
Preparations for the pumpio synchronisation.
|
2013-08-28 08:56:48 +02:00 |
|
friendica
|
bfc9cfb82f
|
put tags in items
|
2013-06-26 04:02:04 -07:00 |
|
friendica
|
407473f2ce
|
Merge https://github.com/friendica/friendica into pull
|
2013-06-21 05:02:43 -07:00 |
|
friendica
|
1c10cf1ad7
|
-- #039; is not a tag
|
2013-06-21 05:00:30 -07:00 |
|
Fabrixxm
|
faa510befc
|
move html from paginate functions to template
|
2013-06-13 08:12:15 -04:00 |
|
friendica
|
2464915817
|
don't try to parse empty xml with simplepie, throws conversion warning
|
2013-06-12 21:41:07 -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 |
|
friendica
|
0cc641fbbc
|
messaging
|
2013-05-22 22:30:53 -07:00 |
|
friendica
|
ed6ca1d384
|
rev update
|
2013-05-21 22:37:51 -07:00 |
|
friendica
|
a1c4d0ca93
|
fix include paths when started via cmdline
|
2013-05-20 17:36:29 -07:00 |
|
friendica
|
6ec1bd2fa8
|
double quotes in title mess up editpost
|
2013-05-18 16:02:31 -07: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
|
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 |
|
friendica
|
b3b0a9de24
|
die forcefully but gracefully on missing api templates
|
2013-01-23 17:07:55 -08:00 |
|
Fabrixxm
|
8eb781994b
|
profile_vcard: add correct menu for profile editing when multiple profiles are disabled
|
2013-01-23 09:58:30 -05:00 |
|
Michael Vogel
|
4e3d0018c6
|
Merge remote-tracking branch 'upstream/master'
Conflicts:
boot.php
include/items.php
update.php
|
2013-01-20 14:07:57 +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 |
|
friendica
|
30f1fb2c4d
|
provide a date indication in reshared content
|
2013-01-15 14:58:50 -08:00 |
|
fermionic
|
b42427d576
|
Merge pull request #586 from fermionic/20130114-maintenance-mode
check plugins in separate function
|
2013-01-14 19:35:46 -08:00 |
|
Zach Prezkuta
|
6d77237f06
|
check plugins in separate function
|
2013-01-14 20:31:32 -07:00 |
|
friendica
|
66a6970bb8
|
config cli will also work with Friendica without change - so bringing it over
|
2013-01-14 15:50:39 -08:00 |
|
Michael Vogel
|
158bfda0ac
|
Changing the tag system to the "term" table.
|
2013-01-13 14:50:55 +01:00 |
|
Michael Vogel
|
8cef0fa80d
|
Mentions are now displayed much faster. Attention: The related database update can last more than one minute.
bbcode: The generated HTML is now cleaned up every time (using the DOM) since it happened that bad html broke the network page.
|
2013-01-13 09:37:15 +01:00 |
|
friendica
|
449b44fe4c
|
Merge https://github.com/friendica/friendica into pull
|
2013-01-12 15:09:35 -08:00 |
|
friendica
|
b5c0714bc4
|
fix live update on display page
|
2013-01-12 15:08:59 -08:00 |
|
friendica
|
8b643d4c88
|
Merge pull request #581 from fermionic/20130112-backport-red-smarty-improvements
fixes and tweaks to Smarty processing
|
2013-01-12 12:28:14 -08:00 |
|
Zach Prezkuta
|
1507ec37a4
|
give post a chance to arrive before rejecting photos from Diaspora
|
2013-01-12 06:52:15 -07:00 |
|
Zach Prezkuta
|
609c45e791
|
fixes and tweaks to Smarty processing
|
2013-01-12 05:58:54 -07:00 |
|
friendica
|
f620495c7a
|
App::get_template_engine() redeclared
|
2013-01-10 22:34:25 -08:00 |
|
friendica
|
6881edf1f7
|
Merge https://github.com/friendica/friendica into pull
|
2013-01-10 22:27:53 -08:00 |
|
friendica
|
dfee9faca5
|
rev update
|
2013-01-10 22:27:41 -08:00 |
|
Zach Prezkuta
|
bce29054b9
|
allow Smarty use on international templates
|
2013-01-10 21:46:48 -07:00 |
|
Michael Vogel
|
61c78711df
|
Preparations for a new tag structure. Tags are now stored in a dedicated table.
|
2013-01-11 01:20:16 +01:00 |
|
friendica
|
51eb0cd59d
|
rev update
|
2013-01-10 01:08:36 -08:00 |
|
friendica
|
de0315396c
|
missing session template_engine calls
|
2013-01-08 12:24:13 -08:00 |
|
friendica
|
4ab363ed71
|
bypass smarty wherever using intltext_templates (install, register, friend confirmation emails, etc.)
|
2013-01-07 20:14:00 -08:00 |
|
friendica
|
07ba4da634
|
email header encoding everywhere
|
2013-01-04 15:47:29 -08:00 |
|
friendica
|
8209ae6455
|
Merge https://github.com/friendica/friendica into pull
|
2013-01-04 15:14:33 -08:00 |
|
friendica
|
9fbaa0d383
|
rev update
|
2013-01-04 15:14:00 -08:00 |
|
friendica
|
c0fd572fec
|
Merge pull request #574 from fermionic/20130103-always-load-theme-in-mod_init
Finalize theme decision in a module's _init function
|
2013-01-04 14:36:47 -08:00 |
|
Zach Prezkuta
|
0ba1bdbb08
|
profile_uid bug in boot.php
|
2013-01-03 10:53:11 -07:00 |
|
Zach Prezkuta
|
fdd142c42e
|
never use profile_load outside of a module's _init() function
|
2013-01-03 10:47:45 -07:00 |
|
friendica
|
e394ccd0a8
|
If we're going to encode the email headers, we probably should use the encoded version rather than the original
|
2013-01-03 03:47:08 -08:00 |
|
friendica
|
66b1448cdb
|
rev update
|
2013-01-01 17:32:46 -08:00 |
|
friendica
|
017042d5d4
|
rev update
|
2012-12-31 14:54:04 -08:00 |
|
friendica
|
215a7f139c
|
make smarty error reporting a bit less chatty
|
2012-12-30 00:29:07 -08:00 |
|
friendica
|
05996457f9
|
receiving post from archived Diaspora contacts
|
2012-12-29 02:35:41 -08:00 |
|
friendica
|
255771f295
|
rev update
|
2012-12-27 13:36:23 -08:00 |
|
friendica
|
792b4f63e7
|
remove dashes from variable names in profile_vcard.tpl
|
2012-12-26 13:20:18 -08:00 |
|
friendica
|
f519b90737
|
Merge https://github.com/friendica/friendica into pull
|
2012-12-26 13:09:20 -08:00 |
|
friendica
|
2684981941
|
rev update
|
2012-12-26 13:09:00 -08:00 |
|
Zach Prezkuta
|
263fe0f6bc
|
revert unnecessary variable name changes
|
2012-12-26 10:42:01 -07:00 |
|
Zach Prezkuta
|
189c8ccf6f
|
some missed templates
|
2012-12-25 12:28:24 -07:00 |
|
Zach Prezkuta
|
11c06e21b7
|
simplify by making Smarty include directives behave like Friendica native ones
|
2012-12-25 11:55:57 -07:00 |
|
fermionic
|
a0d7f7a6d3
|
Merge pull request #550 from fermionic/20121222-use-smarty-template-engine
only use Smarty if the view/smarty3/ directory is writable
|
2012-12-23 05:19:02 -08:00 |
|
Zach Prezkuta
|
53a4cf5339
|
only use Smarty if the view/smarty3/ directory is writable; location bug fix
|
2012-12-23 06:16:35 -07:00 |
|
friendica
|
453082516e
|
Merge https://github.com/friendica/friendica into pull
|
2012-12-22 22:59:37 -08:00 |
|
friendica
|
6b36927d32
|
rev update
|
2012-12-22 22:59:12 -08:00 |
|
Zach Prezkuta
|
96ed0a7791
|
Implement Smarty3
|
2012-12-22 12:57:29 -07:00 |
|
friendica
|
ac18d7289b
|
Merge https://github.com/friendica/friendica into pull
|
2012-12-19 03:16:18 -08:00 |
|
friendica
|
0f13995035
|
rev update
|
2012-12-19 03:15:48 -08:00 |
|
Michael Vogel
|
a6b1275f16
|
Merge remote-tracking branch 'upstream/master'
|
2012-12-17 10:32:53 +01:00 |
|
friendica
|
3f63a69d7a
|
divide by zero on incorrectly specified oembed thumbnail size
|
2012-12-16 17:58:12 -08:00 |
|
Michael Vogel
|
46c5a97a20
|
New caching system for photos
|
2012-12-14 22:47:30 +01:00 |
|
friendica
|
6faadc9662
|
anybody can see the "remove category" link, though it doesn't do anything if you aren't the owner. Can't believe this has gone so long without being reported.
|
2012-12-13 14:15:18 -08:00 |
|
friendica
|
5d757b0668
|
add sample nginx config from Olaf Conradi to mods directory
|
2012-12-12 15:54:13 -08:00 |
|
friendica
|
bc3a704e02
|
bug #517 - ensure wall owner can always comment on walltowall posts to their own wall, this seems to have been lost during the objectification of conversations
|
2012-12-09 13:44:48 -08:00 |
|
friendica
|
6e7e41360f
|
rev update
|
2012-12-07 15:58:42 -08:00 |
|
friendica
|
376bf517a4
|
bug #516 - set writable on first poll
|
2012-12-06 13:59:20 -08:00 |
|
friendica
|
d193093106
|
rev update
|
2012-12-04 14:08:55 -08:00 |
|
friendica
|
8ab24858fb
|
fix "insert web link" for those without richtext feature enabled
|
2012-12-03 16:31:28 -08:00 |
|
friendica
|
ee0def3ef5
|
rev update
|
2012-12-02 13:47:24 -08:00 |
|
friendica
|
b130c892b2
|
features categories were un-translatable
|
2012-11-28 19:25:09 -08:00 |
|
friendica
|
32868dab79
|
catch stragglers in "chunked" delivery mode
|
2012-11-27 15:17:41 -08:00 |
|
friendica
|
5d904a9fa8
|
improve performance of photo upload page
|
2012-11-25 19:34:54 -08:00 |
|
friendica
|
bb51be4ea8
|
rev update
|
2012-11-25 19:21:08 -08:00 |
|
friendica
|
ff9c19d75a
|
Merge https://github.com/friendica/friendica into pull
|
2012-11-22 20:55:03 -08:00 |
|
friendica
|
278f30790a
|
rev update
|
2012-11-22 20:54:44 -08:00 |
|
friendica
|
226d1ba7c1
|
Merge pull request #537 from fermionic/20121121-features
Port Features from Red
|
2012-11-22 20:54:16 -08:00 |
|
Zach Prezkuta
|
94204d9160
|
implement features
|
2012-11-22 09:14:22 -07:00 |
|
friendica
|
d3b2b1b7ec
|
rev update
|
2012-11-21 15:40:07 -08:00 |
|
friendica
|
f1c579e74a
|
Merge https://github.com/friendica/friendica into pull
|
2012-11-18 23:50:37 -08:00 |
|
friendica
|
53a908a3d7
|
fix directory
|
2012-11-18 23:44:03 -08:00 |
|
friendica
|
70d0ed9402
|
log directory updates
|
2012-11-18 22:53:01 -08:00 |
|
Michael Vogel
|
f17377e6de
|
New cache system with subdirectories
|
2012-11-17 00:50:39 +01:00 |
|
friendica
|
ab0dc3131a
|
fix wallmessage
|
2012-11-14 13:59:31 -08:00 |
|
friendica
|
66f0cf9f5b
|
rev update
|
2012-11-13 17:15:17 -08:00 |
|
friendica
|
009744af50
|
allow posted ACLs to be comma-delimited string besides the default array
|
2012-11-11 13:56:21 -08:00 |
|
friendica
|
a807206804
|
Merge https://github.com/friendica/friendica into pull
|
2012-11-11 00:30:37 -08:00 |
|
friendica
|
de5a21bec4
|
improve recognition of tumblr feeds. I hope we don't need special feed logic to find the feeds for every site on the web. We were so far beyond this ten years ago.
|
2012-11-11 00:28:21 -08:00 |
|
friendica
|
0e95b6b527
|
Merge pull request #531 from fabrixxm/master
"Move Account" docs
|
2012-11-10 03:06:28 -08:00 |
|
Fabrixxm
|
cafb4d62f4
|
a little bit of phpdoc
|
2012-11-09 02:43:22 -05:00 |
|
friendica
|
083d660f61
|
Merge https://github.com/friendica/friendica into pull
|
2012-11-08 16:32:25 -08:00 |
|
friendica
|
9b629186a9
|
rev update
|
2012-11-08 16:29:54 -08:00 |
|
Zach Prezkuta
|
e116712bf5
|
add ability to remember logged in user after browser closes
|
2012-11-07 18:59:30 -07:00 |
|
Zach Prezkuta
|
999c3439e6
|
fix mobile photo uploads; better theme control; frost improvements
|
2012-11-06 08:43:19 -07:00 |
|
friendica
|
776552226b
|
Merge https://github.com/friendica/friendica into pull
|
2012-11-06 01:10:36 -08:00 |
|
friendica
|
fd4d35b16c
|
set writable for ostatus followers
|
2012-11-06 01:10:12 -08:00 |
|
Fabrixxm
|
5b4944fe8e
|
Merge remote-tracking branch 'remotes/friendica/master' into moveme
|
2012-11-05 09:37:58 +01:00 |
|
friendica
|
caebcc5e83
|
rev update
|
2012-11-04 13:43:28 -08:00 |
|
friendica
|
f076d7f0dc
|
Merge https://github.com/friendica/friendica into pull
|
2012-11-03 14:44:46 -07:00 |
|