Commit graph

15072 commits

Author SHA1 Message Date
Haakon Meland Eriksen
c40f6060da Hubzilla report created by schemaSpy using zot.meta.xml to imply relationships 2015-11-06 17:26:04 +01:00
Haakon Meland Eriksen
5776af30e8 Merge remote-tracking branch 'upstream/master' 2015-11-06 15:58:56 +01:00
Wave
30d083ac3c Merge pull request #2 from redmatrix/master
Update to latest hubzilla
2015-11-06 09:09:58 +01:00
redmatrix
4ca0c2cfd1 more hook doco 2015-11-05 21:06:09 -08:00
redmatrix
12db46dcad a bit of explanation at the beginning 2015-11-05 20:49:25 -08:00
redmatrix
9e6547a887 add the hook detail to the doco list 2015-11-05 20:21:41 -08:00
redmatrix
017ea0d624 more work on hook doco 2015-11-05 20:19:38 -08:00
redmatrix
a29b8b369e update hooklist 2015-11-05 20:10:49 -08:00
redmatrix
6b26b4e3b8 the journey of 1000 miles begins with a single step 2015-11-05 17:38:21 -08:00
redmatrix
7df92ba62c preliminary hook detail files 2015-11-05 17:23:36 -08:00
redmatrix
9cad4c11fe typo 2015-11-05 16:36:19 -08:00
redmatrix
5b42edb42a Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-11-05 16:28:54 -08:00
redmatrix
a26d8609a9 handle old files with partial paths 2015-11-05 16:28:10 -08:00
redmatrix
001e4276d3 first cut at some much better hook documentation derived from bamfic's automated list (doc/hooks.html) 2015-11-05 16:08:18 -08:00
jeroenpraat
94437a8fcd Firefox Share app. Paper plane icon is public domain. Shorted the name in ffsapi > compare it with other providers. Changed bookmark (checkmark) item to selfmade Hubzilla bookmark icon for Firefox (bookmark icon = bootstrap icon). 2015-11-05 22:58:46 +01:00
Haakon Meland Eriksen
91f751d105 Merge remote-tracking branch 'upstream/master' 2015-11-05 16:54:39 +01:00
jeroenpraat
0db5a8673d Firefox share (that seems now the official name) button added to misc. settings. 2015-11-05 16:20:56 +01:00
jeroenpraat
91f2e05d5d Style the button 2015-11-05 09:06:45 +01:00
redmatrix
58fe4f5cb3 fix the file chunking api now that we've got working data to test with 2015-11-05 00:00:41 -08:00
redmatrix
2ebd9a2774 fix path for attachments using os_storage uploaded through attach_store 2015-11-04 23:48:55 -08:00
redmatrix
8db428458a forgot this one 2015-11-04 23:21:16 -08:00
redmatrix
f8b612a2c0 Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	install/update.php
2015-11-04 23:17:09 -08:00
redmatrix
76043d97bd dummy update 2015-11-04 23:06:37 -08:00
Haakon Meland Eriksen
07bd396837 Merge remote-tracking branch 'upstream/master' 2015-11-05 06:34:14 +01:00
redmatrix
f7468ab473 re-arrange file api calls so the api pathnames don't shadow each other 2015-11-04 20:50:43 -08:00
redmatrix
1213893a71 api calls to fetch file (attach) meta data and to chunk file content fetching which will eventually allow us to clone large videos without hitting memory limits 2015-11-04 19:49:41 -08:00
redmatrix
5f1ccc25b6 menu_list() takes a channel_id, not the whole channel array 2015-11-04 18:34:42 -08:00
redmatrix
42c0f83ec5 typo 2015-11-04 18:21:36 -08:00
redmatrix
5dfaeaf526 add bookmarking to FF social api provider 2015-11-04 18:15:03 -08:00
redmatrix
1214469311 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-11-04 17:48:21 -08:00
redmatrix
f4a9529968 Firefox Share API provider interface (first cut, only has share ability) 2015-11-04 17:47:24 -08:00
redmatrix
3d55134953 Merge pull request #124 from kenrestivo/add-app-example2
Add app example
2015-11-05 10:15:33 +11:00
jeroenpraat
1c0fe89368 Chat page improved (I think). Works now better with diff. resolutions, font sizes and languages. Fixed follow field on conn. page. Small schemas updates. 2015-11-04 22:52:40 +01:00
Haakon Meland Eriksen
73bef17365 Removed fixed directory server - new list available in admin panel if one becomes unavailable 2015-11-04 19:06:25 +01:00
Wave
9398e49eb7 Merge pull request #125 from wave72/master
Updated Italian strings
2015-11-04 15:04:20 +01:00
Paolo Tacconi
50cf095c00 Updated Italian strings 2015-11-04 14:58:52 +01:00
ken restivo
5d64fb5946 Clarify format. 2015-11-04 00:39:48 -08:00
ken restivo
bf55a8e98c Add app object detailed example. 2015-11-04 00:39:24 -08:00
redmatrix
59e0a0fd7c Merge pull request #122 from kenrestivo/add-hook-docs
Commit the tool used to generate the hooks docs.
2015-11-04 19:14:32 +11:00
redmatrix
d15be53034 Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	include/zot.php
	mod/post.php
2015-11-03 23:56:15 -08:00
redmatrix
b6b2420ff7 protocol upgrade 2015-11-03 23:54:53 -08:00
ken restivo
4bd0e083d1 Put generated date at end of data. 2015-11-03 21:19:16 -08:00
ken restivo
d9c7b39b88 Commit the tool used to generate the hooks docs. 2015-11-03 21:15:49 -08:00
redmatrix
583f7df9c8 Merge pull request #121 from kenrestivo/add-hook-docs
Add generated docs for hooks.
2015-11-04 16:00:57 +11:00
redmatrix
8377aa72a8 Merge pull request #120 from kenrestivo/document-argv
Add documentation for argv/argc.
2015-11-04 16:00:44 +11:00
redmatrix
c57926d799 Merge pull request #119 from sasiflo/master
Some small rebranding for Hubzilla transition from Red Matrix
2015-11-04 16:00:32 +11:00
ken restivo
380e3e64cb Add generated docs for hooks. Link them into the developer docs so they can be found more easily. 2015-11-03 20:57:07 -08:00
redmatrix
77a03e376c Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	include/photo/photo_driver.php
	include/text.php
	mod/post.php
2015-11-03 20:46:47 -08:00
redmatrix
5dade2b608 backport small bits of the re-install fix; at least the damaging bits 2015-11-03 20:40:43 -08:00
redmatrix
877b3361c8 better re-install detection/protection. This necessitated a slight protocol change but should not introduce any compatibility issues with older software. Things just work better if you use an up-to-date server. 2015-11-03 20:28:56 -08:00