 Mario Vavti
|
bdbbe00bdf
|
Merge branch 'dev' into sabre32
|
2016-06-11 20:12:41 +02:00 |
|
 redmatrix
|
96cd63cf1a
|
iconfig sharing not set correctly
|
2016-06-10 22:41:58 -07:00 |
|
|
redmatrix
|
974ca9d526
|
move dev forward
|
2016-06-10 14:26:14 -07:00 |
|
|
Mario Vavti
|
86985b454f
|
Merge branch 'dev' into sabre32
|
2016-06-10 12:22:01 +02:00 |
|
|
redmatrix
|
c55a7b5f36
|
changelog update
|
2016-06-10 03:16:15 -07:00 |
|
|
hubzilla
|
beb55235c6
|
Merge pull request #410 from anaqreon/wiki
Wiki module: first iteration
|
2016-06-10 20:03:08 +10:00 |
|
|
Mario Vavti
|
9d5d3a9468
|
Merge branch 'dev' into sabre32
|
2016-06-10 10:45:09 +02:00 |
|
|
redmatrix
|
cf415a4312
|
strings update
|
2016-06-10 01:18:52 -07:00 |
|
|
redmatrix
|
bb3d56a0b2
|
foreach: invalid argument
|
2016-06-09 22:07:27 -07:00 |
|
|
redmatrix
|
8f181bb188
|
change loglevel
|
2016-06-09 20:28:37 -07:00 |
|
|
redmatrix
|
135d84ba37
|
several "to-do" updates
|
2016-06-09 19:06:31 -07:00 |
|
|
redmatrix
|
77442dfcdc
|
add safemode tool
|
2016-06-09 18:34:25 -07:00 |
|
|
redmatrix
|
ed597146fa
|
Create the initial 1.8 changelog entry (subject to further changes)
|
2016-06-09 18:31:42 -07:00 |
|
 Andrew Manning
|
7a242f829f
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-06-09 20:07:09 -04:00 |
|
|
redmatrix
|
ee5372784e
|
remove the automatic ajax page load on pgdn key; it can load content much faster than you can page and potentially lead to memory exhaustion.
|
2016-06-09 16:45:53 -07:00 |
|
|
redmatrix
|
0dcea87b99
|
namespace issue with openid reverse auth
|
2016-06-09 16:20:16 -07:00 |
|
|
redmatrix
|
a10f5e9e06
|
allow an exclusion for transmitting hidden file activities. There may be a better way to do this, but it was pointed out recently that transmitting some hidden activities might cause a problem. I cannot locate the conversation at the moment to summarise the exact issue.
|
2016-06-09 16:11:58 -07:00 |
|
|
Mario Vavti
|
85e82e919e
|
more style work
|
2016-06-09 22:05:52 +02:00 |
|
|
Mario Vavti
|
9b96fe66a6
|
Merge branch 'sabre32' of https://github.com/redmatrix/hubzilla into sabre32
|
2016-06-09 09:10:46 +02:00 |
|
|
Mario Vavti
|
11045b92fb
|
Merge branch 'dev' into sabre32
|
2016-06-09 09:09:13 +02:00 |
|
|
redmatrix
|
2ad5010dc3
|
issue #59
|
2016-06-08 20:00:36 -07:00 |
|
|
redmatrix
|
40bba93a31
|
potential fix to hubzilla-addons issue 16
|
2016-06-08 19:34:11 -07:00 |
|
|
Andrew Manning
|
9410b63bbc
|
Revised permissions checks across API and enabled collaborative editing using the write_pages per-channel permission.
|
2016-06-08 06:26:27 -04:00 |
|
|
Mario Vavti
|
4234c9a194
|
Merge branch 'dev' into sabre32
|
2016-06-08 12:04:45 +02:00 |
|
|
Andrew Manning
|
d43a814385
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-06-08 05:41:13 -04:00 |
|
|
redmatrix
|
e46e7002a8
|
block random_profile from accessing sys channels
|
2016-06-07 22:55:24 -07:00 |
|
|
redmatrix
|
e6d20877b8
|
whitespace
|
2016-06-07 18:27:37 -07:00 |
|
|
redmatrix
|
5ef8199dae
|
Finish the config family
|
2016-06-07 18:17:39 -07:00 |
|
|
Andrew Manning
|
e86e666c22
|
Javascript only allows saving a page if the content has changed.
|
2016-06-07 20:58:14 -04:00 |
|
|
Andrew Manning
|
cf180f6142
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-06-07 20:43:49 -04:00 |
|
|
redmatrix
|
67665a8b9d
|
slight alteration to the base description
|
2016-06-07 16:37:04 -07:00 |
|
|
redmatrix
|
a50e555515
|
'recent photos' query was buggered, also fix issue #163 by adding configurable sort order to the album widget - default is album name ascending
|
2016-06-07 16:23:14 -07:00 |
|
|
Mario Vavti
|
75b97cafb0
|
Merge branch 'dev' into sabre32
|
2016-06-07 09:43:14 +02:00 |
|
|
redmatrix
|
037cd74e8e
|
rename admin/users to admin/accounts, provide sortable columns in account and channel summaries - issue #255
|
2016-06-06 19:44:22 -07:00 |
|
|
redmatrix
|
82a81cd01f
|
new utility: util/safemode (on or off); requires util/addons
|
2016-06-06 16:34:10 -07:00 |
|
|
Mario Vavti
|
655290b022
|
Merge branch 'sabre32' of https://github.com/redmatrix/hubzilla into sabre32
|
2016-06-06 14:14:40 +02:00 |
|
|
Mario Vavti
|
b886a40471
|
Merge branch 'dev' into sabre32
|
2016-06-06 09:39:56 +02:00 |
|
|
redmatrix
|
c0d80a5828
|
adjust the autocomplete regex slightly to account for emoji names
|
2016-06-05 22:38:44 -07:00 |
|
|
redmatrix
|
adecd2960e
|
move pconfig to static class
|
2016-06-05 22:18:17 -07:00 |
|
|
redmatrix
|
9afecaaffe
|
We need a laugh icon more than we need a cry icon.
|
2016-06-05 20:16:33 -07:00 |
|
|
Andrew Manning
|
2af8105b46
|
Hide page history viewer when viewing sandbox
|
2016-06-05 21:14:30 -04:00 |
|
|
Andrew Manning
|
4528becf4c
|
Remove debugging logger statements
|
2016-06-05 20:52:40 -04:00 |
|
|
Andrew Manning
|
d2a7f83bb5
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-06-05 20:31:34 -04:00 |
|
|
Andrew Manning
|
b8b50bdb5a
|
Custom commit message available. Improved history viewer and feedback from revert buttons.
|
2016-06-05 20:30:45 -04:00 |
|
|
redmatrix
|
4485142a25
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-06-05 17:01:03 -07:00 |
|
|
redmatrix
|
2a6afeb9a7
|
I don't know how to make this any clearer: "For these reasons we strongly recommend that you do NOT install addons from third-party repositories."
|
2016-06-05 16:59:45 -07:00 |
|
 jeroenpraat
|
e2245446a3
|
Updating NL + es_ES strings
|
2016-06-06 01:18:18 +02:00 |
|
|
Andrew Manning
|
08a9553ccc
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-06-05 16:52:02 -04:00 |
|
|
Andrew Manning
|
0a3fbdd128
|
Basic page reversion implemented. The revert button on the history view replaces the editor text but does not save the page.
|
2016-06-05 16:32:03 -04:00 |
|
|
Mario Vavti
|
cfbd2fc85c
|
Merge branch 'dev' into sabre32
|
2016-06-05 20:04:12 +02:00 |
|