redmatrix
|
77a03e376c
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/photo/photo_driver.php
include/text.php
mod/post.php
|
2015-11-03 20:46:47 -08:00 |
|
redmatrix
|
5dade2b608
|
backport small bits of the re-install fix; at least the damaging bits
|
2015-11-03 20:40:43 -08:00 |
|
redmatrix
|
877b3361c8
|
better re-install detection/protection. This necessitated a slight protocol change but should not introduce any compatibility issues with older software. Things just work better if you use an up-to-date server.
|
2015-11-03 20:28:56 -08:00 |
|
redmatrix
|
2fbfc2a8f1
|
need better peer verification due to re-install issue, this is temporary
|
2015-11-03 19:50:40 -08:00 |
|
redmatrix
|
e09b49288f
|
provide admin setting to change directory server
|
2015-11-03 18:34:16 -08:00 |
|
redmatrix
|
6aa98a1e91
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-11-03 17:40:31 -08:00 |
|
redmatrix
|
14b74069f8
|
version
|
2015-11-03 17:40:05 -08:00 |
|
redmatrix
|
c1cfcc78fe
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-11-03 14:59:43 -08:00 |
|
redmatrix
|
2c299a9f37
|
implement unfollow thread
|
2015-11-03 14:59:14 -08:00 |
|
jeroenpraat
|
9fa771f9fe
|
Time for using my real name
|
2015-11-03 21:24:28 +01:00 |
|
jeroenpraat
|
d1aa672388
|
small update Ducth strings + fix dark schema
|
2015-11-03 21:19:23 +01:00 |
|
Mario Vavti
|
43d8090182
|
timeago() works best with iso format. fix #118
|
2015-11-03 11:19:22 +01:00 |
|
redmatrix
|
d13dae6b06
|
bug in hub/location sync
|
2015-11-02 21:02:30 -08:00 |
|
redmatrix
|
0998ef0c4e
|
readability
|
2015-11-02 17:10:47 -08:00 |
|
redmatrix
|
543bf51eff
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-11-02 17:07:58 -08:00 |
|
redmatrix
|
5513feb15b
|
several more hidden configs
|
2015-11-02 17:07:40 -08:00 |
|
redmatrix
|
e03faaeb8f
|
Merge pull request #116 from HaakonME/master
Changed default config for Hubzilla on Openshift
|
2015-11-03 09:47:15 +11:00 |
|
redmatrix
|
966dd03195
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-11-02 14:46:24 -08:00 |
|
redmatrix
|
5041774fd3
|
directory doco
|
2015-11-02 14:46:02 -08:00 |
|
redmatrix
|
c5453d476d
|
Merge pull request #117 from kenrestivo/add-rss-docs
Update RSS setting docs.
|
2015-11-03 09:45:33 +11:00 |
|
ken restivo
|
54eae7830e
|
Update RSS setting docs.
|
2015-11-02 12:52:23 -08:00 |
|
Haakon Meland Eriksen
|
4e74c7e3b1
|
Changed default config to util/config system expire_delivery_reports 3 util/config system feed_contacts 0 util/config system diaspora_enabled 0 util/config system disable_discover_tab 1 util/config system directory_server https://blablanet.com util/config directory safemode 0 util/config directory globaldir 1 util/config directory pubforums 0
|
2015-11-02 19:57:49 +01:00 |
|
Haakon Meland Eriksen
|
fe52400b75
|
Added new directory server https://blablanet.com
|
2015-11-02 19:40:34 +01:00 |
|
Haakon Meland Eriksen
|
18feef0753
|
Added new directory server https://blablanet.com
|
2015-11-02 18:53:40 +01:00 |
|
Mario Vavti
|
6ec021aafa
|
revert filtering by metwork
|
2015-11-02 08:36:43 +01:00 |
|
redmatrix
|
954957bd8a
|
provide discovery for local deletes in zot-finger and mark the hublocs invalid/deleted
|
2015-11-01 19:07:32 -08:00 |
|
redmatrix
|
14e92f53f1
|
hubloc filtering to eliminate dead and deleted entries
|
2015-11-01 16:19:28 -08:00 |
|
redmatrix
|
d3183467e0
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-11-01 15:52:35 -08:00 |
|
redmatrix
|
b62614bbd4
|
improve /locs page with some field notes and the ability to do a forced sync
|
2015-11-01 15:51:45 -08:00 |
|
jeroenpraat
|
618155e6ab
|
More Bluegrid fine tuning and generic-content-wrapper-styled added to some tpl-files and 2 php files, cause they dont have a tpl file.
|
2015-11-01 22:59:32 +01:00 |
|
Mario Vavti
|
bd75d32c1b
|
remove zotid.net from fallback dir and add hubzilla.site
|
2015-11-01 22:02:24 +01:00 |
|
Mario Vavti
|
5acfef8edb
|
since other networks do not support cloning we only need hublocs for zot contacts - fix #111
|
2015-11-01 21:32:28 +01:00 |
|
Mario Vavti
|
7ce3ebc46d
|
make sure we only have one profile photo for a cloned channel
|
2015-11-01 21:04:55 +01:00 |
|
Mario Vavti
|
0353b0e04f
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2015-11-01 11:17:04 +01:00 |
|
jeroenpraat
|
ca81ab784a
|
Fix youtube and vimeo for Diaspora posts. Remove empty zrl's from Diaspora posts (fixes also the not working and only translated into default hub language 'view full size'). Please revert when wrong.
|
2015-10-31 22:38:16 +01:00 |
|
jeroenpraat
|
3262d819de
|
update srings nl+es, wrapper-styled 1 tpl-file, more finetuning bluegrid schema.
|
2015-10-31 22:34:59 +01:00 |
|
redmatrix
|
a8cdbd44e8
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-10-31 13:59:08 -07:00 |
|
redmatrix
|
04820ba09e
|
make hubloc repair script a bit more selective
|
2015-10-31 13:58:26 -07:00 |
|
jeroenpraat
|
52120b367a
|
Update nl+es
|
2015-10-31 21:07:57 +01:00 |
|
Mario Vavti
|
d6d96e8c89
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2015-10-31 12:04:20 +01:00 |
|
redmatrix
|
2b34dd7373
|
Merge pull request #110 from kenrestivo/add-directory-docs
Add directory docs
|
2015-10-31 18:19:08 +11:00 |
|
redmatrix
|
7a87343c71
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-10-30 22:46:31 -07:00 |
|
redmatrix
|
5f80121637
|
add hubloc repair script (needed for deadsuperhero, probably temporary)
|
2015-10-30 22:43:38 -07:00 |
|
Mario Vavti
|
5920a96da7
|
make attachments appear in a dropdown in wall-item-tools-left
|
2015-10-31 00:38:01 +01:00 |
|
ken restivo
|
0acaa839b9
|
Add directory docs based on my (possibly incorrect/incomplete?) reading of https://macgirvin.com/display/4acdbf7403aa244044d403820274b1b1142f57bbc0b38d0ea0e35e49f36eceb7@macgirvin.com
|
2015-10-30 12:01:21 -07:00 |
|
Mario Vavti
|
f8b767ed32
|
fix photo item for search_item.tpl and a minor css fix
|
2015-10-30 18:46:16 +01:00 |
|
Mario Vavti
|
d0b0d0ec72
|
possibly improve cloned profile images a bit - mod/photo would pick some random photos if there are more than one kind of PHOTO_PROFILE
|
2015-10-30 15:08:28 +01:00 |
|
redmatrix
|
e0463f5a74
|
Merge pull request #107 from kenrestivo/fix-audio-preload
Save bandwidth on mobile networks.
|
2015-10-30 15:25:18 +11:00 |
|
ken restivo
|
1b30210120
|
Save bandwidth on mobile networks.
|
2015-10-29 20:50:52 -07:00 |
|
redmatrix
|
a1e28bb669
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-10-29 15:11:58 -07:00 |
|