Mario Vavti
|
9fcd470aca
|
fix #328 by using a seperate query instead of group_concat
|
2016-03-20 20:26:55 +01:00 |
|
jeroenpraat
|
23419e4c26
|
Update NL + es_ES strings.
|
2016-03-20 14:39:22 +01:00 |
|
Mario Vavti
|
34b42566b6
|
add fixme
|
2016-03-20 02:25:59 +01:00 |
|
Mario Vavti
|
f7ff48f806
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2016-03-20 01:46:13 +01:00 |
|
Mario Vavti
|
30cf56bdb5
|
make >>indicate group members<< in acl selector work again on group > show or group > dont show is selected
|
2016-03-20 01:45:56 +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 |
|
Mario Vavti
|
51cd4e8519
|
missing return false for map link
|
2016-03-19 02:20:59 +01:00 |
|
Mario Vavti
|
bd249b276d
|
add use as cover photo link to photos view
|
2016-03-18 17:49:31 +01:00 |
|
redmatrix
|
b6ae2bff01
|
change rev
|
2016-03-17 18:42:32 -07:00 |
|
redmatrix
|
21c1f89eba
|
SECURITY: DAV authentication issue
|
2016-03-17 18:40:03 -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 |
|
Mario Vavti
|
40162cd6b7
|
some work on profile listing
|
2016-03-17 12:56:55 +01:00 |
|
Mario Vavti
|
a41a05e6c0
|
bring more structure to profiles edit
|
2016-03-17 11:50:53 +01:00 |
|
redmatrix
|
a83cdbeb39
|
typo
|
2016-03-16 22:02:19 -07:00 |
|
redmatrix
|
6d4fe5c56f
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2016-03-16 21:06:15 -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 |
|
git-marijus
|
f7ddd44c2e
|
Merge pull request #327 from anaqreon/ownmapp-typo
Misspelling of ownMapp in homeinstall script
|
2016-03-16 23:10:24 +01:00 |
|
Mario Vavti
|
2165733ddc
|
move buttons to dropdown menu and some cleanup
|
2016-03-16 23:07:29 +01:00 |
|
Mario Vavti
|
d22b21c56f
|
still more janitor work on profiles
|
2016-03-16 13:45:24 +01:00 |
|
redmatrix
|
4188419b30
|
more federation backend work
|
2016-03-15 17:54:06 -07:00 |
|
Mario Vavti
|
d98d7003ed
|
even more janitor work on profiles
|
2016-03-15 21:38:03 +01:00 |
|
Andrew Manning
|
1692380ac7
|
Misspelling of ownMapp
|
2016-03-15 10:54:45 -04:00 |
|
redmatrix
|
01a28ddf8d
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2016-03-15 01:32:41 -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 |
|
jeroenpraat
|
b8e8517725
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2016-03-14 15:46:57 +01:00 |
|
jeroenpraat
|
def0454952
|
update nl + es-es strings
|
2016-03-14 15:43:51 +01:00 |
|
redmatrix
|
2f5862713e
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2016-03-13 18:16:11 -07:00 |
|
redmatrix
|
6729c27b77
|
git update everything
|
2016-03-13 18:15:38 -07:00 |
|
redmatrix
|
fbfa391965
|
Merge pull request #323 from phellmes/de20160313
Update DE translation strings
|
2016-03-14 10:45:54 +11:00 |
|
Mario Vavti
|
38beabb508
|
fix spacing
|
2016-03-13 21:27:29 +01:00 |
|
Mario Vavti
|
a8d5c83251
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2016-03-13 21:19:33 +01:00 |
|
Mario Vavti
|
370a007ee2
|
more janitor work on profiles
|
2016-03-13 21:19:15 +01:00 |
|
redmatrix
|
7747a23a78
|
Merge pull request #324 from einervonvielen/install-script_add-hubsites_stop-hubzilla
Install script: stop of apache, mysql
|
2016-03-14 06:19:18 +11:00 |
|
EinerVonVielen
|
c573670821
|
Install script: Added plugin hubsites and stop of apache, mysql
|
2016-03-13 16:32:34 +01:00 |
|
phellmes
|
a752d44313
|
Update DE translation strings
|
2016-03-13 13:29:14 +01:00 |
|
redmatrix
|
9406ff714b
|
Merge pull request #322 from einervonvielen/homeinstall_with_plugins
Added installation of extended plugins and themes to homeinstall script
|
2016-03-13 15:21:00 +11: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 |
|
EinerVonVielen
|
b2563528ee
|
Added installation of extended plugins and themes to homeinstall script
|
2016-03-13 02:37:38 +01:00 |
|
redmatrix
|
70ad69d38c
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2016-03-12 16:47:11 -08:00 |
|
redmatrix
|
cb0c43bc68
|
provide service federation overview - how to go about it and the appropriate places to attach your plugin.
|
2016-03-12 16:45:53 -08:00 |
|
Mario Vavti
|
7efffbf102
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2016-03-12 22:14:08 +01:00 |
|
Mario Vavti
|
2d8deb6082
|
some janitor work on profiles
|
2016-03-12 22:13:46 +01:00 |
|
Jeroen van Riet Paap
|
5de79cdb10
|
Merge pull request #321 from einervonvielen/fix_german_help_link_to_github
Fix: german help > link to of project in github
|
2016-03-12 22:04:56 +01:00 |
|
EinerVonVielen
|
6837c2ef1e
|
Fix: German help > link to of project in github. The link Pointed to
redmatrix.
Now the link points to hubzilla.
|
2016-03-12 21:46:13 +01:00 |
|
Mario Vavti
|
4e9440396c
|
remove superfluous return
|
2016-03-11 10:54:04 +01:00 |
|