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 |
|
redmatrix
|
e558ddae3f
|
clean up the delivery reports to make them manageable, more approachable, and translateable
|
2015-09-24 18:19:33 -07:00 |
|
redmatrix
|
2fe3d16bbe
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-09-24 16:58:32 -07:00 |
|
redmatrix
|
2844f276b9
|
Document the additional content export options
|
2015-09-24 16:57:17 -07:00 |
|
Mario Vavti
|
b9723aa85b
|
some heavy private mail restructuring - work in progress
|
2015-09-24 14:07:44 +02:00 |
|
redmatrix
|
e45958b967
|
add plugin hooks to channel sync/import/export
|
2015-09-23 18:27:04 -07:00 |
|
redmatrix
|
4b13f0e025
|
since this is now usable, protect the displayed delivery reports from XSS injection
|
2015-09-22 04:08:03 -07:00 |
|
redmatrix
|
2869ccfe39
|
delivery reports - crude but mostly functional at least for zot deliveries
|
2015-09-22 04:04:51 -07:00 |
|
redmatrix
|
8ead4745f8
|
Merge pull request #54 from git-marijus/master
fix consensus items - issue #53
|
2015-09-22 19:41:08 +10:00 |
|
redmatrix
|
0b1b11ea53
|
heavy lifting for delivery reports
|
2015-09-22 02:32:04 -07:00 |
|
Mario Vavti
|
ea9f169a6c
|
fix consensus items - issue #53
|
2015-09-22 10:59:19 +02:00 |
|
redmatrix
|
326ae5ff6b
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
mod/post.php
|
2015-09-21 20:29:18 -07:00 |
|
redmatrix
|
8c16f12d7a
|
issue #52 - try all matching hublocs for remote auth, not just the "best one".
|
2015-09-21 20:20:16 -07:00 |
|
redmatrix
|
477228d4ff
|
issue #50 - cloud listings produce white screen for unauthenticated viewer
|
2015-09-21 20:17:48 -07:00 |
|
redmatrix
|
9baaa6fa56
|
issue #51
|
2015-09-21 20:05:54 -07:00 |
|
redmatrix
|
d2565d0f61
|
looks like chat has been neglected a bit recently
|
2015-09-20 21:37:18 -07:00 |
|
redmatrix
|
f2fefb91d5
|
change photo permissions when attach permissions are changed through mod/filestorage, and fix lockview for photos.
|
2015-09-18 01:53:04 -07:00 |
|
redmatrix
|
f0a7a6a1e2
|
consolidate zotfinger and webfinger
|
2015-09-17 17:51:31 -07:00 |
|
Mario Vavti
|
1cf404177d
|
quickfix for private messages - needs a lot more work
|
2015-09-17 19:25:13 +02:00 |
|
redmatrix
|
c34d8286a3
|
change matrix to grid, begin webfinger optimisation
|
2015-09-16 21:27:58 -07:00 |
|
redmatrix
|
4c5a74284b
|
serve as application/xrd+xml
|
2015-09-15 21:47:01 -07:00 |
|
redmatrix
|
93f5cc1e60
|
I'm not going to tell you what's wrong because I'll be accused of bashing another project. I'll let you read the logs and figure it out for yourself. Follow the trail of evidence and you'll discover the truth.
|
2015-09-15 01:24:55 -07:00 |
|
redmatrix
|
325a5b4af4
|
we need an owner for permissions_sql
|
2015-09-14 21:25:10 -07:00 |
|
jeroenpraat
|
e58ad35fb0
|
Update siteinfo.php
|
2015-09-14 16:42:32 +02:00 |
|
redmatrix
|
43ba690eda
|
profile photo change activities
|
2015-09-13 19:04:46 -07:00 |
|
redmatrix
|
77807d439e
|
minor change on invite
|
2015-09-11 14:32:18 -07:00 |
|
redmatrix
|
f2171173fe
|
separate the links
|
2015-09-10 19:35:26 -07:00 |
|
redmatrix
|
7f30863df2
|
forum mode - use linked avatar and name for title instead of "Channel: xxxxx" or "Forum: xxxx"
|
2015-09-10 19:31:42 -07:00 |
|
redmatrix
|
a6a2c02b6a
|
duplicated code
|
2015-09-10 19:21:32 -07:00 |
|
redmatrix
|
d3ee99d677
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
mod/like.php
|
2015-09-10 19:20:21 -07:00 |
|
redmatrix
|
4abfd4053a
|
sync likes
|
2015-09-10 19:18:12 -07:00 |
|
redmatrix
|
05e0ed5173
|
export likes to clones
|
2015-09-10 19:17:20 -07:00 |
|
redmatrix
|
f2889d24e6
|
decentralise likes of things so they can be cloned
|
2015-09-09 22:03:23 -07:00 |
|
redmatrix
|
db58b62235
|
don't auto-open the editor in forum mode. Save the forum selection text until we open it.
|
2015-09-09 19:54:16 -07:00 |
|
redmatrix
|
f3b560b453
|
fix the lock state when using forum mode
|
2015-09-09 18:57:06 -07:00 |
|
redmatrix
|
43e064749c
|
major changes to "forum mode" on the network/matrix page
|
2015-09-09 18:50:15 -07:00 |
|
redmatrix
|
918aaa64e2
|
profile photo issues #36
|
2015-09-09 03:40:53 -07:00 |
|
redmatrix
|
d702133ded
|
move mod_admin to Comanche finally
|
2015-09-08 20:48:35 -07:00 |
|
redmatrix
|
e8d431c2f6
|
issues with "use this photo for profile photo" #36
|
2015-09-08 19:51:52 -07:00 |
|
redmatrix
|
5d32aa94d9
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/menu.php
mod/menu.php
mod/mitem.php
|
2015-09-08 18:46:15 -07:00 |
|
redmatrix
|
d413b6eba8
|
merge conflicts
|
2015-09-08 18:45:58 -07:00 |
|
redmatrix
|
50d7554ccd
|
add sync packets for menus
|
2015-09-08 18:40:19 -07:00 |
|
redmatrix
|
75d521d42a
|
menu import and sync
|
2015-09-08 17:52:39 -07:00 |
|
redmatrix
|
880ca35681
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-09-07 21:02:05 -07:00 |
|
redmatrix
|
650e98b2a9
|
work on event sync
|
2015-09-07 21:01:49 -07:00 |
|
redmatrix
|
f84946c135
|
minor fix to event sync
|
2015-09-07 21:00:54 -07:00 |
|
redmatrix
|
508969a183
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-09-07 20:29:13 -07:00 |
|
redmatrix
|
c39e3613a8
|
create event sync packets
|
2015-09-07 20:28:02 -07:00 |
|
redmatrix
|
4eec9a2fba
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/items.php
view/it/messages.po
view/it/strings.php
|
2015-09-07 18:20:47 -07:00 |
|
redmatrix
|
6d1b64065a
|
consolidate import_items/sync_items
|
2015-09-07 18:14:30 -07:00 |
|
redmatrix
|
9fa0490c44
|
sync posted top level items rather than deliver them (actually we do both, but sync comes first). This way we get the ACL transferred.
|
2015-09-07 18:11:30 -07:00 |
|
redmatrix
|
2312f03eac
|
Always open rpost editor on document ready
|
2015-09-06 20:50:31 -07:00 |
|
redmatrix
|
1d09e4b620
|
use conversation defaults for /public page instead of collapsed list mode, but allow over-ride
|
2015-09-06 16:42:50 -07:00 |
|
redmatrix
|
3f6d6745de
|
syntax
|
2015-09-05 15:33:09 -07:00 |
|
redmatrix
|
b1888afa10
|
fix typos before pushing
|
2015-09-03 18:47:03 -07:00 |
|
redmatrix
|
d79e81a069
|
import and sync chatrooms
|
2015-09-03 18:44:40 -07:00 |
|
redmatrix
|
c83da012ff
|
profile import error #34
|
2015-09-03 16:19:59 -07:00 |
|
redmatrix
|
c22da3da1c
|
start to modularise the clone import and sync functions
|
2015-09-02 20:12:40 -07:00 |
|
redmatrix
|
470915a55b
|
sync "things" (obj elements)
|
2015-09-02 20:07:15 -07:00 |
|
redmatrix
|
d105f324af
|
import apps
|
2015-09-01 22:27:09 -07:00 |
|
redmatrix
|
6cc60ba477
|
initial work on obj import, rename import_profile_photo to import_xchan_photo to more accurately state its purpose.
|
2015-09-01 22:03:10 -07:00 |
|
redmatrix
|
1ce8ce896b
|
provide consistent ui for things
|
2015-09-01 19:27:41 -07:00 |
|
redmatrix
|
85daf26eb1
|
more work on objs/things
|
2015-09-01 19:01:19 -07:00 |
|
redmatrix
|
286be43963
|
issue #31
|
2015-09-01 17:16:10 -07:00 |
|
redmatrix
|
3852b5ce7f
|
separate objs/things from taxonomy
|
2015-09-01 17:06:58 -07:00 |
|
redmatrix
|
417da13353
|
this is a bit harder than anticipated.
|
2015-08-31 21:12:37 -07:00 |
|
redmatrix
|
d7089ab471
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/identity.php
install/update.php
util/messages.po
view/nl/messages.po
|
2015-08-31 21:00:28 -07:00 |
|
redmatrix
|
039f56f390
|
mostly doc tweaks, some import/export work
|
2015-08-31 20:58:05 -07:00 |
|
redmatrix
|
d7cf7316be
|
change the likes db structure to make it more easily importable/exportable
|
2015-08-31 20:55:25 -07:00 |
|
redmatrix
|
e23f86faa9
|
more work on doco search
|
2015-08-30 22:39:33 -07:00 |
|
redmatrix
|
7ba1217a13
|
improvements to documentation search
|
2015-08-30 20:47:15 -07:00 |
|
redmatrix
|
a42b236587
|
more AccessList stuff - this time it's mod-item, which is a biggie
|
2015-08-28 14:21:49 -07:00 |
|
redmatrix
|
d05fd9632e
|
now we get to the heavy lifting with AccessList stuff
|
2015-08-27 23:04:17 -07:00 |
|
redmatrix
|
ca0bc2bb7b
|
more work on AccessList integration
|
2015-08-27 22:20:30 -07:00 |
|
redmatrix
|
3fbb955cf2
|
start conversion to AccessList object
|
2015-08-27 21:22:59 -07:00 |
|
redmatrix
|
04b4897dd8
|
First attempt to turn access control into an object class. The access control manipulation is getting too complex and this will help keep it manageable and reduce a lot of code duplication.
|
2015-08-27 18:55:30 -07:00 |
|
redmatrix
|
d2fec56456
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
mod/import.php
|
2015-08-26 16:00:13 -07:00 |
|
redmatrix
|
bd2d99aced
|
import fixes
|
2015-08-26 15:56:32 -07:00 |
|
redmatrix
|
71308fe8c1
|
syntax error in last checkin
|
2015-08-26 13:50:51 -07:00 |
|
redmatrix
|
da649e397e
|
import fixes
|
2015-08-26 13:49:07 -07:00 |
|
redmatrix
|
1dbcfaa2c6
|
add repository type as one that is able to self-identify as a public forum
|
2015-08-25 21:54:16 -07:00 |
|
redmatrix
|
2d471e39dc
|
this is weird
|
2015-08-25 19:23:21 -07:00 |
|
redmatrix
|
e5dec8671e
|
make diaspora person guids for hubzilla folks globally unique. That's what a globally unique ID is. This forever kills the prospect of making nomadic identity work flawlessly on Diaspora. But since all your identities have the same guid, this allows your different identities to communicate with Diaspora; which would otherwise fail to connect to your other instances because of the guid collision.
|
2015-08-25 17:21:42 -07:00 |
|
redmatrix
|
b085a3243c
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
mod/connections.php
mod/connedit.php
|
2015-08-24 05:10:31 -07:00 |
|
redmatrix
|
d256e8e9f2
|
edited event showing bad signature and null_date for edit timestamp
|
2015-08-24 01:46:54 -07:00 |
|
redmatrix
|
250d286f1d
|
remove orphan mod_connections editing code (now done in mod/connedit)
|
2015-08-24 01:28:13 -07:00 |
|
redmatrix
|
8cd583fd8c
|
sync abook flags in memory after altering them
|
2015-08-23 17:36:00 -07:00 |
|
redmatrix
|
2a59392ba8
|
change name of module
|
2015-08-22 19:31:39 -07:00 |
|
redmatrix
|
c9b8f404e0
|
restrict event notification to events and birthdays (exclude tasks)
|
2015-08-22 14:35:17 -07:00 |
|
redmatrix
|
49c4aa1a54
|
cleanup of task widget - make jquery workflow a bit smoother
|
2015-08-20 20:40:42 -07:00 |
|
redmatrix
|
afbbc9cd72
|
more work on tasks
|
2015-08-20 18:43:01 -07:00 |
|
redmatrix
|
05bec13bdc
|
We don't need photos to also include attachments. It's interesting, but not all that useful.
|
2015-08-20 16:55:03 -07:00 |
|
redmatrix
|
6590ca02de
|
some event related fixes and some base work for implementing native tasks (to-do lists); which should already be importable and exportable.
|
2015-08-20 16:49:13 -07:00 |
|
redmatrix
|
a322254f2a
|
do ical export before checking logged in channel
|
2015-08-20 04:51:03 -07:00 |
|
redmatrix
|
863a979754
|
check perms on ical attachments
|
2015-08-19 17:16:19 -07:00 |
|
redmatrix
|
a4caaefd32
|
event integration improvements
|
2015-08-19 16:50:32 -07:00 |
|
redmatrix
|
3b1554db2e
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-08-18 17:15:53 -07:00 |
|
redmatrix
|
75fbf21e6b
|
add month to export filename when using month
|
2015-08-17 22:27:41 -07:00 |
|
redmatrix
|
27b61b1456
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-08-17 22:25:47 -07:00 |
|
redmatrix
|
9f4f967ead
|
off by one
|
2015-08-17 22:25:17 -07:00 |
|
redmatrix
|
9763c46b7e
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/identity.php
|
2015-08-17 22:23:23 -07:00 |
|
redmatrix
|
f682325924
|
provide ability to export by month as well as by year
|
2015-08-17 22:20:10 -07:00 |
|
redmatrix
|
abe362bdd4
|
issues encountered whilst testing import_items module using yearly dump files
|
2015-08-17 21:56:55 -07:00 |
|
redmatrix
|
1a4a921528
|
provide module for importing yearly content dumps
|
2015-08-17 21:40:40 -07:00 |
|
redmatrix
|
be3a272a80
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-08-16 19:54:38 -07:00 |
|
redmatrix
|
631eb4b2c2
|
issue #386 - account and channel bulk edit checkboxes not visible and therefore not useable. Also change wording to remove the offensive 'user' designation.
|
2015-08-16 19:52:25 -07:00 |
|
redmatrix
|
18bc12c21c
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/zot.php
util/messages.po
|
2015-08-14 22:24:15 -07:00 |
|
redmatrix
|
0d84c77c6c
|
set email verified if lost password workflow is completed to avoid the situation where they can reset the password but still not be able to login because the original email verification was lost.
|
2015-08-14 22:19:15 -07:00 |
|
redmatrix
|
f88dc84091
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
view/es/htconfig.tpl
view/es/update_fail_eml.tpl
|
2015-08-12 20:36:32 -07:00 |
|
redmatrix
|
b634c08d0e
|
resolve conflict
|
2015-08-11 22:41:27 -07:00 |
|
redmatrix
|
2d9d4dfeb3
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
doc/history.md
mod/import.php
|
2015-08-11 22:35:36 -07:00 |
|
redmatrix
|
0a34b96e11
|
bring back colour to abook_self in acl
|
2015-08-11 01:16:04 -07:00 |
|
redmatrix
|
81c740178d
|
convert abook_flags from hubzilla during cloning
|
2015-08-10 16:16:26 -07:00 |
|
redmatrix
|
91bbfcf554
|
photo permission inheritance. We want to use the folder permissions unless specific permissions have been set to over-ride them. If nothing is set, use the channel default. We may have to mess with his further in the case of somebody trying to create a public photo directory when their normal permissions are set to private. Kind of a chicken/egg problem because the folder permissions will be empty.
|
2015-08-06 17:09:09 -07:00 |
|
redmatrix
|
1b0cb9388c
|
prohibit some photo album edit operations until we figure out how to sync them with dav
|
2015-08-05 22:35:42 -07:00 |
|
redmatrix
|
880dec5a4e
|
don't throw errors or do the wrong thing if photos have no album (placed on your dav rootdir)
|
2015-08-05 22:07:51 -07:00 |
|
redmatrix
|
b737e224b1
|
more work separating Diaspora from core
|
2015-08-03 16:52:51 -07:00 |
|
redmatrix
|
9f5dfe797b
|
begin moving diaspora to plugin
|
2015-08-02 17:38:34 -07:00 |
|
redmatrix
|
c1a953f960
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
util/messages.po
|
2015-07-31 15:45:13 -07:00 |
|
redmatrix
|
5e985ef34f
|
consistency of event form
|
2015-07-31 15:42:52 -07:00 |
|