Commit Graph

16628 Commits

Author SHA1 Message Date
redmatrix
a4474b49cb make init static on master also 2016-06-03 20:22:20 -07:00
redmatrix
296957b5b5 minor version roll 2016-05-16 19:39:08 -07:00
redmatrix
0d04a1221a issue #386 (master) 2016-05-16 19:38:38 -07:00
redmatrix
a0dd03ea0e be specific 2016-05-15 17:56:13 -07:00
redmatrix
90353d90dc Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge 2016-05-15 13:22:48 -07:00
redmatrix
c9ce5664d4 roll minor version due to change 2016-05-15 13:22:22 -07:00
redmatrix
c3090d5480 issue #387 2016-05-15 13:20:17 -07:00
jeroenpraat
f48aee5975 stupid git 2016-05-15 09:12:24 +02:00
jeroenpraat
60f6b827f4 the other way around 2016-05-15 09:09:45 +02:00
redmatrix
fffeca59d0 Merge pull request #382 from mjfriaza/dev
Another updated contextual help in Spanish
2016-05-15 16:38:14 +10:00
redmatrix
b14dd0e066 issue #383 2016-05-14 21:05:24 -07:00
Manuel Jiménez Friaza
7ee31276f5 Another updated context help es-es 2016-05-14 12:47:28 +02:00
redmatrix
2d79e75788 SECURITY: edited comment to private post loses privacy info. Not visible in stream but may be visible in feeds 2016-05-12 16:51:20 -07:00
redmatrix
9f57bfb5df update std_version 2016-05-12 16:13:29 -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