 redmatrix
|
72f3f7c172
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2016-02-28 15:07:00 -08:00 |
|
|
redmatrix
|
713a796d9f
|
revup
|
2016-02-28 15:06:42 -08:00 |
|
 jeroenpraat
|
69c6d8b617
|
update es-es strings
|
2016-02-28 17:33:22 +01:00 |
|
 Haakon Meland Eriksen
|
e084a85e79
|
Merge remote-tracking branch 'upstream/master'
|
2016-02-28 09:10:39 +01:00 |
|
|
redmatrix
|
a1f046992d
|
I haven't investigated 'why', but the addition of the router class in https://github.com/redmatrix/hubzilla/commit/1db3409f36f408bfc49816e1fab3df4b53b8f19e resulted in the setup global variable $install_wizard_pass to not get initiated at the global level when the setup module file was included. This corrects the situation and makes install work but without explaining why the variable wasn't instantiated in the first place. This may be important - if any other modules use global variables internally. I don't believe that any do, but the behaviour needs to be resolved or documented.
|
2016-02-27 17:27:46 -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 |
|
|
redmatrix
|
44797fe988
|
Merge pull request #302 from phellmes/de20160227
Update DE translation strings
|
2016-02-28 09:57:04 +11:00 |
|
|
Haakon Meland Eriksen
|
c5333b5187
|
Merge remote-tracking branch 'upstream/master'
|
2016-02-27 21:40:00 +01:00 |
|
 Mario Vavti
|
2d045a12bf
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2016-02-27 16:52:11 +01:00 |
|
|
Mario Vavti
|
a2fe22412f
|
missing include
|
2016-02-27 16:51:54 +01:00 |
|
|
jeroenpraat
|
df69465357
|
update NL strings
|
2016-02-27 15:56:45 +01:00 |
|
 phellmes
|
e4361cb202
|
Update DE translation strings
|
2016-02-27 14:28:06 +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 |
|
|
Haakon Meland Eriksen
|
cf5383fdbe
|
Merge remote-tracking branch 'upstream/master'
|
2016-02-27 11:24:02 +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
|
df57c90d2d
|
several photo item template fixes
|
2016-02-26 14:25:18 +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 |
|
|
redmatrix
|
2a0d4a2011
|
Merge pull request #299 from git-marijus/master
we have got a button for events in the nav. no need for it in the tab…
|
2016-02-26 06:27:42 +11: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 |
|
|
Haakon Meland Eriksen
|
21f2df399d
|
Merge remote-tracking branch 'upstream/master'
|
2016-02-25 06:05:12 +01:00 |
|
|
redmatrix
|
43521bb10b
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2016-02-24 18:56:04 -08:00 |
|
|
redmatrix
|
c95d7c69eb
|
issue #216 - calendar sharing
|
2016-02-24 18:54:52 -08:00 |
|
|
jeroenpraat
|
f12b0fe316
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2016-02-25 02:05:16 +01:00 |
|
|
jeroenpraat
|
8944d7a7a2
|
another dutch update
|
2016-02-25 02:03:58 +01:00 |
|
|
redmatrix
|
6300f47cdc
|
schema change to support channel move (a completely different operation than channel clone)
|
2016-02-24 17:00:16 -08:00 |
|
|
redmatrix
|
2b95580cc0
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2016-02-24 16:41:46 -08:00 |
|
|
jeroenpraat
|
93b84f1262
|
interim dutch string update
|
2016-02-25 01:39:50 +01:00 |
|
|
jeroenpraat
|
1ffae1327f
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2016-02-25 01:05:31 +01:00 |
|
|
jeroenpraat
|
01a8292d65
|
fix TOS
|
2016-02-25 01:04:37 +01:00 |
|
|
Mario Vavti
|
9d3ce55978
|
fix boxy scheme
|
2016-02-25 00:24:58 +01: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 |
|
|
Mario Vavti
|
e73df9ed1d
|
give nav dropdowns a fixed width to preventtext-overflow: ellipsis cut of to much of the text in some situations
|
2016-02-24 23:16:42 +01:00 |
|
|
redmatrix
|
b101a8f6fb
|
missing function
|
2016-02-24 11:20:46 -08:00 |
|
|
Haakon Meland Eriksen
|
ddeab48f9b
|
Merge remote-tracking branch 'upstream/master'
|
2016-02-24 17:44:27 +01:00 |
|
|
redmatrix
|
d074c53889
|
function to process atom stream without actually storing anything
|
2016-02-23 16:34:53 -08:00 |
|
|
git-marijus
|
039eb58524
|
Merge pull request #297 from bashrc/bashrc/comma
Remove stray comma
|
2016-02-23 22:53:14 +01:00 |
|
 Bob Mottram
|
29c9e7c0a2
|
Remove stray comma
|
2016-02-23 19:50:45 +00:00 |
|