redmatrix
|
5c3b06b8a9
|
issue #496
|
2016-08-21 16:29:16 -07:00 |
|
redmatrix
|
38de583db0
|
Use double quotes for strings passed via templates to javascript. Some translated strings have unescaped single quotes.
|
2016-08-15 17:20:29 -07:00 |
|
redmatrix
|
055ee75302
|
Merge branch '1.12RC' of https://github.com/redmatrix/hubzilla into 1.12RC_merge
|
2016-08-15 13:19:34 -07:00 |
|
Einer von Vielen
|
f95011a565
|
Merge dev with last changes of homeinstall script in master
|
2016-08-15 13:19:20 -07:00 |
|
Mario Vavti
|
6bb5ea7a81
|
Merge branch '1.12RC' of https://github.com/redmatrix/hubzilla into 1.12RC
|
2016-08-15 11:22:20 +02:00 |
|
Mario Vavti
|
efcde8f3dd
|
update bootstrap 3.3.5 > 3.3.7
|
2016-08-15 11:21:57 +02:00 |
|
Mario Vavti
|
057266653b
|
fix javascript error if not logged in
|
2016-08-15 11:20:51 +02:00 |
|
Mario Vavti
|
2755c74c29
|
btn/dropdown rendering issue
|
2016-08-14 11:31:44 +02:00 |
|
hubzilla
|
5ad5afe63b
|
Merge pull request #481 from anaqreon/issue-475
Fixed bug preventing images in root photo album from loading in embed…
|
2016-08-14 09:54:12 +10:00 |
|
Mario Vavti
|
2c3843ee4c
|
remove js debugging
|
2016-08-13 22:28:40 +02:00 |
|
Mario Vavti
|
e5d1dd111e
|
fix #480, enable bbcode autocomplete for photo comments and remove some redundant javascript
|
2016-08-13 22:20:54 +02:00 |
|
Andrew Manning
|
125713e938
|
Fix for older photos not being embedded by the embedphotos tool.
|
2016-08-13 14:38:13 -04:00 |
|
Andrew Manning
|
e128ff4e8f
|
Fixed bug preventing images in root photo album from loading in embedphotos dialog.
|
2016-08-13 14:20:41 -04:00 |
|
redmatrix
|
2c8a82713e
|
pending flag not being reset when using autoperms from custom role
|
2016-08-12 18:18:35 -07:00 |
|
zottel
|
7d2a17ea6e
|
fix auto-connect setting
|
2016-08-12 14:44:48 -07:00 |
|
Mario Vavti
|
91b8c769bd
|
possible quickfix for multi-acl not honoring jotnets
|
2016-08-12 14:44:47 -07:00 |
|
redmatrix
|
0637a71669
|
embed filter adjustments
|
2016-08-11 17:34:05 -07:00 |
|
redmatrix
|
45dc995967
|
forum detection was off for forums with custom perms
|
2016-08-10 20:50:32 -07:00 |
|
redmatrix
|
d8240a40b7
|
update CHANGELOG for 1.12
|
2016-08-10 17:35:07 -07:00 |
|
redmatrix
|
adf34fb201
|
update version
|
2016-08-10 16:54:57 -07:00 |
|
Mario Vavti
|
82e867a9a8
|
implement acl for folder creation
|
2016-08-10 16:17:09 +02:00 |
|
redmatrix
|
7a557d31e0
|
open editor or comment window when linkdropping to a closed window. We probably also need this for filedropping.
|
2016-08-10 01:35:58 -07:00 |
|
redmatrix
|
de12503fad
|
allow dropping links on comments as well as posts
|
2016-08-09 22:52:14 -07:00 |
|
redmatrix
|
5238a27ab3
|
function order reversed
|
2016-08-09 20:50:33 -07:00 |
|
redmatrix
|
12162f53b4
|
You can drag links to the editor (which will be parsed and inserted); as well as files (which will be uploaded)
|
2016-08-09 18:13:54 -07:00 |
|
redmatrix
|
ec3ca11d0d
|
bad code format
|
2016-08-09 16:59:35 -07:00 |
|
redmatrix
|
07dca90352
|
updates to hcard parsing
|
2016-08-07 21:00:23 -07:00 |
|
redmatrix
|
3338f3c5b2
|
diaspora vcard updates
|
2016-08-07 20:16:14 -07:00 |
|
redmatrix
|
de455e4cd0
|
server roles
|
2016-08-07 17:40:56 -07:00 |
|
redmatrix
|
5243dd153b
|
use config system.server_role and deprecate 'UNO'
|
2016-08-07 17:29:35 -07:00 |
|
redmatrix
|
e1659b0725
|
fix cloud path
|
2016-08-07 16:21:51 -07:00 |
|
Mario Vavti
|
89c026924b
|
fix /cloud upload for images
|
2016-08-06 14:40:23 +02:00 |
|
Mario Vavti
|
4f0b138692
|
bring back acl for cloud file uploads
|
2016-08-06 12:46:10 +02:00 |
|
redmatrix
|
b6db0f72f5
|
strings update
|
2016-08-05 15:40:20 -07:00 |
|
redmatrix
|
9068ae68ad
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-08-05 15:40:10 -07:00 |
|
hubzilla
|
1bff63bd2e
|
Merge pull request #477 from git-marijus/dev
Some work to make multiple acl forms per page work
|
2016-08-06 07:50:21 +10:00 |
|
Mario Vavti
|
531baa8fc4
|
Revert "Revert "remove some logging""
This reverts commit e67f5bc6bb.
|
2016-08-05 16:05:21 +02:00 |
|
Mario Vavti
|
e67f5bc6bb
|
Revert "remove some logging"
This reverts commit 316b090433.
|
2016-08-05 15:19:17 +02:00 |
|
Mario Vavti
|
316b090433
|
remove some logging
|
2016-08-05 14:53:46 +02:00 |
|
Mario Vavti
|
b2298d44a4
|
multi acl: port /settings
|
2016-08-05 14:45:06 +02:00 |
|
Mario Vavti
|
c029839971
|
multi acl: port /display
|
2016-08-05 14:25:37 +02:00 |
|
Mario Vavti
|
e7e73e6fd1
|
multi acl: port /thing
|
2016-08-05 13:37:47 +02:00 |
|
Mario Vavti
|
bed0a5773f
|
multi acl: port /rpost
|
2016-08-05 13:20:03 +02:00 |
|
Mario Vavti
|
53a2262fef
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2016-08-05 12:13:50 +02:00 |
|
hubzilla
|
709206accd
|
Merge pull request #476 from anaqreon/wiki
Wiki bbcode parsing
|
2016-08-05 18:03:31 +10:00 |
|
redmatrix
|
eeabf514ea
|
minor cleanup on ratings - no real functional changes at this time
|
2016-08-04 18:56:05 -07:00 |
|
Andrew Manning
|
faf1045ef5
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-08-04 19:48:59 -04:00 |
|
Andrew Manning
|
6a82ff871f
|
Parse bbcode when page loads
|
2016-08-04 19:45:35 -04:00 |
|
Mario Vavti
|
7e5428c697
|
multi acl: provide a acl-form-trigger class which comes handy in certain situations
|
2016-08-04 21:26:30 +02:00 |
|
Mario Vavti
|
036b72757c
|
multi acl: port /wiki
|
2016-08-04 12:09:06 +02:00 |
|