Commit Graph

18463 Commits

Author SHA1 Message Date
zotlabs
fc7d29edd3 some more api work 2016-10-12 15:31:14 -07:00
zotlabs
4f7d14dfb2 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-10-12 15:30:43 -07:00
zotlabs
cfc61a69ef bbcode: remove the inserted <br /> between list elements due to linefeeds in the textarea. 2016-10-12 15:25:48 -07:00
Mario Vavti
ce0f98989c Release version 1.14 2016-10-12 12:23:34 +02:00
Mario Vavti
cf547be1d6 Merge branch '1.14RC' 2016-10-12 12:13:44 +02:00
Mario Vavti
745ac240d7 update changelog 2016-10-12 11:27:23 +02:00
Mario Vavti
16da1a4e81 update changelog 2016-10-12 11:23:27 +02:00
Mario Vavti
73d67bb16a fix connected time not shown on ajax loaded connections 2016-10-12 11:00:33 +02:00
Mario Vavti
050c0752f9 fix connected time not shown on ajax loaded connections 2016-10-12 10:59:19 +02:00
zotlabs
ae62d30811 more api work, mostly bringing the file up to speed with the project coding style guidelines 2016-10-11 21:43:37 -07:00
zotlabs
f59a0192b4 more api work 2016-10-11 21:09:26 -07:00
zotlabs
f56b4773cb When importing a channel from another server, try to auto-discover the best available api path. 2016-10-11 20:53:13 -07:00
zotlabs
1a4a8f1ef7 more api cleanup 2016-10-11 18:37:47 -07:00
zotlabs
03aacc35b3 start on the API re-write 2016-10-11 16:13:52 -07:00
Klaus Weidenbach
d5cd6f9a51 Comment and code about UTF-8 @-sign do not match.
Changed code according to comment:
First AT is now full-width AT U+FF20.
Do we also need to replace small AT U+FE6B?
2016-10-11 11:48:16 +02:00
Mario Vavti
205bc96827 make diaspora w2w appear as a quote to make a little bit more clear what is happening 2016-10-11 10:30:49 +02:00
zotlabs
2bd61aed7a spaghetti 2016-10-11 10:19:32 +02:00
Mario Vavti
6706bed676 make diaspora w2w appear as a quote to make a little bit more clear what is happening 2016-10-11 10:17:38 +02:00
zotlabs
81e704648f api issues 2016-10-10 23:25:01 -07:00
zotlabs
c4debca11d api issues 2016-10-10 23:24:30 -07:00
zotlabs
e75b0cb743 Merge branch '1.14RC' of https://github.com/redmatrix/hubzilla into 1.14RC_merge 2016-10-10 22:47:19 -07:00
zotlabs
29617737ca Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge 2016-10-10 22:46:43 -07:00
zotlabs
26cc73118a don't expire posts before 2001 2016-10-10 22:46:24 -07:00
zotlabs
47e91e0660 don't expire posts before 2001 2016-10-10 22:45:01 -07:00
zotlabs
c6eecb06d5 don't expire posts before 2001 2016-10-10 22:44:11 -07:00
zotlabs
896b46d18e spaghetti 2016-10-10 15:04:57 -07:00
Mario Vavti
18ef8ea271 changelog and version 1.14RC1 2016-10-10 20:16:15 +02:00
Mario Vavti
ad26eec9f2 bump micro version 2016-10-10 14:41:06 +02:00
Mario Vavti
3b422406a9 hotfix for readmore.js 2016-10-10 14:38:45 +02:00
Mario Vavti
78c63c480a another fix to readmore.js and update patch file 2016-10-10 14:28:52 +02:00
Mario Vavti
79a068e92b another fix to readmore.js and update patch file 2016-10-10 14:27:49 +02:00
Mario Vavti
717a532c09 fix readmorejs collapsing on scrolldirection change in mobile browsers 2016-10-10 13:43:29 +02:00
Mario Vavti
b2cc2e6765 fix readmorejs collapsing on scrolldirection change in mobile browsers 2016-10-10 13:30:05 +02:00
zotlabs
af13e5fa4a since the snap module runs without permissions controls, verify the logged in channel matches the requested cloud path 2016-10-09 21:36:55 -07:00
zotlabs
8eac8132e3 snap dav module is currently read-only. error out on any request methods which can alter data. 2016-10-09 21:28:24 -07:00
zotlabs
50f579d301 Provide better explanation of server_roles in the config template 2016-10-09 21:01:41 -07:00
zotlabs
02c72e59fa provide a DAV module which accesses the raw data storage for a channel. Together with an export data function in the API this allows a client process to create true backups of the cloud storage and importable cloud mirrors with all the metadata intact. The import function will need to be modified slightly to obtain the file contents from a plugin or API call; since it currently tries to fetch it from the source hub. 2016-10-09 20:49:40 -07:00
zotlabs
e7233c0c94 more backquotes - this should take care of most except for the array import queries 2016-10-09 16:31:04 -07:00
zotlabs
2bdf135cbc remove more backquotes 2016-10-09 16:13:49 -07:00
zotlabs
134b9fc466 don't show diaspora protocol info in the hcard if the diaspora protocol is not installed. This really needs to be moved to the plugin but this was a quick fix. 2016-10-08 15:30:06 -07:00
zotlabs
10863a5949 add oauth2/oidc lib 2016-10-07 14:11:24 -07:00
redmatrix
bf02e04283 merge usermenu and caret when using pro 2016-10-06 17:41:52 -07:00
redmatrix
49fd53ee67 try naked embed before submission instead of at render time 2016-10-06 16:00:41 -07:00
redmatrix
48f70e55aa try naked embed before submission instead of at render time 2016-10-06 15:59:27 -07:00
redmatrix
3250d75320 new hook bbcode_filter 2016-10-05 17:37:18 -07:00
redmatrix
1ad4d26f31 Merge branch '1.14RC' of https://github.com/redmatrix/hubzilla into 1.14RC_merge 2016-10-05 17:28:12 -07:00
redmatrix
87ee48bd84 update hook documentation 2016-10-05 17:27:02 -07:00
redmatrix
24f9bb41df Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-10-05 17:26:19 -07:00
redmatrix
2a02b6de44 update hook documentation 2016-10-05 17:25:49 -07:00
redmatrix
21a0498a30 new hook bbcode_filter 2016-10-05 17:21:32 -07:00