 redmatrix
|
5a2a8717e3
|
provide function to collect file/photo sync data per help/filesync
|
2016-04-05 23:11:24 -07:00 |
|
|
redmatrix
|
0d50d29538
|
Merge branch 'master' into dev
|
2016-04-05 22:15:29 -07:00 |
|
|
redmatrix
|
54aa998b52
|
undeclared static property App::$stringsave (push_lang() and pop_lang())
|
2016-04-05 22:13:56 -07:00 |
|
|
redmatrix
|
10f1e2d51b
|
add some doco to getfile module
|
2016-04-05 21:20:23 -07:00 |
|
|
redmatrix
|
9fd8634b62
|
server side of file/photo sync to deliver the file data. We'll sign it using our channel_hash and the current time to make it difficult to forge a request; as the sync process is not going to have magic-auth ability.
|
2016-04-05 21:10:08 -07:00 |
|
|
redmatrix
|
fd07940b10
|
provide stream resource pointer option to z_fetch_url() and z_post_url() per earlier doco commit on syncing files/photos across clones.
|
2016-04-05 18:24:24 -07:00 |
|
|
redmatrix
|
6f6051f7e3
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-04-05 16:44:11 -07:00 |
|
|
redmatrix
|
f9778fda83
|
add some doco on some of the issues and approaches to file/photo syncing and cloning
|
2016-04-05 16:42:33 -07:00 |
|
|
redmatrix
|
ea3fb53e4b
|
Merge pull request #339 from anaqreon/autocomplete
Improve (un)ordered list autocompletion for list construction
|
2016-04-06 06:07:32 +10:00 |
|
|
redmatrix
|
a7d5bf6854
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-04-05 12:51:22 -07:00 |
|
|
redmatrix
|
0e7a963173
|
Merge branch 'master' into dev
|
2016-04-05 12:51:06 -07:00 |
|
|
redmatrix
|
4aa2733699
|
revup issue #337
|
2016-04-05 12:49:58 -07:00 |
|
 Andrew Manning
|
1eb6067c31
|
Improve (un)ordered list autocompletion for list construction
|
2016-04-05 14:46:16 -04:00 |
|
 Mario Vavti
