redmatrix
|
2f222546da
|
Comanche: provide a variable '$region' which can be used within a layout to make content aware of where it is on the page. For instance this can be passed as a variable to a widget and trigger either a vertical or horizontal layout depending on which region it is assigned to.
|
2016-05-12 21:18:34 -07:00 |
|
redmatrix
|
522fec5763
|
split off feed handling stuff from include/items
|
2016-05-12 20:21:04 -07:00 |
|
redmatrix
|
f2fc7d25c5
|
remove the rarely if ever used filter_insecure() function. We will provide this functionality in other ways.
|
2016-05-12 20:02:16 -07:00 |
|
redmatrix
|
781716277b
|
SECURITY: a comment to a private post that has been edited (the comment has been edited) loses its privacy settings. This comment isn't visible in the stream but may be visible in feeds.
|
2016-05-12 16:47:03 -07:00 |
|
redmatrix
|
4d00c48026
|
back merge
|
2016-05-12 16:11:38 -07:00 |
|
redmatrix
|
8fe8341d93
|
Merge pull request #379 from mjfriaza/dev
Updated contextual help in Spanish
|
2016-05-13 09:08:52 +10:00 |
|
redmatrix
|
57273db8a6
|
Merge pull request #378 from anaqreon/plugin-init
Create store/git/sys/extend/addon directory and link if it does not e…
|
2016-05-13 09:08:30 +10:00 |
|
Manuel Jiménez Friaza
|
bc9f88f3f9
|
Updated contextual help in Spanish
|
2016-05-12 19:56:05 +02:00 |
|
Andrew Manning
|
70d413ab04
|
Create store/git/sys/extend/addon directory and link if it does not exist in all plugin repo GUI POST actions
|
2016-05-12 06:49:24 -04:00 |
|
redmatrix
|
ac1ec99684
|
Merge branch 'dev'
|
2016-05-11 20:20:17 -07:00 |
|
redmatrix
|
8e5718bf04
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-05-11 20:18:42 -07:00 |
|
redmatrix
|
89561bec4f
|
move dev pointer past current release
|
2016-05-11 20:18:11 -07:00 |
|
redmatrix
|
fae78b947f
|
push point release
|
2016-05-11 20:16:57 -07:00 |
|
redmatrix
|
d35dfc12ce
|
Merge pull request #377 from anaqreon/chat-notify
Chat browser notifications
|
2016-05-12 11:39:41 +10:00 |
|
redmatrix
|
69112a17ac
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-05-11 17:27:48 -07:00 |
|
redmatrix
|
32ad8bbaac
|
Ensure that channels can't be created with DAV reserved paths as a redress. Sabre mentions in several places that trying to change these paths to other strings; while possible - is unsupported and likely to cause problems. So for now, we're stuck with 'principals', 'addressbooks', and 'calendars'. If you already have these redresses on your site, you're basically buggered.
|
2016-05-11 17:18:17 -07:00 |
|
Andrew Manning
|
913d07a4a7
|
Merge remote-tracking branch 'upstream/dev' into chat-notify
|
2016-05-11 20:08:54 -04:00 |
|
Andrew Manning
|
b40d8070f3
|
Browser notification issued when member enters chat room
|
2016-05-11 20:02:19 -04:00 |
|
redmatrix
|
1fb21b781f
|
Merge pull request #376 from anaqreon/plugin-repo
Check if target directories are writable when adding, updating, or removing plugin repos
|
2016-05-12 08:57:22 +10:00 |
|
Mario Vavti
|
25df2080ea
|
more whitespace
|
2016-05-11 22:31:05 +02:00 |
|
Mario Vavti
|
5632022d79
|
whitespace
|
2016-05-11 22:23:13 +02:00 |
|
Andrew Manning
|
d968fc51ea
|
Merge remote-tracking branch 'upstream/dev' into plugin-repo
|
2016-05-11 05:54:20 -04:00 |
|
Andrew Manning
|
c7698e4dc3
|
Check if target directories are writable when adding, updating, or removing plugin repos
|
2016-05-11 05:53:23 -04:00 |
|
redmatrix
|
4dd3839c41
|
provide repository versions on admin summary page and an upgrade message if you're behind master
|
2016-05-10 21:46:04 -07:00 |
|
redmatrix
|
9caaa9397e
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-05-10 19:42:37 -07:00 |
|
redmatrix
|
915bd2ec77
|
sabre upgrade
|
2016-05-10 19:40:15 -07:00 |
|
redmatrix
|
ba64b11ac0
|
Merge pull request #375 from anaqreon/plugin-repo
Plugin repo
|
2016-05-11 11:07:35 +10:00 |
|
Andrew Manning
|
40e3d37a72
|
Remove debugging lines
|
2016-05-10 21:01:47 -04:00 |
|
Andrew Manning
|
2882eef42f
|
Link plugins in the newly installed addon repo to /addon so they are accessible
|
2016-05-10 21:00:10 -04:00 |
|
redmatrix
|
0b02a6d123
|
initial sabre upgrade (needs lots of work - to wit: authentication, redo the browser interface, and rework event export/import)
|
2016-05-10 17:26:44 -07:00 |
|
redmatrix
|
40b5b6e9d2
|
Merge pull request #374 from anaqreon/plugin-repo
Delete existing repo if the new one has a different URL. Fixed bug th…
|
2016-05-10 21:11:35 +10:00 |
|
Andrew Manning
|
78b40e6363
|
Delete existing repo if the new one has a different URL. Fixed bug that could cause repeated installation.
|
2016-05-10 06:28:00 -04:00 |
|
Mario Vavti
|
45c19e365d
|
another public -> pubstream
|
2016-05-10 10:40:36 +02:00 |
|
redmatrix
|
2469853175
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-05-10 01:31:15 -07:00 |
|
redmatrix
|
0c5434d5e3
|
try again with shutdown handler, fix issue #373 (live-pubstream div wasn't present
|
2016-05-10 01:30:22 -07:00 |
|
Mario Vavti
|
8ab7707898
|
allow delayed publishing of webpages
|
2016-05-10 10:02:27 +02:00 |
|
redmatrix
|
baa7020036
|
revert shutdown function
|
2016-05-09 22:28:54 -07:00 |
|
redmatrix
|
f658a3cae1
|
more work on diaspora relay
|
2016-05-09 20:17:59 -07:00 |
|
redmatrix
|
a674b05e96
|
register shutdown procedure
|
2016-05-09 19:13:27 -07:00 |
|
redmatrix
|
b7e7ef0bf3
|
Merge pull request #372 from anaqreon/plugin-repo
Manage addon git repositories via the admin plugins page
|
2016-05-10 12:12:20 +10:00 |
|
Andrew Manning
|
0b8a7f1bd0
|
Merge remote-tracking branch 'upstream/dev' into plugin-repo
|
2016-05-09 22:00:21 -04:00 |
|
Andrew Manning
|
9c8cf7d433
|
Fixed some bugs with empty repo name and improved the interface a bit.
|
2016-05-09 21:59:27 -04:00 |
|
Andrew Manning
|
180731c162
|
copy-paste error
|
2016-05-09 21:17:47 -04:00 |
|
redmatrix
|
ea1173f8f6
|
Merge pull request #371 from Treer/permissions
minor cleanup. No functional changes
|
2016-05-10 06:13:05 +10:00 |
|
Treer
|
ef97e5a063
|
minor cleanup. No functional changes
|
2016-05-10 00:15:57 +10:00 |
|
Mario Vavti
|
61909d2480
|
if we do not have a layout $layout should be empty not default
|
2016-05-09 12:24:48 +02:00 |
|
Mario Vavti
|
7aeff7505b
|
remove unused code and whitespace
|
2016-05-09 12:09:04 +02:00 |
|
Mario Vavti
|
a3e94591bc
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2016-05-09 11:58:10 +02:00 |
|
Mario Vavti
|
24c1dc528d
|
make editwebpage use status_editor() and fix storing of layout on webpage creation
|
2016-05-09 11:56:42 +02:00 |
|
redmatrix
|
6f486a3393
|
prevent recursion in the database driver when debugging is enabled and the system config is not yet loaded - caused by calling get_config and making db calls within the logger function; which we then attempt to log...
|
2016-05-09 01:12:24 -07:00 |
|