Commit graph

17491 commits

Author SHA1 Message Date
Mario Vavti
993b182f81 fix javascript error if not logged in 2016-08-14 12:12:37 +02:00
Mario Vavti
82d61f194a update bootstrap 3.3.5 > 3.3.7 2016-08-14 11:49:40 +02:00
Mario Vavti
541d0dce90 btn/dropdown rendering issue 2016-08-14 11:31:00 +02:00
Mario Vavti
6f0ac133cc remove js debugging 2016-08-13 22:27:53 +02:00
Mario Vavti
1b90e851f9 fix #480, enable bbcode autocomplete for photo comments and remove some redundant javascript 2016-08-13 22:17:47 +02:00
redmatrix
165f442d70 pending flag not being reset when using autoperms from custom role 2016-08-12 18:17:39 -07:00
redmatrix
5365e9b3a5 string update 2016-08-12 14:45:16 -07:00
hubzilla
2aa1450ab2 Merge pull request #479 from git-marijus/dev
possible quickfix for multi-acl not honoring jotnets
2016-08-13 07:37:45 +10:00
zottel
dc3cc655db fix auto-connect setting 2016-08-12 23:27:03 +02:00
zottel
e4bdc92834 Merge remote-tracking branch 'upstream/dev' into dev 2016-08-12 20:43:05 +02:00
Mario Vavti
87a74a44d3 possible quickfix for multi-acl not honoring jotnets 2016-08-12 17:40:22 +02:00
redmatrix
ebbe18a426 better method of dealing with api versions 2016-08-11 20:09:38 -07:00
redmatrix
6bc5dd75bd more cleanup of api 2016-08-11 19:42:44 -07:00
redmatrix
0257d660ad move error processing back inside the function 2016-08-11 18:09:48 -07:00
redmatrix
c63deda71a embed filter adjustments 2016-08-11 17:33:28 -07:00
redmatrix
3ba4b2c1c1 A bit of api cleanup. Don't get excited. This is like a 0.005% cleanup but you have to start somewhere. 2016-08-11 17:02:52 -07:00
redmatrix
e985436b3b forum detection was off for forums with custom perms 2016-08-10 20:49:51 -07:00
redmatrix
a8a3812890 optimise Onepoll so it doesn't try and fetch posts for a channel that we've not given permission to send us their stream and posts. Currently the posts are fetched, processed, and ultimately discarded. Since we know they are going to be discarded, there's not much point fetching them in the first place. 2016-08-10 20:01:52 -07:00
redmatrix
6c672d2575 initialise jot editor if it is used as a file drop target and isn't yet opened. 2016-08-10 19:38:20 -07:00
redmatrix
99c5aca78b update CHANGELOG for 1.12 2016-08-10 17:36:10 -07:00
redmatrix
b587bdf863 new version 2016-08-10 16:57:14 -07:00
Mario Vavti
82e867a9a8 implement acl for folder creation 2016-08-10 16:17:09 +02:00
zottel
8706cbe1c4 Merge remote-tracking branch 'upstream/dev' into dev 2016-08-10 13:49:48 +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
zottel
6ba142fd33 Merge remote-tracking branch 'upstream/dev' into dev 2016-08-05 09:17:00 +02: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