Michael Vogel
e75f88d7fe
Further redoings
2013-08-12 11:12:00 +02:00
Michael Vogel
ed33d28e61
redoing the change concerning the hostname.
2013-08-12 11:09:11 +02:00
Michael Vogel
e746c4955b
Added an option to configure the hostname manually. And there was a problem when APC wasn't present.
2013-08-11 21:19:26 +02:00
Michael Vogel
d92a348cf0
- Using APC to store config values (when present)
...
- Enabling interlacing for pictures
2013-08-09 18:28:50 +02:00
Michael Vogel
6576aae938
If APC is enabled then store config data there
2013-08-06 00:20:16 +02:00
Michael Vogel
741b932cc9
Merge remote-tracking branch 'upstream/master'
2013-08-05 20:32:02 +02:00
Fabrixxm
3f36d375e2
hex tag filter: look at entire string
2013-08-04 03:12:17 -04:00
Fabrixxm
50233ba290
remove debug code
2013-08-03 15:18:41 -04:00
Fabrixxm
11d1c1ae8e
add tag to term table. fix "#xNNNN" tag filter.
2013-08-03 15:12:50 -04:00
fabrixxm
f1090b6d8c
Merge pull request #747 from zered/solve_741
...
Solving the "Disallow public access to addons listed in the apps menu" h...
2013-08-02 09:57:17 -07:00
fabrixxm
462f19ccf2
Merge pull request #745 from mexon/redirect_fix
...
Appending URLs in case of redirect is incorrect
2013-08-02 08:43:01 -07:00
Fabrixxm
cccdb2e5e7
api: `api_status_show()` returns correct post id
2013-07-29 10:48:30 -04:00
Matthew Exon
6a38705567
Replicate redirect URL building logic for post requests
2013-07-29 22:34:09 +08:00
Matthew Exon
eb9bd03ef8
If the header returns an absolute path as a redirect, don't simply append the path to the old URL, remove the old absolute path first.
...
For example, original URL:
http://www.theregister.co.uk/2013/07/28/birmingham_uni_car_cracker_muzzled_by_lords/print.html
Redirect from header:
/Print/2013/07/28/birmingham_uni_car_cracker_muzzled_by_lords/
Incorrect result:
http://www.theregister.co.uk/2013/07/28/birmingham_uni_car_cracker_muzzled_by_lords/print.html/Print/2013/07/28/birmingham_uni_car_cracker_muzzled_by_lords/
Correct result after this patch:
http://www.theregister.co.uk/Print/2013/07/28/birmingham_uni_car_cracker_muzzled_by_lords/
2013-07-29 10:15:39 +08:00
Michael Vogel
7770317f1e
Preparations for a more visible reshare when exporting to twitter, statusnet or facebook.
...
The oauth-parts are some experimental stuff for the statusnet API - but they don't hurt.
2013-07-28 20:38:48 +02:00
Zered
a6fae9a0db
Solving the "Disallow public access to addons listed in the apps menu" has no effect bug
...
Adding plugin_is_app function in include/plugin.php for checking if a plugin is an app or not (checking the existence of an 'app_menu' hook)
Populating the app menu conditionaly ( is the user logged or not, are apps private ) and dissalowing apps running if apps are private and the user not logged
2013-07-24 03:53:10 +02:00
Michael Vogel
4dcd00cf4b
Lockfile for onepoll, removing old smarty3 cache files.
2013-07-19 23:38:23 +02:00
Fabrixxm
00df3ef5a7
Fixes #712
2013-07-11 03:34:49 -04:00
fabrixxm
c9604b776c
stupid typo
2013-07-08 14:21:49 +02:00
Fabrixxm
cd35beb947
should fix #728
2013-07-08 04:52:14 -04:00
fabrixxm
8b9ae53242
Merge pull request #713 from annando/master
...
ejabberd and friendica
2013-07-05 12:40:30 -07:00
Michael Vogel
edf8bde581
Complete oStatus conversations: Changed from file_get_contents to fetch_url
2013-06-27 22:27:59 +02:00
Fabrixxm
4748b6c4c3
remove unneeded logger function
2013-06-27 09:58:39 -04:00
Fabrixxm
0a1697d13a
add pubsubhubbub support to feed contacts
2013-06-27 09:51:13 -04:00
friendica
9ae4c1fb32
ignore hex escapes as numeric tags
2013-06-26 04:58:54 -07:00
friendica
bfc9cfb82f
put tags in items
2013-06-26 04:02:04 -07:00
Michael Vogel
16737298b4
Merge remote-tracking branch 'upstream/master'
2013-06-22 18:31:28 +02:00
Michael Vogel
e4ce383f2f
It's now possible to authenticate an ejabberd server against friendica. See auth_ejabberd.php for details how to install.
2013-06-22 17:34:52 +02: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
5cdeef22ea
pager: fix stupid typo
2013-06-19 14:28:39 +02:00
fabrixxm
e3bb058e9f
Merge pull request #697 from annando/master
...
API can now fetch posts from a single thread
2013-06-17 05:09:54 -07:00
Michael Vogel
e246c53b45
API: Changed "parent_id" to "conversation_id" since that reflects better the meaning of this programming.
2013-06-16 13:42:43 +02:00
Michael Vogel
e7aa2b99a1
OStatus: identi.ca seemed to have changed the format of activity streams for their migration. This fixes it
...
API: It is now possible to fetch only posts from one thread.
2013-06-16 13:28:04 +02:00
Fabrixxm
faa510befc
move html from paginate functions to template
2013-06-13 08:12:15 -04:00
friendica
efce5ae1b9
Merge https://github.com/friendica/friendica into pull
2013-06-12 21:42:20 -07:00
friendica
2464915817
don't try to parse empty xml with simplepie, throws conversion warning
2013-06-12 21:41:07 -07:00
Fabrixxm
bea89c17fe
uimport: set contacts 'avatar-date' to zero. should fix issue #692
2013-06-12 03:51:53 -04:00
Michael Vogel
323186864e
Merge remote-tracking branch 'upstream/master'
2013-06-08 12:30:36 +02:00
Michael Vogel
a2cef94d8b
ostatus completion of threads now works with longer threads well.
2013-06-08 12:28:19 +02:00
friendica
8fe82d35d4
Merge https://github.com/friendica/friendica into pull
2013-05-28 04:53:27 -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
Tobias Diekershoff
2b09b8ae17
make red# available as a smilie
2013-05-27 08:34:12 +02:00
friendica
3381afab3d
Merge https://github.com/friendica/friendica into pull
2013-05-20 17:37:23 -07:00
friendica
a1c4d0ca93
fix include paths when started via cmdline
2013-05-20 17:36:29 -07:00
Michael Vogel
0723933c1c
removing of hashtag addresses is now hidden behind a configuration
2013-05-19 11:08:08 +02:00
Michael Vogel
03c489150c
Merge remote-tracking branch 'upstream/master'
2013-05-17 08:08:34 +02:00
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
Zach Prezkuta
35358baac9
update to v4.0.0; point to local host of SWF
2013-05-11 10:55:09 -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
