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 |
|
redmatrix
|
df61970b39
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2016-03-17 12:16:25 -07:00 |
|
redmatrix
|
f82afca84d
|
no xchan here if using zot protocol
|
2016-03-17 12:15:28 -07:00 |
|
jeroenpraat
|
eca119d695
|
See issue https://github.com/redmatrix/hubzilla-addons/issues/17 (UNO: enable the Diaspora protocol for all channels (if addon is enabled) - I had to do this during channel creation and not in the addon itself, or else the member can't change this after the channel is created. Tested it on UNO and normal Hubzilla. If this is not the right place for this, please move it. If not wanted at all, please discuss.
|
2016-03-17 15:48:44 +01:00 |
|
redmatrix
|
a83cdbeb39
|
typo
|
2016-03-16 22:02:19 -07:00 |
|
redmatrix
|
3a8f6e6576
|
more federation backend
|
2016-03-16 21:05:52 -07:00 |
|
redmatrix
|
38eb79705e
|
lots of work on federated channel discovery
|
2016-03-16 18:00:13 -07:00 |
|
redmatrix
|
4188419b30
|
more federation backend work
|
2016-03-15 17:54:06 -07:00 |
|
redmatrix
|
e8d19659c0
|
some heavy lifting porting the old salmon code
|
2016-03-15 00:50:03 -07:00 |
|
redmatrix
|
b673b6835d
|
federation work
|
2016-03-14 22:14:17 -07:00 |
|
redmatrix
|
ef7494359f
|
some re-working of webfinger and hcard parsing which will be necessary going forward.
|
2016-03-14 18:12:35 -07:00 |
|
redmatrix
|
cc29e27acc
|
issue #320 - regression, after removing channel attached to an authenticated session the session was not completely cleared.
|
2016-03-12 19:53:07 -08:00 |
|
redmatrix
|
70ad69d38c
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2016-03-12 16:47:11 -08:00 |
|
Mario Vavti
|
2d8deb6082
|
some janitor work on profiles
|
2016-03-12 22:13:46 +01:00 |
|
redmatrix
|
32c23ef562
|
some minor cleanups
|
2016-03-10 15:43:59 -08:00 |
|
jeroenpraat
|
107f80892a
|
UNO: Hide bookmark tools in items (#^ and in menu)
|
2016-03-10 19:40:28 +01:00 |
|
redmatrix
|
7732532964
|
handle UNO move channel operation
|
2016-03-09 15:56:51 -08:00 |
|
redmatrix
|
b9b46a3f88
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2016-03-09 14:18:11 -08:00 |
|
Mario Vavti
|
c2cdd41e81
|
Issue #316 make /display updates work. Basically copy and paste what we do on load and add $simple_update to the query.
|
2016-03-09 10:04:33 +01:00 |
|
redmatrix
|
256cd6baac
|
work on implementing account/channel move (as opposed to clone)
|
2016-03-09 00:46:17 -08:00 |
|
redmatrix
|
843cc1481a
|
isue #315
|
2016-03-08 16:46:47 -08:00 |
|
redmatrix
|
9debfa348a
|
add syslog loglevels to dba functions
|
2016-03-07 20:43:52 -08:00 |
|
redmatrix
|
32e903e956
|
a bit of page cleanup for edit profiles
|
2016-03-07 18:49:17 -08:00 |
|
jeroenpraat
|
7162403292
|
Also make it clear with (mouse) hover text that you must click on the cover photo to show the channel/more
|
2016-03-06 17:02:58 +01:00 |
|
redmatrix
|
dd4a66353a
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2016-03-03 14:49:34 -08:00 |
|
redmatrix
|
2cf54c465d
|
remove the markdown feature. Do not re-enable unless you are willing to support it.
|
2016-03-03 14:47:39 -08:00 |
|
Mario Vavti
|
b704f977da
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2016-03-03 12:08:21 +01:00 |
|
Mario Vavti
|
59e04aed1b
|
move cover-photo to template, add the ability to define a title and subtitle (defaults to channel name and addres), move js from redbasic.js to template.
|
2016-03-03 12:07:58 +01:00 |
|
redmatrix
|
436e91a1e1
|
rename the menu entry and page to 'Profile Fields' to maintain consistency
|
2016-03-02 16:39:34 -08:00 |
|
redmatrix
|
157bbb14b5
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2016-03-02 11:35:48 -08:00 |
|
redmatrix
|
5c22f59c4f
|
issue #305
|
2016-03-02 11:32:32 -08:00 |
|
Mario Vavti
|
22729da2a2
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2016-03-02 12:31:46 +01:00 |
|
Mario Vavti
|
c97cc1487c
|
a simple cover-photo implementation for redbasic default template
|
2016-03-02 12:31:25 +01:00 |
|
redmatrix
|
428b4dbad6
|
sort out the with and howlong dependencies
|
2016-03-01 22:47:07 -08:00 |
|
redmatrix
|
548bf884a4
|
profile field admin page (functional only: still needs a lot of HTML/CSS cleanup)
|
2016-03-01 21:06:27 -08:00 |
|
redmatrix
|
a0baa480e3
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2016-03-01 15:01:48 -08:00 |
|
redmatrix
|
765dd5569b
|
Allow configuration of the display order of profile fields. This is an important piece of a more general profile configuration framework which will eventually be accessible via the admin page.
|
2016-03-01 14:55:04 -08:00 |
|
jeroenpraat
|
8b61e546fe
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2016-03-01 22:09:06 +01:00 |
|
jeroenpraat
|
7206e8af3a
|
Small fix for deleted forum channels showing in the forum widget (had this after migration from RM on 1 or 2 channels)
|
2016-03-01 22:08:50 +01:00 |
|
redmatrix
|
91bb4bdf50
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2016-02-29 19:34:23 -08:00 |
|
redmatrix
|
be2b7c0b5f
|
abconfig
|
2016-02-29 19:31:52 -08:00 |
|
Mario Vavti
|
2d45f9f385
|
provide footer bbcode
|
2016-02-29 23:58:32 +01:00 |
|
Mario Vavti
|
3f90da5643
|
remove unused variable
|
2016-02-29 22:07:14 +01:00 |
|
Mario Vavti
|
d27a627c4f
|
simplify profile edit button(s) and make it useful for multiple profiles
|
2016-02-29 22:01:13 +01:00 |
|
Mario Vavti
|
bfeeb76143
|
fix deletion of files from filesystem
|
2016-02-29 15:37:34 +01:00 |
|
Mario Vavti
|
f2d3be2e67
|
do not process update activity if there is no item to update and simplify code a little
|
2016-02-29 14:22:35 +01:00 |
|
redmatrix
|
ebe70a41b9
|
build_sync_packet - no need to sleep after the last sync delivery.
|
2016-02-28 18:26:08 -08:00 |
|
redmatrix
|
da79662081
|
stop the PHP warnings from Thomas's buggered sitekey
|
2016-02-28 16:33:52 -08:00 |
|
redmatrix
|
cd5630476f
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2016-02-27 16:29:13 -08:00 |
|
redmatrix
|
f7f20c5917
|
z_fetch_url and z_post_url returning false
|
2016-02-27 16:27:37 -08:00 |
|
Mario Vavti
|
a2fe22412f
|
missing include
|
2016-02-27 16:51:54 +01:00 |
|
Mario Vavti
|
58cf9d832c
|
make attach_delete() return and comment out album rename functionality since this is not supported by the backend at the moment.
|
2016-02-27 12:31:07 +01:00 |
|
redmatrix
|
6126070a1d
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2016-02-26 12:49:02 -08:00 |
|
redmatrix
|
459166116d
|
turn timezone aware birthdays into a feature for those who want an uncluttered calendar - at the expense of possibly sending somebody's birthday greeting on the wrong day if they are in a different timezone.
|
2016-02-26 12:45:44 -08:00 |
|
Mario Vavti
|
776bc51172
|
fix link to photo album and make sure that small photos are not overwritten by body text.
|
2016-02-26 15:21:14 +01:00 |
|
Mario Vavti
|
5a563b8e76
|
some improvement for file activity
|
2016-02-26 11:17:21 +01:00 |
|
Mario Vavti
|
0653a2e0a9
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2016-02-26 09:21:01 +01:00 |
|
Mario Vavti
|
d19dfc87a6
|
get rid of duplicate function
|
2016-02-26 09:20:44 +01:00 |
|
redmatrix
|
dc8c7a2d2e
|
small improvements to profile like activity
|
2016-02-25 16:21:38 -08:00 |
|
redmatrix
|
ba2ede0a8f
|
this reverts ea54987ca4
|
2016-02-25 15:41:52 -08:00 |
|
redmatrix
|
6892ba4cd8
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2016-02-25 15:14:57 -08:00 |
|
Mario Vavti
|
5ad9b48f1d
|
revert f62ec4132e - allow one self to be added to a privacy group.
|
2016-02-25 23:59:57 +01:00 |
|
redmatrix
|
7972de13ca
|
backtrace openssl_verify errors so that we can find bad keys - as there is very little relevant context available at this level.
|
2016-02-25 14:34:30 -08:00 |
|
Mario Vavti
|
ea54987ca4
|
in update_birthdays() we should probably set adjust to 0 instead of 1 since a birthday is more a kind of a global holiday
|
2016-02-25 23:03:38 +01:00 |
|
Mario Vavti
|
b2474334a7
|
provide an edit button for the profile page
|
2016-02-25 22:50:16 +01:00 |
|
Mario Vavti
|
be27fb5644
|
we have got a button for events in the nav. no need for it in the tabs if we are local.
|
2016-02-25 13:40:15 +01:00 |
|
redmatrix
|
ebfa1a12b9
|
when creating an event from a post in our stream, if the original post was private, set the event permissions to "just me". If it was a public event, set the event permissions to the channel default permissions.
|
2016-02-25 00:36:35 -08:00 |
|
redmatrix
|
c95d7c69eb
|
issue #216 - calendar sharing
|
2016-02-24 18:54:52 -08:00 |
|
redmatrix
|
7e6febe2a6
|
add 'requires' field to plugin info to list other dependent plugins/addons and disable if dependencies are not installed/enabled
|
2016-02-24 15:19:28 -08:00 |
|
redmatrix
|
b101a8f6fb
|
missing function
|
2016-02-24 11:20:46 -08:00 |
|
redmatrix
|
d074c53889
|
function to process atom stream without actually storing anything
|
2016-02-23 16:34:53 -08:00 |
|
redmatrix
|
edc7c0837b
|
remove bookmark identifier from embedded links since they aren't bookmarkable without an associated taxonomy entry.
|
2016-02-21 18:14:28 -08:00 |
|
redmatrix
|
f1564b4cff
|
retry the move of AccessList to composer format (one or more third-party plugins will likely break as a result)
|
2016-02-21 16:49:49 -08:00 |
|
redmatrix
|
411abdf8a7
|
fix double encoding
|
2016-02-21 14:54:34 -08:00 |
|
redmatrix
|
dfbe2eaf98
|
Revert "move accesslist class to namespace"
This reverts commit a9711895cf.
|
2016-02-20 00:49:37 -08:00 |
|
redmatrix
|
a9711895cf
|
move accesslist class to namespace
|
2016-02-20 19:39:54 +11:00 |
|
redmatrix
|
8882ffc0de
|
ensure auto_channel_create() is executed for all workflows when UNO is set.
|
2016-02-19 19:21:57 -08:00 |
|
redmatrix
|
d004017b01
|
issue #288 allow relative_date() to be translated into languages with more than two plural forms, such as pl.
|
2016-02-19 19:07:07 -08:00 |
|
redmatrix
|
cfa2ac2d0a
|
move dreport to zotlabs\zot namespace
|
2016-02-19 14:02:55 -08:00 |
|
redmatrix
|
ebc66d7008
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2016-02-19 13:36:48 -08:00 |
|
redmatrix
|
3f0eb84ecf
|
get_feature_default() was using filtered view, preventing it from working in all cases
|
2016-02-19 13:34:29 -08:00 |
|
Mario Vavti
|
fbc6c60805
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2016-02-19 22:28:57 +01:00 |
|
Mario Vavti
|
02e82e496e
|
pimp up mod new_channel
|
2016-02-19 22:28:21 +01:00 |
|
redmatrix
|
ca52d39abe
|
finish up the storage move
|
2016-02-19 11:58:17 -08:00 |
|
redmatrix
|
28d07fd6b2
|
move storage assets to zotlabs/storage
|
2016-02-19 00:06:10 -08:00 |
|
redmatrix
|
4512a4cdd4
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2016-02-18 15:26:50 -08:00 |
|
redmatrix
|
342fda94e4
|
Provide Zotlabs\Project and System class for querying details about the project/version info. Move these out of /boot.php
|
2016-02-18 15:24:58 -08:00 |
|
jeroenpraat
|
fe392a3144
|
Removed export temporary from UNO. Removed 'Remove Channel' from UNO, cause a UNO member has only 1 channel, so it's logical to remove the acccount (by experience on UNO hub). Styling oauth settings.
|
2016-02-18 16:53:04 +01:00 |
|
redmatrix
|
c107bcfbd9
|
some necessary doco for set_iconfig()
|
2016-02-18 00:51:36 -08:00 |
|
redmatrix
|
76bf892f9f
|
iconfig - add sharing variable
|
2016-02-18 00:20:08 -08:00 |
|
redmatrix
|
3a84e7051e
|
Merge branch 'iconfig'
|
2016-02-17 16:21:22 -08:00 |
|
redmatrix
|
161050df07
|
format atom event renderings so they are reasonably compatible with GNU-social
|
2016-02-17 15:56:30 -08:00 |
|
redmatrix
|
62e141a89c
|
provide del_iconfig for completeness
|
2016-02-17 14:14:42 -08:00 |
|
redmatrix
|
696c6e88ea
|
iconfig debugging - federation now working
|
2016-02-17 01:05:28 -08:00 |
|
redmatrix
|
a83eb14ff6
|
iconfig debugging
|
2016-02-17 00:42:51 -08:00 |
|
redmatrix
|
41ec5403e1
|
slight changes to set_iconfig - if passed an item structure only update the structure. Update the DB only if passed an item_id. This makes a clean separation of behaviour that's easy to document. One could get into some weird situations the original way which tried to update and sync both.
|
2016-02-16 22:53:27 -08:00 |
|
redmatrix
|
77eb6c5761
|
more work on iconfig
|
2016-02-16 20:49:32 -08:00 |
|
redmatrix
|
89c6cda303
|
allow admin to set and lock features when UNO is enabled
|
2016-02-16 18:58:29 -08:00 |
|
redmatrix
|
64f5d80ff2
|
some iconfig basics
|
2016-02-16 18:15:19 -08:00 |
|
redmatrix
|
bb381daae3
|
update fr strings from transifex
|
2016-02-15 20:32:42 -08:00 |
|
redmatrix
|
4f285911f0
|
form cleanup (profile_photo and cover_photo), admin 'user_approve' not found, missing close div in mood_content.tpl
|
2016-02-14 16:15:55 -08:00 |
|
redmatrix
|
ade91f8190
|
directory modes reversed
|
2016-02-12 14:02:50 -08:00 |
|
redmatrix
|
af7c7642bb
|
whitespace
|
2016-02-11 20:37:30 -08:00 |
|
redmatrix
|
83b5adf194
|
feed dates are always UTC. This means we will need another mechanism to pass localised dates to items_fetch()
|
2016-02-10 23:05:47 -08:00 |
|
redmatrix
|
a26d1794fe
|
feed dates weren't being honoured. When that was fixed they turned out to be reversed.
|
2016-02-10 23:00:40 -08:00 |
|
redmatrix
|
06a1258a9a
|
put a sane lower time limit on content search for public feed requests
|
2016-02-10 19:29:00 -08:00 |
|
redmatrix
|
d31d3df4ea
|
hook changes to support pubsubhubbub
|
2016-02-10 19:12:28 -08:00 |
|
redmatrix
|
91801d2e2c
|
rev update
|
2016-02-10 13:55:51 -08:00 |
|
redmatrix
|
f984502499
|
need to re-arrange a few things for a short vcard
|
2016-02-08 19:33:25 -08:00 |
|
redmatrix
|
315ce6d880
|
lots more zcard tweaks
|
2016-02-08 18:16:42 -08:00 |
|
redmatrix
|
d8e6fd5df0
|
provide get_server_role() to abstract different roles and capabilities
|
2016-02-07 18:11:10 -08:00 |
|
redmatrix
|
021584d782
|
fix uno import by disabling for now
|
2016-02-05 23:45:16 -08:00 |
|
redmatrix
|
a5c111ef4f
|
uno stuff
|
2016-02-05 23:13:33 -08:00 |
|
redmatrix
|
7868e47643
|
more uno groundwork
|
2016-02-05 13:32:15 -08:00 |
|
redmatrix
|
b4e3cd000f
|
rev update
|
2016-02-05 00:06:35 -08:00 |
|