Treer
|
b5b21ecad7
|
improve whitespace control around definition list ([dl]) bbcode
|
2016-04-30 02:03:38 +10:00 |
|
Treer
|
9d079e5d2b
|
Add definition lists to bbcode
|
2016-04-30 01:13:34 +10:00 |
|
Mario Vavti
|
b797528b78
|
some work on making mod editpost use status_editor() - if you find anything related to jot broken please revert this commit
|
2016-04-29 13:18:42 +02:00 |
|
Mario Vavti
|
1fdac57d61
|
jot: cleanup unused variables
|
2016-04-29 09:58:44 +02:00 |
|
redmatrix
|
bb96f44861
|
allow engineering units (e.g. 400M, 1G) as service class limits
|
2016-04-28 21:02:27 -07:00 |
|
redmatrix
|
bdef71bda0
|
provide courtesy function for syncing one item. We'll probably be doing this a lot.
|
2016-04-27 21:26:52 -07:00 |
|
redmatrix
|
8e8df26066
|
Use / for album name in photo activities if no album present.
|
2016-04-27 13:25:58 -07:00 |
|
redmatrix
|
a67fa2651d
|
implement the singleton delivery stuff
|
2016-04-26 17:38:44 -07:00 |
|
redmatrix
|
509f25e46a
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-04-26 16:14:10 -07:00 |
|
redmatrix
|
f99daf8ff9
|
move iconfig functions to include/config.php with all the rest of the configs, fix an issue with singleton discovery and start work on singleton delivery
|
2016-04-26 16:12:31 -07:00 |
|
Mario Vavti
|
ce50a429fa
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2016-04-26 11:41:23 +02:00 |
|
Mario Vavti
|
3446e68ac2
|
move spoiler= and quote= bbcode handling from prepare_body() to bbcode() and add open tag to bbco_autocomplete
|
2016-04-26 11:41:08 +02:00 |
|
redmatrix
|
2e7028c976
|
some cleanup on the mysqli driver
|
2016-04-25 22:03:02 -07:00 |
|
redmatrix
|
d62f490814
|
Setup was horked after this commit and I couldn't easily make it right so reverting - will try again at a future date
Revert "remove global db variable"
This reverts commit c3b0c0f32a.
|
2016-04-25 20:12:36 -07:00 |
|
redmatrix
|
c3b0c0f32a
|
remove global db variable
|
2016-04-25 16:55:33 -07:00 |
|
redmatrix
|
ce45a1cf94
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-04-23 16:57:32 -07:00 |
|
redmatrix
|
79c63e3cf4
|
this should work to call a hook for a string class method
|
2016-04-23 16:56:41 -07:00 |
|
redmatrix
|
df2990b27e
|
Class method support for hooks
|
2016-04-23 15:16:54 -07:00 |
|
Mario Vavti
|
b0a2e5d3f7
|
simplify context help js and move it to main.js where all the nav related js resides, do not close the context help if we click outside of it - members might want to work on something while help is open, move the link to /help to dropdown-menu.
|
2016-04-23 16:39:56 +02:00 |
|
redmatrix
|
540800da95
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-04-21 17:09:13 -07:00 |
|
redmatrix
|
1ff189ee90
|
new hook interface (the old one still works but requires handlers to have two calling arguments; the first of which is no longer used). The new interface is called from Zotlabs\Extend\Hook::register() and allows you to specify which hook version to use. The default will be the new interface with one function argument. We also implement the hook priority field which was always there but needed to be set manually in the DB. This provides a way for two hook handlers that implement the same hook interface to determine which order to be called in the event of conflicts.
|
2016-04-21 17:03:05 -07:00 |
|
Mario Vavti
|
d7f4bfedd5
|
some fixes for contextual help and disable transition animation for now - it looked really wired because main moved with a different speed than help-content and help-content can not be displayed under the panel as it is implemented now.
|
2016-04-21 23:03:09 +02:00 |
|
git-marijus
|
391ed8655e
|
Merge pull request #351 from anaqreon/toggle-context-help
Toggle context help
|
2016-04-21 18:44:50 +02:00 |
|
git-marijus
|
aa0c70e198
|
Merge pull request #348 from git-marijus/dev
add querystring to css and js which is added via head_add_{css, js}
|
2016-04-21 18:42:49 +02:00 |
|
Andrew Manning
|
82de68c3d3
|
Added admin/site setting that toggles context help panel. If disabled, original help menu button behavior is restored.
|
2016-04-21 06:41:55 -04:00 |
|
redmatrix
|
f00a701ad1
|
send the correct number of args
|
2016-04-20 19:56:01 -07:00 |
|
redmatrix
|
0d91f363cc
|
There is no longer a followup flag in the notifier. Remove all traces of it.
|
2016-04-20 19:03:56 -07:00 |
|
Andrew Manning
|
b96eb1c823
|
Merge branch 'dev' into toggle-context-help
|
2016-04-20 21:05:01 -04:00 |
|
redmatrix
|
2641980ac2
|
bb2d updates from testing signature changes
|
2016-04-20 01:40:09 -07:00 |
|
redmatrix
|
21b0128e9e
|
testing dmeta
|
2016-04-19 23:06:43 -07:00 |
|
redmatrix
|
d07afb54e4
|
rework bb2diaspora for eradicating the diaspora comment virus
|
2016-04-19 21:43:12 -07:00 |
|
Mario Vavti
|
6941fbb182
|
add querystring to css and js which is added via head_add_{css, js}
|
2016-04-19 13:38:06 +02:00 |
|
Andrew Manning
|
7594796ee1
|
Try toggling context help using onclick attribute
|
2016-04-19 05:52:16 -04:00 |
|
redmatrix
|
2a4e8972e0
|
module updates
|
2016-04-18 20:38:38 -07:00 |
|
redmatrix
|
d1ecf3f323
|
some issues with GNU-Social's implementation of events in feeds. The summary element is over-riding content, so put summary into the xcal namespace. Some investigation reveals that both projects are non-compliant in the xcal space. Will deal with this later.
|
2016-04-18 00:59:42 -07:00 |
|
redmatrix
|
521d404013
|
remove the date hack on public feeds which was a temporary fix for an issue limiting the number of posts returned and no longer needed.
|
2016-04-17 16:37:44 -07:00 |
|
redmatrix
|
521641f3a8
|
filter out a bit more dreport noise - especially for private posts to multiple recipients.
|
2016-04-14 21:53:39 -07:00 |
|
redmatrix
|
a8f7af2079
|
provide general purpose verification class, remove include/session.php (no longer used)
|
2016-04-14 18:51:06 -07:00 |
|
redmatrix
|
ed0bff798b
|
fix marked bug in code
|
2016-04-13 22:58:37 -07:00 |
|
redmatrix
|
5cb3143c04
|
issue #331 use timeago.js for reshared publish date instead of relative_date() which does not play well with other networks.
|
2016-04-10 21:30:35 -07:00 |
|
redmatrix
|
d1a2aecfa0
|
move more session related stuff such as paranoia handling (IP address changes) into the session object and extend remember_me cookies once a day so that they will never expire (theoretically). The DB session driver will extend its expiration on every session write (in the case of persistent sessions).
|
2016-04-10 19:20:41 -07:00 |
|
redmatrix
|
e9f1bac062
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-04-10 17:03:30 -07:00 |
|
redmatrix
|
abfbe9c937
|
a few issues: block public not blocking mod_cal, typo in sql for one clone file sync operation, fix_system_urls not catching cached contact photos, extend sessionhandler expiration when remember_me is enabled as the stored session is expiring long before the browser session.
|
2016-04-10 16:56:08 -07:00 |
|
Mario Vavti
|
e2b4d33627
|
some work on comanche autocomplete
|
2016-04-09 12:16:42 +02:00 |
|
redmatrix
|
9b66b5eee3
|
objectify all the session management stuff
|
2016-04-08 04:44:10 -07:00 |
|
redmatrix
|
279f32b13d
|
send file sync packets for all known file operations
|
2016-04-07 18:54:48 -07:00 |
|
redmatrix
|
3a6187af3d
|
implement updates of attach data to sync'd clones.
|
2016-04-07 16:44:53 -07:00 |
|
redmatrix
|
aa678ba0ff
|
reset profile photo and cover photo bits for existing photos if a new one arrives from a clone
|
2016-04-06 22:14:05 -07:00 |
|
redmatrix
|
e4391e6336
|
missing profile photo in export data
|
2016-04-06 21:36:47 -07:00 |
|
redmatrix
|
aa0412d83b
|
use the explicit form of build_sync_packet so that file/photo sync will work even when the actual observer is a guest (with permission to upload).
|
2016-04-06 20:25:52 -07:00 |
|
redmatrix
|
861f5232d3
|
more work on file sync to clones, 60-70% test coverage, mostly working but many changes made during testing which themselves have not yet been tested
|
2016-04-06 19:56:38 -07:00 |
|
redmatrix
|
9831ad515d
|
file sync testing continued
|
2016-04-06 18:46:29 -07:00 |
|
redmatrix
|
6650916435
|
file sync testing
|
2016-04-06 18:38:48 -07:00 |
|
redmatrix
|
29363a185d
|
file sync work
|
2016-04-06 18:07:29 -07:00 |
|
redmatrix
|
a20ef706fd
|
issue #340
|
2016-04-06 05:44:40 -07:00 |
|
redmatrix
|
adad8f2ebc
|
getting file sync data - missed parent folder
|
2016-04-06 05:20:55 -07:00 |
|
redmatrix
|
fb9c12df15
|
rework the "remember me" fix to be a bit less hackish
|
2016-04-06 02:33:11 -07:00 |
|
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
|
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 |
|
Mario Vavti
|
bd29551f9a
|
fix contextual help
|
2016-04-05 16:59:32 +02:00 |
|
redmatrix
|
ec41170121
|
Merge pull request #338 from anaqreon/contextual-help
Contextual help
|
2016-04-05 22:43:15 +10: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 |
|
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
|
cfad5ba8b8
|
Merge branch 'master' into dev
|
2016-04-03 16:17:31 -07:00 |
|
Mario Vavti
|
b8d8be7013
|
show chat expiration time in overview and minor fixes
|
2016-04-03 11:34:07 +02:00 |
|
redmatrix
|
8b3c099a12
|
use constant
|
2016-04-02 21:06:41 -07:00 |
|
Mario Vavti
|
ebac0bdcca
|
Chat Rooms -> Chatrooms
|
2016-04-01 09:46:41 +02:00 |
|
redmatrix
|
44283dbbbb
|
change the App constructor
|
2016-03-31 20:24:30 -07:00 |
|
redmatrix
|
0cda431456
|
create miniApp to convert existing settings files to the static App class
|
2016-03-31 20:15:47 -07:00 |
|
redmatrix
|
36b388ab8c
|
issue #336
|
2016-03-31 18:53:05 -07:00 |
|
redmatrix
|
c0b3d7e1b4
|
Merge branch 'static'
|
2016-03-31 17:32:51 -07:00 |
|
redmatrix
|
9abd95fad3
|
static App
|
2016-03-31 16:06:03 -07:00 |
|
Mario Vavti
|
6c2673ae2a
|
various fixes regarding mod chat
|
2016-03-31 22:42:28 +02:00 |
|
Mario Vavti
|
3fdd110e07
|
mod chat rework continued
|
2016-03-31 13:21:48 +02:00 |
|
redmatrix
|
1cd3b41825
|
deprecate $a->get_baseurl()
|
2016-03-30 22:13:24 -07:00 |
|
redmatrix
|
6a6dbec033
|
issue #319 - NOTE: this does not fix the issue, it only reports it and continues. We need to examine any logger statements that contain 'stack:' as a result of reporting this issue and find and fix the original problem - which is that set_pconfig is being called without a valid $uid. I'm worried that since we will now continue on without throwing a PHP error that nobody will ever notice or find the problem that is causing this.
|
2016-03-30 16:33:23 -07:00 |
|
Mario Vavti
|
08461c7049
|
more on mod chat
|
2016-03-30 14:44:03 +02:00 |
|
Mario Vavti
|
5462453bf2
|
some work on mod chat
|
2016-03-30 14:31:55 +02:00 |
|
redmatrix
|
d3f38c9f43
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2016-03-26 14:34:19 -07:00 |
|
redmatrix
|
971e7321c6
|
issue #319 part 2
|
2016-03-26 14:33:36 -07:00 |
|
Mario Vavti
|
97eef2b88c
|
removed link to connected apps by accident
|
2016-03-26 19:34:38 +01:00 |
|
Andrew Manning
|
c25ef1d9a8
|
Search docs/context/ hierarchically for help.html files to reduce redundancy
|
2016-03-26 14:31:41 -04:00 |
|
Mario Vavti
|
f714e97d63
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2016-03-26 18:46:07 +01:00 |
|
Mario Vavti
|
a507063174
|
move link to /locs to settings menu if we have more than one location and some template work on locs
|
2016-03-26 18:43:38 +01:00 |
|
redmatrix
|
531710142c
|
add hook to allow plugins to perform a follow activity from an activityfeed
|
2016-03-23 20:04:09 -07:00 |
|
Andrew Manning
|
59827b6dfd
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla into contextual-help
|
2016-03-23 21:17:23 -04:00 |
|
redmatrix
|
f200dd4395
|
atom specifies a uri or iri for the id. message_id isn't suitable here.
|
2016-03-23 16:36:27 -07:00 |
|
redmatrix
|
6f2ba0c619
|
rewrite the webfinger discovery logic
|
2016-03-22 19:58:59 -07:00 |
|
redmatrix
|
51a840f46a
|
update network_to_name (reserve DFRN for future use)
|
2016-03-21 22:02:18 -07:00 |
|
redmatrix
|
ec99e3ed62
|
attempting to work with braindead lighttpd gnusocial servers
|
2016-03-21 21:31:28 -07:00 |
|
Andrew Manning
|
56c86b6567
|
Override navbar help button to open contextual help panel. Contextual help for mail written.
|
2016-03-21 06:33:02 -04:00 |
|
redmatrix
|
28599fe652
|
more federation work
|
2016-03-20 21:41:19 -07:00 |
|
redmatrix
|
d3e7ef70e8
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2016-03-20 19:56:36 -07:00 |
|
redmatrix
|
fea532af4d
|
rework salmon - important, update addons also if you have enabled gnusoc addon
|
2016-03-20 19:55:53 -07:00 |
|
Mario Vavti
|
9fcd470aca
|
fix #328 by using a seperate query instead of group_concat
|
2016-03-20 20:26:55 +01:00 |
|
redmatrix
|
77094f8d2b
|
make the admin side menu extensible and provide a hook for a channel "move" operation that federation plugins might use to re-establish connections after a channel move.
|
2016-03-19 16:17:19 -07:00 |
|