Mario Vavti
|
4b101c2240
|
provide group options serverside and minor cleanup
|
2016-08-15 22:54:07 +02: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 |
|
redmatrix
|
4facae674d
|
fix attached photo/file permissions on clones
|
2016-08-15 13:18:25 -07:00 |
|
redmatrix
|
39005634c6
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-08-15 13:18:05 -07:00 |
|
hubzilla
|
2e452f5b27
|
Merge pull request #488 from einervonvielen/dev_homeinstall_merge_master-dev
Merge dev with last changes of homeinstall script in master
|
2016-08-16 06:17:44 +10:00 |
|
Einer von Vielen
|
9e9e0ebb1c
|
Merge dev with last changes of homeinstall script in master
|
2016-08-15 20:12:00 +02:00 |
|
Mario Vavti
|
dd8d20f089
|
implement groups in the acl select. please notice that selecting *custom selection* now sets an empty (public) acl. it was set to self before...
|
2016-08-15 18:52:27 +02: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 |
|
redmatrix
|
8cbffdf0b4
|
s/$rr/$rv/
|
2016-08-14 22:44:25 -07:00 |
|
redmatrix
|
000861da0d
|
event_store_event hook
|
2016-08-14 18:22:18 -07:00 |
|
hubzilla
|
7ae097ef6b
|
Merge pull request #484 from anaqreon/settings-context
Context help for settings/features page
|
2016-08-15 06:32:30 +10:00 |
|
Andrew Manning
|
6868403383
|
Context help for settings/features page
|
2016-08-14 13:34:52 -04:00 |
|
hubzilla
|
d1cb925b59
|
Merge pull request #482 from anaqreon/nocomment
Added an optional post editor button to toggle comments
|
2016-08-14 21:24:24 +10: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 |
|
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
|
2755c74c29
|
btn/dropdown rendering issue
|
2016-08-14 11:31:44 +02:00 |
|
Mario Vavti
|
541d0dce90
|
btn/dropdown rendering issue
|
2016-08-14 11:31:00 +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
|
6f0ac133cc
|
remove js debugging
|
2016-08-13 22:27:53 +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 |
|
Mario Vavti
|
1b90e851f9
|
fix #480, enable bbcode autocomplete for photo comments and remove some redundant javascript
|
2016-08-13 22:17:47 +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 |
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|