Mario Vavti
|
8c2b93da72
|
Merge branch '1.10RC' into dev
|
2016-07-20 20:44:20 +02:00 |
|
Mario Vavti
|
ca82b45fe4
|
fix /mail wsod issue reported by giac hellvecio
|
2016-07-20 20:43:12 +02:00 |
|
zottel
|
43def0873e
|
Merge remote-tracking branch 'upstream/dev' into dev
|
2016-07-20 14:53:58 +02:00 |
|
Andrew Manning
|
da49befb18
|
Wiki delete page confirmation and max image width
|
2016-07-20 05:44:29 -04:00 |
|
Andrew Manning
|
e0d9d30bcf
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-07-20 05:39:08 -04:00 |
|
Andrew Manning
|
99f7dd0fd4
|
Merge remote-tracking branch 'upstream/dev' into website-import
|
2016-07-20 05:38:19 -04:00 |
|
Andrew Manning
|
0c7ad924a8
|
Starting to make the import selection page after element scan.
|
2016-07-20 05:33:40 -04:00 |
|
redmatrix
|
a3e5307b93
|
fix the forum detection in include/zot
|
2016-07-19 22:57:23 -07:00 |
|
redmatrix
|
ae6256f95a
|
another couple of minor perms fixes
|
2016-07-19 22:32:22 -07:00 |
|
redmatrix
|
a961d5e6c8
|
permission fixes
|
2016-07-19 20:49:54 -07:00 |
|
redmatrix
|
237cca7a0d
|
fixes to perms
|
2016-07-19 19:33:48 -07:00 |
|
redmatrix
|
2c9938f0d5
|
add test sequence
|
2016-07-19 18:41:36 -07:00 |
|
redmatrix
|
ea83032863
|
translate more old perms calls
|
2016-07-19 17:52:45 -07:00 |
|
redmatrix
|
6a4573b935
|
Merge branch 'dev' into perms
|
2016-07-19 17:05:59 -07:00 |
|
redmatrix
|
9421e42dad
|
doc correction
|
2016-07-19 17:04:38 -07:00 |
|
redmatrix
|
f4b658d7b1
|
issue #411
|
2016-07-19 05:13:18 -07:00 |
|
redmatrix
|
7272b97e9a
|
yet more grungy perms work.
|
2016-07-19 01:26:28 -07:00 |
|
redmatrix
|
8a9f062b95
|
Merge branch 'dev' into perms
|
2016-07-18 22:35:31 -07:00 |
|
redmatrix
|
eac35c05e9
|
Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_merge
|
2016-07-18 22:34:16 -07:00 |
|
redmatrix
|
07b96f2430
|
runaway cron emails
|
2016-07-18 22:34:07 -07:00 |
|
redmatrix
|
269b3cef72
|
runaway cron emails
|
2016-07-18 22:33:26 -07:00 |
|
redmatrix
|
99cf2cbaa9
|
missing bracket
|
2016-07-18 21:46:40 -07:00 |
|
redmatrix
|
b63165b6e0
|
more perms work (a lot more)
|
2016-07-18 21:37:34 -07:00 |
|
redmatrix
|
32ce790717
|
move legacy code inside the legacy check
|
2016-07-18 19:09:27 -07:00 |
|
redmatrix
|
b5b57523f1
|
more perms work
|
2016-07-18 16:45:43 -07:00 |
|
redmatrix
|
7524948a97
|
Merge branch 'dev' into perms
|
2016-07-18 16:10:41 -07:00 |
|
redmatrix
|
f9b67d3630
|
more perms work
|
2016-07-18 13:44:39 -07:00 |
|
Mario Vavti
|
3beb94dc52
|
whitespace
|
2016-07-18 13:52:26 +02:00 |
|
Mario Vavti
|
4371e6ad97
|
resolve merge conflict
|
2016-07-18 13:50:32 +02:00 |
|
Mario Vavti
|
f44ca74e99
|
do not transform hashes to tags in [code=xxx] or [code] blocks
|
2016-07-18 13:48:09 +02:00 |
|
zottel
|
8bbe2569dc
|
Merge remote-tracking branch 'upstream/dev' into dev
|
2016-07-18 11:53:23 +02:00 |
|
redmatrix
|
10fa5c20e7
|
export/import channel permissions
|
2016-07-17 22:40:39 -07:00 |
|
redmatrix
|
f7833411a1
|
clone channel perms
|
2016-07-17 22:18:35 -07:00 |
|
redmatrix
|
de4f9d68bd
|
Merge branch 'dev' into perms
|
2016-07-17 21:40:04 -07:00 |
|
redmatrix
|
571b8cc85b
|
roll version
|
2016-07-17 19:57:19 -07:00 |
|
redmatrix
|
883fc5d753
|
update changelog
|
2016-07-17 19:56:32 -07:00 |
|
redmatrix
|
25b2a6e0cf
|
update changelog
|
2016-07-17 19:54:59 -07:00 |
|
redmatrix
|
4febdc3bcd
|
jquery update issue prevents comments from reloading and resetting watch cursor
|
2016-07-17 18:33:45 -07:00 |
|
redmatrix
|
c3617f5d1e
|
jquery update issue prevents comments from reloading and resetting watch cursor
|
2016-07-17 18:32:38 -07:00 |
|
redmatrix
|
fc78ba7c2f
|
change std_version
|
2016-07-17 16:38:21 -07:00 |
|
redmatrix
|
279359c1bd
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-07-17 16:05:46 -07:00 |
|
redmatrix
|
dc9fa7cf64
|
include attach.php at the module level since 2d4b75428a87038 wasn't backported to dev and we're about to branch an RC
|
2016-07-17 16:04:00 -07:00 |
|
Andrew Manning
|
d6b28cdc57
|
Importing webpage elements from manually entered cloud file path work. All detected elements are automatically imported.
|
2016-07-17 16:05:26 -04:00 |
|
Andrew Manning
|
75fb065526
|
Merge remote-tracking branch 'upstream/dev' into website-import
|
2016-07-17 11:54:36 -04:00 |
|
Andrew Manning
|
6c5086a933
|
Added functions to check cloud files path and return path with hashed names
|
2016-07-17 11:52:21 -04:00 |
|
Mario Vavti
|
2b674d4cd9
|
hide fullscreen button in embedphotos modal album view
|
2016-07-17 12:54:10 +02:00 |
|
redmatrix
|
5d0ddb3123
|
booboo
|
2016-07-17 02:49:41 -07:00 |
|
Mario Vavti
|
f39d20ac97
|
some work on guest access token ui
|
2016-07-17 11:29:37 +02:00 |
|
Andrew Manning
|
99354ac576
|
Merge remote-tracking branch 'upstream/dev' into website-import-remote
|
2016-07-16 21:04:04 -04:00 |
|
Andrew Manning
|
e7b8531751
|
Stash changes to merge from dev
|
2016-07-16 21:02:13 -04:00 |
|