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 |
|
redmatrix
|
be701677d6
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
view/nl/messages.po
view/nl/strings.php
|
2015-10-17 16:38:57 -07:00 |
|
redmatrix
|
b6c765c9dc
|
allow homepage content to be a full redirect
|
2015-10-17 16:33:28 -07:00 |
|
redmatrix
|
1d2797dc1f
|
bring back chat expiration setting and adjust chat size for our now smaller content region
|
2015-10-17 14:54:27 -07:00 |
|
redmatrix
|
7fe6bc52d0
|
change setup defaults to 127.0.0.1 instead of localhost for DB server, add documentation to the INSTALL.txt explaining the choice.
|
2015-10-16 13:05:40 -07:00 |
|
redmatrix
|
52f2509280
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-10-16 04:22:09 -07:00 |
|
redmatrix
|
c07f694a07
|
another try at issue #89 - rotating photos
|
2015-10-16 04:21:40 -07:00 |
|
Mario Vavti
|
c49198fd71
|
this is all the info we need
|
2015-10-16 12:24:27 +02:00 |
|
redmatrix
|
3f7ee613fc
|
mail sync debugging
|
2015-10-15 20:40:24 -07:00 |
|
redmatrix
|
7517c76ae4
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
install/update.php
|
2015-10-15 16:02:37 -07:00 |
|
redmatrix
|
bf5a1f662a
|
generate all (non-square) photo scales - even if the original photo is smaller than the scale target sizes.
|
2015-10-15 14:18:40 -07:00 |
|
redmatrix
|
d9753989bf
|
issue #89 - rotating photos does not work
|
2015-10-15 13:23:40 -07:00 |
|
Mario Vavti
|
9f5c61b1fd
|
reflect default image size changes in mod/photos
|
2015-10-15 14:52:31 +02:00 |
|
Mario Vavti
|
3bca640521
|
do not try to remove photos twice
|
2015-10-15 13:57:15 +02:00 |
|
redmatrix
|
b33a9a71f6
|
more work on import & sync of private mail and conversations
|
2015-10-14 17:40:50 -07:00 |
|
redmatrix
|
8af3dc140e
|
issue #87 - photos not getting deleted from mod_photo when deleted in DAV or cloud
|
2015-10-14 15:08:07 -07:00 |
|
redmatrix
|
de697a4267
|
issue #86 - like/dislike in photos not working
|
2015-10-14 14:16:16 -07:00 |
|
Mario Vavti
|
3c74aec973
|
fix /channel not updating after posting comment
|
2015-10-13 12:05:55 +02:00 |
|
jeroenpraat
|
a9696abdce
|
Redesigned the export page. Please fix my English if I made some mistakes.
|
2015-10-09 16:45:29 +02:00 |
|
Andrew Manning
|
9034765790
|
There is no mod/import_items tool in RedMatrix
|
2015-10-07 20:37:00 -04:00 |
|
Andrew Manning
|
8bf45536d3
|
Forgot the year and month url part
|
2015-10-06 06:50:33 -04:00 |
|
Andrew Manning
|
e1fca2a1ab
|
Add message about exporting by year/month to uexport
|
2015-10-06 06:45:55 -04:00 |
|
Mario Vavti
|
7776c56c6c
|
bring single message view to inbox/outbox view
|
2015-10-04 19:51:23 +02:00 |
|
Mario Vavti
|
38fe928d06
|
cleanup some unused variables
|
2015-10-04 13:09:26 +02:00 |
|
Mario Vavti
|
c229223e01
|
private mail: if receiver is not in abook provide only his webbie to the form
|
2015-10-04 12:08:23 +02:00 |
|
Mario Vavti
|
d337cc6618
|
private mail: $preid should be abook_xchan not abook_id
|
2015-10-02 22:53:51 +02:00 |
|
Mario Vavti
|
5ba39fef9a
|
private mail compositor changes
|
2015-10-02 17:51:37 +02:00 |
|
redmatrix
|
1da3828a09
|
issue with resetting post perms to default audience - not sticking.
|
2015-10-01 20:22:03 -07:00 |
|
redmatrix
|
9bdb7bef5d
|
add delivery reports to mail (not backported to redmatrix)
|
2015-09-30 19:27:53 -07:00 |
|
redmatrix
|
b3525b8657
|
remove debugging
|
2015-09-28 20:04:44 -07:00 |
|
redmatrix
|
8d5556764c
|
add one more level of parentheses to ensure operator precedence is correctly evaluated
|
2015-09-28 20:03:11 -07:00 |
|
redmatrix
|
f965209eee
|
check public scopes against visitor in item_permissions_sql()
|
2015-09-28 19:45:57 -07:00 |
|
redmatrix
|
3b53cd56ef
|
Merge branch 'deadsite'
|
2015-09-28 17:15:34 -07:00 |
|
redmatrix
|
e5f47cd14b
|
create site records for all queued sites and check for death
|
2015-09-28 17:13:11 -07:00 |
|
Mario Vavti
|
b97102da01
|
private mail: bring additional inbox/outbox views and ajaxify single message drop
|
2015-09-28 17:40:38 +02:00 |
|
redmatrix
|
cd2b811555
|
move string files to hmessages.po and hstrings.php for hubzilla to avoid endless merge conflicts.
|
2015-09-26 23:44:30 -07:00 |
|
Mario Vavti
|
d6293730fc
|
private mail: some work on conversations view
|
2015-09-25 23:26:28 +02:00 |
|
redmatrix
|
ba94f824b9
|
deliveries per process ui for setting
|
2015-09-25 01:31:58 -07:00 |
|