redmatrix
|
29ac533cc9
|
remove some unused stuff
|
2015-12-08 16:32:06 -08:00 |
|
redmatrix
|
241607e7d7
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-12-07 16:15:52 -08:00 |
|
redmatrix
|
8b974f8f74
|
abstract the message handlers
|
2015-12-07 16:01:54 -08:00 |
|
Mario Vavti
|
0df4f9c114
|
change album_id logic to make it work with ajax calls
|
2015-12-07 13:27:35 +01:00 |
|
Mario Vavti
|
69c9f4588c
|
make justify gallery work with more than one albums per page (eg album widget)
|
2015-12-07 12:13:51 +01:00 |
|
redmatrix
|
2d799f2c11
|
remove duplicated code
|
2015-12-06 19:59:46 -08:00 |
|
redmatrix
|
4ccd9ae6da
|
start of v4
|
2015-12-06 19:16:38 -08:00 |
|
ken restivo
|
5217d89543
|
srand() is for seeding the PRNG. You want rand() here.
|
2015-12-03 18:21:25 -08:00 |
|
redmatrix
|
ca55bbdaed
|
use the std_version where applicable instead of matching to the git.
|
2015-12-03 17:09:05 -08:00 |
|
redmatrix
|
75058e54b8
|
provide correct error if a directory server requires a realm_token and one wasn't provided
|
2015-12-02 18:37:22 -08:00 |
|
Mario Vavti
|
593423434c
|
fix attachment rendering for mail
|
2015-12-02 09:44:25 +01:00 |
|
redmatrix
|
650f882265
|
generalise the site black|white allow lists, also add a channel black|white list for future use
|
2015-11-29 20:26:00 -08:00 |
|
redmatrix
|
3f9412add2
|
create get_site_info() function so we can have a siteinfo.json module instead of or actually in addition to siteinfo/json
|
2015-11-29 19:37:03 -08:00 |
|
redmatrix
|
29877963be
|
issue #189
|
2015-11-29 18:07:59 -08:00 |
|
Mario Vavti
|
4e223f816a
|
reflect in form if we are editing or creating
|
2015-11-28 17:05:37 +01:00 |
|
Mario Vavti
|
61a5e81bc6
|
only show edit icon for your own events and minoe cleanup
|
2015-11-27 13:55:02 +01:00 |
|
redmatrix
|
a039869ba0
|
issue #185
|
2015-11-25 17:30:11 -08:00 |
|
Mario Vavti
|
3ea84d7eab
|
some basic event styling
|
2015-11-25 22:55:07 +01:00 |
|
Mario Vavti
|
fe57e7059b
|
events: make sure default finish date is one hour after start date and shift the finishdate if startdate is shifted
|
2015-11-25 15:05:21 +01:00 |
|
redmatrix
|
0559db9cf8
|
fix event form initial values
|
2015-11-24 15:37:33 -08:00 |
|
Mario Vavti
|
eb6fd311df
|
fix event droping
|
2015-11-24 14:25:16 +01:00 |
|
Mario Vavti
|
987619130b
|
some event heavy lifting - please test and report issues
|
2015-11-24 14:15:28 +01:00 |
|
redmatrix
|
dfaf1a1075
|
issue #183
|
2015-11-23 15:27:57 -08:00 |
|
Mario Vavti
|
4c84a2ce61
|
update datetimepicker and fix it for finish date
|
2015-11-22 00:13:33 +01:00 |
|
Mario Vavti
|
74b574d0b1
|
datetimepicker should also respect first day of week setting
|
2015-11-21 23:49:29 +01:00 |
|
Mario Vavti
|
d726c921eb
|
make calendar week start (sun or mon) configurable
|
2015-11-21 15:33:57 +01:00 |
|
redmatrix
|
106b4fdd2d
|
add v4 project roadmap, partial fix for cloning of profile photos on alternate profiles
|
2015-11-20 14:38:32 -08:00 |
|
Mario Vavti
|
a3e47d26f6
|
make calendar language aware
|
2015-11-20 16:39:55 +01:00 |
|
redmatrix
|
301072a86c
|
issue #85, community tags and file tags lost during edits. This required splitting off communitytags as a separate tag type and is not backward compatible. Community tags on older posts or those federated from redmatrix clones will not be preserved during edits.
|
2015-11-20 00:15:48 -08:00 |
|
redmatrix
|
5805a54097
|
directory search for pubforums using hubzilla directory servers using redmatrix flag value
|
2015-11-19 16:44:12 -08:00 |
|
redmatrix
|
350519d429
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-11-19 16:15:16 -08:00 |
|
redmatrix
|
8f94c721bf
|
new feature: 'suppress_duplicates' issue #146 triggered with less than two minutes between posts having identical content.
|
2015-11-19 16:05:47 -08:00 |
|
jeroenpraat
|
c7652fc29c
|
Had to switch these 2. Sorry.
|
2015-11-20 00:50:54 +01:00 |
|
jeroenpraat
|
e537d53389
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2015-11-20 00:40:32 +01:00 |
|
jeroenpraat
|
a890ee6864
|
Some bits
|
2015-11-20 00:39:47 +01:00 |
|
redmatrix
|
b5875c3af9
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
Conflicts:
version.inc
|
2015-11-19 11:47:41 -08:00 |
|
redmatrix
|
ed87dbc141
|
issue #173
|
2015-11-19 11:46:29 -08:00 |
|
Mario Vavti
|
ba52af786e
|
move today button from aside to section title
|
2015-11-19 11:38:34 +01:00 |
|
Mario Vavti
|
0c163c4d03
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2015-11-18 23:51:00 +01:00 |
|
Mario Vavti
|
e4145deeb7
|
some events refacturing
|
2015-11-18 23:50:42 +01:00 |
|
ken restivo
|
312cc415ce
|
Pass in account_id. Required for bulk identity importer.
|
2015-11-18 00:26:18 -08:00 |
|
ken restivo
|
1f2a408be0
|
Use provided account_id instead of user's logged in account_id. Necessary for bulk importer.
|
2015-11-18 00:03:59 -08:00 |
|
redmatrix
|
68da4d90dc
|
fix admin plugin hooks
|
2015-11-17 20:44:57 -08:00 |
|
redmatrix
|
6df98f080b
|
fix api/direct_messages/new at least for the json case. We seem to have a missing template for XML
|
2015-11-16 19:17:39 -08:00 |
|
redmatrix
|
fff30b1c3d
|
permission issues editing wall-to-wall posts
|
2015-11-15 19:36:17 -08:00 |
|
redmatrix
|
3d80073a0e
|
revert html in markdown for posts, but trim the input before processing the markdown
|
2015-11-15 18:03:37 -08:00 |
|
redmatrix
|
dba38821bc
|
superblock enhancements
|
2015-11-13 15:28:34 -08:00 |
|
redmatrix
|
888bf76e4b
|
allow pdl content
|
2015-11-12 17:47:38 -08:00 |
|
redmatrix
|
391807b46c
|
small fixes, removed old unused database row, and log more prominently a missing directory server URL
|
2015-11-12 16:45:38 -08:00 |
|
jeroenpraat
|
5afe8e5aa1
|
Small update to Bluegrid and generic-content-wrapper-styled to dreport
|
2015-11-12 22:10:20 +01:00 |
|
redmatrix
|
bd3d323849
|
run markdown through html purifier for those who insist on mixing html with markdown.
|
2015-11-11 15:09:22 -08:00 |
|
ken restivo
|
10ccdbacba
|
Bust out import_account() into a separate function to allow importing accounts by proxy, i.e. for admins to import a channel on behalf of a user.
|
2015-11-10 23:07:28 -08:00 |
|
redmatrix
|
e7bedf4433
|
do a better job of preserving linebreaks in posts for channels that use markdown
|
2015-11-10 19:02:28 -08:00 |
|
redmatrix
|
11c8cabf28
|
suppress duplicate locations in connedit, issue #111
|
2015-11-08 20:41:11 -08:00 |
|
redmatrix
|
5c2692a8ea
|
no comment permission bug, also implement delete() in RedDirectory per Waitman
|
2015-11-08 16:36:36 -08:00 |
|
redmatrix
|
cf0bff8582
|
relative attachment not fetched due to os filename issue
|
2015-11-08 13:54:31 -08:00 |
|
jeroenpraat
|
16040063dc
|
A few quotes too many. Also translations for tooltip.
|
2015-11-08 00:08:02 +01:00 |
|
jeroenpraat
|
2b0b03eebc
|
Fix ffsapi for non-English languages (or better when 's was used in the strings) - Update nl+es
|
2015-11-08 00:04:02 +01:00 |
|
redmatrix
|
017ea0d624
|
more work on hook doco
|
2015-11-05 20:19:38 -08:00 |
|
redmatrix
|
a29b8b369e
|
update hooklist
|
2015-11-05 20:10:49 -08:00 |
|
jeroenpraat
|
94437a8fcd
|
Firefox Share app. Paper plane icon is public domain. Shorted the name in ffsapi > compare it with other providers. Changed bookmark (checkmark) item to selfmade Hubzilla bookmark icon for Firefox (bookmark icon = bootstrap icon).
|
2015-11-05 22:58:46 +01:00 |
|
jeroenpraat
|
0db5a8673d
|
Firefox share (that seems now the official name) button added to misc. settings.
|
2015-11-05 16:20:56 +01:00 |
|
jeroenpraat
|
91f2e05d5d
|
Style the button
|
2015-11-05 09:06:45 +01:00 |
|
redmatrix
|
5f1ccc25b6
|
menu_list() takes a channel_id, not the whole channel array
|
2015-11-04 18:34:42 -08:00 |
|
redmatrix
|
42c0f83ec5
|
typo
|
2015-11-04 18:21:36 -08:00 |
|
redmatrix
|
5dfaeaf526
|
add bookmarking to FF social api provider
|
2015-11-04 18:15:03 -08:00 |
|
redmatrix
|
f4a9529968
|
Firefox Share API provider interface (first cut, only has share ability)
|
2015-11-04 17:47:24 -08:00 |
|
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
|
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 |
|
Mario Vavti
|
43d8090182
|
timeago() works best with iso format. fix #118
|
2015-11-03 11:19:22 +01:00 |
|
Mario Vavti
|
6ec021aafa
|
revert filtering by metwork
|
2015-11-02 08:36:43 +01: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
|
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 |
|
redmatrix
|
04820ba09e
|
make hubloc repair script a bit more selective
|
2015-10-31 13:58:26 -07:00 |
|
redmatrix
|
5f80121637
|
add hubloc repair script (needed for deadsuperhero, probably temporary)
|
2015-10-30 22:43:38 -07:00 |
|
Mario Vavti
|
c5aedb14a9
|
fix #83
|
2015-10-29 19:46:21 +01:00 |
|
redmatrix
|
bb469deb85
|
add entry for 'none'
|
2015-10-29 01:35:49 -07:00 |
|
redmatrix
|
96402a2354
|
This may take a few iterations to discover the best way to present the information, but we need a way for members to know what alternate locations are available for a channel during times of server issues - and as recently discovered if there aren't any hublocs at all; without digging around the database and probing channels and other messy stuff.
|
2015-10-29 01:23:56 -07:00 |
|
redmatrix
|
4fec7aa991
|
add text hint how to set language in connection filter
|
2015-10-28 20:11:58 -07:00 |
|
Mario Vavti
|
c6daf4d41c
|
first the image than the body
|
2015-10-27 11:26:48 +01:00 |
|
Mario Vavti
|
3f1dc22c0e
|
fix sharing of photo items
|
2015-10-27 11:07:40 +01:00 |
|
jeroenpraat
|
5e28b1216e
|
Added a few generic-content-wrapper-styled classes and a button position fixed for lostpass. mod/search probably needs a .tpl in the future, but I don't know how to that.
|
2015-10-26 14:05:45 +01:00 |
|
redmatrix
|
a498fc8e72
|
looks like there may be issues with the datetime picker if the local timezone isn't the same as your settings.
|
2015-10-25 21:17:02 -07:00 |
|
Mario Vavti
|
ab8b4d5c36
|
another try to avoid dubble photo deletion. allow to set a photo caption and simple status body (if create status post is enabled) on upload
|
2015-10-24 21:44:25 +02:00 |
|
Mario Vavti
|
865c38995d
|
some photos cant be deleted under certain circumstances - needs more investigation. revert this until a better fix is found.
|
2015-10-20 13:43:35 +02:00 |
|
Mario Vavti
|
f7601756e9
|
create photo object if feature large photos is enabled and display those slightly different
|
2015-10-20 09:36:15 +02:00 |
|
redmatrix
|
54059b2f15
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-10-19 20:36:22 -07:00 |
|
redmatrix
|
f00887ea42
|
add project info to pubsite list
|
2015-10-19 20:35:44 -07:00 |
|
redmatrix
|
ea37882b95
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/zot.php
install/schema_mysql.sql
install/schema_postgres.sql
install/update.php
mod/zfinger.php
|
2015-10-19 16:18:04 -07:00 |
|
redmatrix
|
57e0bfc5a9
|
add the project name to site info packet
|
2015-10-19 16:07:14 -07:00 |
|
redmatrix
|
4e5b813aa8
|
syntax error
|
2015-10-19 14:55:49 -07:00 |
|
redmatrix
|
f0a33c00bc
|
separate permission_update notification into permission_create and permission_update, since some networks send out a notification for duplicate share requests even if connected.
|
2015-10-18 20:13:12 -07:00 |
|