 redmatrix
|
7045b920ef
|
make zid() do the right things when confronted with url fragments
|
2016-08-21 17:38:36 -07:00 |
|
|
redmatrix
|
b6a545b4a2
|
Merge branch 'dev' of https://github.com/git-marijus/hubzilla into git-marijus-dev
|
2016-08-21 16:33:59 -07:00 |
|
 Mario Vavti
|
4f62d7a78f
|
move jotnets to jot and some cleanup (mostly whitespace)
|
2016-08-21 15:43:03 +02:00 |
|
 Andrew Manning
|
1c61e316b4
|
Block export and re-import works. Fixed bug where layout content was not being imported properly.
|
2016-08-20 21:08:15 -04:00 |
|
|
Andrew Manning
|
2d42d58738
|
Layouts list and are selectable for export to the zip file
|
2016-08-20 16:05:27 -04:00 |
|
|
Andrew Manning
|
80ed05d45d
|
Export of pages and their layouts to a zip file works. Bug on importing the exported zip file for pages.
|
2016-08-20 15:22:30 -04:00 |
|
|
redmatrix
|
9fe4bae52f
|
block backdoor delivery of bulk imported items
|
2016-08-19 17:12:48 -07:00 |
|
|
Andrew Manning
|
cf93d9c3b4
|
Merge remote-tracking branch 'upstream/dev' into website-export
|
2016-08-19 19:34:04 -04:00 |
|
|
Andrew Manning
|
40a7d38210
|
Pages populate the available-to-export list. New checkbox class for smaller boxes.
|
2016-08-19 19:32:52 -04:00 |
|
|
redmatrix
|
fa98f4c55d
|
import anomaly
|
2016-08-17 19:44:24 -07:00 |
|
|
Andrew Manning
|
f2e87a204d
|
Progress implementing zip file export
|
2016-08-17 21:25:50 -04:00 |
|
|
Andrew Manning
|
c98b91f514
|
Stash changes for merge with dev
|
2016-08-17 18:19:36 -04:00 |
|
|
redmatrix
|
537401cf27
|
don't set session theme unless logged in.
|
2016-08-16 22:15:51 -07:00 |
|
|
redmatrix
|
b2eede891a
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-08-16 19:01:20 -07:00 |
|
|
redmatrix
|
a2873c18ca
|
get rid of ugly code construct
|
2016-08-16 19:00:38 -07:00 |
|
|
Mario Vavti
|
291b0edbe0
|
rename limited -> custom
|
2016-08-16 08:05:46 +02:00 |
|
|
hubzilla
|
752bb169ed
|
Merge pull request #487 from git-marijus/dev
implement groups in the acl select.
|
2016-08-16 06:59:52 +10:00 |
|
|
Mario Vavti
|
4b101c2240
|
provide group options serverside and minor cleanup
|
2016-08-15 22:54:07 +02:00 |
|
|
redmatrix
|
4facae674d
|
fix attached photo/file permissions on clones
|
2016-08-15 13:18:25 -07:00 |
|
|
redmatrix
|
000861da0d
|
event_store_event hook
|
2016-08-14 18:22:18 -07:00 |
|
|
Andrew Manning
|
6868403383
|
Context help for settings/features page
|
2016-08-14 13:34:52 -04:00 |
|
|
Andrew Manning
|
229cc2ac43
|
Change text for submenu on small screens to be static toggle statement
|
2016-08-14 06:55:02 -04:00 |
|
|
Andrew Manning
|
cb9ac6dd34
|
Replace hardcoded button title in javascript to translatable text
|
2016-08-14 06:46:48 -04:00 |
|
|
Andrew Manning
|
2e7f4c1870
|
Added a disable comments setting to the "Additional features" settings with a corresponding post editor toggle button
|
2016-08-14 06:41:12 -04:00 |
|
|
redmatrix
|
2c8a82713e
|
pending flag not being reset when using autoperms from custom role
|
2016-08-12 18:18:35 -07:00 |
|
|
redmatrix
|
165f442d70
|
pending flag not being reset when using autoperms from custom role
|
2016-08-12 18:17:39 -07: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
|
0637a71669
|
embed filter adjustments
|
2016-08-11 17:34:05 -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
|
45dc995967
|
forum detection was off for forums with custom perms
|
2016-08-10 20:50:32 -07:00 |
|
|
redmatrix
|
e985436b3b
|
forum detection was off for forums with custom perms
|
2016-08-10 20:49:51 -07:00 |
|
|
Mario Vavti
|
82e867a9a8
|
implement acl for folder creation
|
2016-08-10 16:17:09 +02:00 |
|
|
redmatrix
|
5238a27ab3
|
function order reversed
|
2016-08-09 20:50:33 -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
|
5243dd153b
|
use config system.server_role and deprecate 'UNO'
|
2016-08-07 17:29:35 -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 |
|
|
Mario Vavti
|
53a2262fef
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2016-08-05 12:13:50 +02:00 |
|
|
Andrew Manning
|
6a82ff871f
|
Parse bbcode when page loads
|
2016-08-04 19:45:35 -04:00 |
|
|
Andrew Manning
|
05a9f0aa14
|
Convert select bbcode tags including [observer], [baseurl], [sitename]
|
2016-08-03 20:53:51 -04:00 |
|
|
Mario Vavti
|
908e15bc90
|
multi acl: port events
|
2016-08-03 23:57:41 +02:00 |
|
|
Mario Vavti
|
b959641ca8
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2016-08-03 21:17:08 +02:00 |
|
|
Mario Vavti
|
c50bfa07ca
|
multiple acl work
|
2016-08-03 21:16:57 +02:00 |
|
|
redmatrix
|
c4fd0af16d
|
comment policy permissions typo
|
2016-08-02 18:21:43 -07:00 |
|
|
redmatrix
|
3a7d3e3a54
|
This checkin should make all permission modes work correctly with atokens (they should be able to post content if allowed to). It also removes the strict linkage between permissions and connections so any individual permission can be set for any xchan; even those for which you have no connections.
|
2016-08-01 20:12:52 -07:00 |
|