|
bd29551f9a
|
fix contextual help
|
2016-04-05 16:59:32 +02:00 |
|
|
Mario Vavti
|
32ccdd1f57
|
use min version of justifiedGallery
|
2016-04-05 15:28:39 +02:00 |
|
|
Mario Vavti
|
deaf0e99fd
|
expand list of bbcode in autocomplete
|
2016-04-05 15:27:45 +02:00 |
|
|
Mario Vavti
|
d99a1d8de0
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2016-04-05 15:24:42 +02:00 |
|
|
Mario Vavti
|
0012030826
|
update upstream lib jusutifiedGallery
|
2016-04-05 15:24:05 +02:00 |
|
|
redmatrix
|
ec41170121
|
Merge pull request #338 from anaqreon/contextual-help
Contextual help
|
2016-04-05 22:43:15 +10:00 |
|
|
redmatrix
|
1d5ea5efae
|
explain the two aspects of federation which need to be handled in core to pass comments successfully amongst sites which optionally provide federation. Let's hope this list doesn't grow.
|
2016-04-04 17:02:27 -07:00 |
|
|
redmatrix
|
01ad485f65
|
SECURITY: Do not link unknown and unverified code repositories to the project without some form of confirmation that one accepts the significant risks involved.
|
2016-04-04 16:17:50 -07:00 |
|
|
redmatrix
|
447c59fd9b
|
Merge branch 'master' into dev
|
2016-04-04 13:32:58 -07:00 |
|
|
redmatrix
|
3de40bdf04
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge
|
2016-04-04 13:31:31 -07:00 |
|
|
redmatrix
|
ba6c346b46
|
revup - issue #337
|
2016-04-04 13:30:59 -07:00 |
|
|
Mario Vavti
|
1c9f773900
|
Merge branch 'master' into dev
|
2016-04-04 17:13:10 +02:00 |
|
|
Mario Vavti
|
ec651f219e
|
a simple autocomplete for bbcode or comanche - partly implemented
|
2016-04-04 17:12:23 +02:00 |
|
|
Mario Vavti
|
ee8a9384d5
|
Merge branch 'master' into dev
|
2016-04-04 10:37:20 +02:00 |
|
|
Mario Vavti
|
bba34a7a8e
|
do not use dropdown class if there is nothing to dropdown
|
2016-04-04 10:37:07 +02:00 |
|
|
Mario Vavti
|
dfa12b2919
|
Merge branch 'master' into dev
|
2016-04-04 10:13:30 +02:00 |
|
|
Mario Vavti
|
9b9f29a0b2
|
whitespace
|
2016-04-04 10:10:19 +02:00 |
|
|
Mario Vavti
|
4a9aad2a33
|
whitespace
|
2016-04-04 10:09:46 +02:00 |
|
|
Mario Vavti
|
69617b5c34
|
fullscreen mode for photo albums view
|
2016-04-04 10:09:13 +02:00 |
|
|
redmatrix
|
222ace3770
|
For GNU-social discovery, use the URI in the feed (author.uri) rather than try to pick out which of the aliases in webfinger are likely to be the right one. If we get it wrong, our communications with them will be discarded and there is no rhyme or reason to the logic about which representation is likely to be the one true account URI. It appears to vary with the clean_url setting of the site and this info isn't available to us except with a sequence of expensive probes and testing various ways of re-writing URLs to see if we get a response.
|
2016-04-03 20:55:38 -07:00 |
|
|
redmatrix
|
2e7d2a63c3
|
provide a backup copy of prior notes widget content if the contents were just nuked.
|
2016-04-03 19:34:19 -07:00 |
|
|
Andrew Manning
|
0523b4b2f1
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla into contextual-help
|
2016-04-03 21:36:29 -04:00 |
|
|
redmatrix
|
a703835b5c
|
Bug: "remember me" doesn't
|
2016-04-03 17:38:17 -07:00 |
|
|
redmatrix
|
bf3f3564e0
|
issue #138 ; make ajaxchat optional and configurable. For reasons we've discussed repeatedly the ajax chat will not be removed from core as XMPP chat does not provide decentralised access control compatible with nomadic identity.
|
2016-04-03 16:41:40 -07:00 |
|
|
redmatrix
|
102d41ccb9
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-04-03 16:17:54 -07:00 |
|
|
redmatrix
|
cfad5ba8b8
|
Merge branch 'master' into dev
|
2016-04-03 16:17:31 -07:00 |
|
|
redmatrix
|
b4c1baada1
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge
|
2016-04-03 16:16:14 -07:00 |
|
|
redmatrix
|
1ca3eeedff
|
issue #337
|
2016-04-03 16:15:41 -07:00 |
|
|
Mario Vavti
|
298b53e93a
|
Merge branch 'master' into dev
|
2016-04-03 18:00:25 +02:00 |
|
|
Mario Vavti
|
f13096a6f3
|
various fixes
|
2016-04-03 18:00:03 +02:00 |
|
|
Mario Vavti
|
470f14b919
|
Merge branch 'master' into dev
|
2016-04-03 15:27:26 +02:00 |
|
|
Mario Vavti
|
53311a30ad
|
reduce chat-item-title fontsize to match wall-item-ago
|
2016-04-03 15:27:10 +02:00 |
|
|
Mario Vavti
|
5634a4bb61
|
Merge branch 'master' into dev
|
2016-04-03 14:56:52 +02:00 |
|
|
Mario Vavti
|
738e14348d
|
update upstream libs fullcalendar and moment to a recent version
|
2016-04-03 14:56:19 +02:00 |
|
|
Mario Vavti
|
787e2ef961
|
Merge branch 'master' into dev
|
2016-04-03 12:20:10 +02:00 |
|
|
Mario Vavti
|
db4e9aeaad
|
fullscreen mode for events
|
2016-04-03 12:19:49 +02:00 |
|
|
Mario Vavti
|
7850b04853
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2016-04-03 11:35:47 +02:00 |
|