Commit graph

1239 commits

Author SHA1 Message Date
redmatrix
526bc36b40 update the opensearch template 2015-09-30 19:31:25 -07:00
redmatrix
9bdb7bef5d add delivery reports to mail (not backported to redmatrix) 2015-09-30 19:27:53 -07:00
Mario Vavti
6368b09337 a clear is needed after floating 2015-09-28 21:51:04 +02:00
Mario Vavti
b97102da01 private mail: bring additional inbox/outbox views and ajaxify single message drop 2015-09-28 17:40:38 +02: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
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
2869ccfe39 delivery reports - crude but mostly functional at least for zot deliveries 2015-09-22 04:04:51 -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
Mario Vavti
c6c18261a0 missing refernce to array 2015-09-17 19:33:44 +02:00
Mario Vavti
1cf404177d quickfix for private messages - needs a lot more work 2015-09-17 19:25:13 +02:00
Mario Vavti
6cd5826d21 Revert "moved submit button to the bottom in settings.tpl"
This reverts commit 1500691cc2.
2015-09-17 15:05:40 +02:00
redmatrix
30af694e30 Merge pull request #44 from mrjive/move_submit_button
moved submit button to the bottom in settings.tpl
2015-09-17 10:19:43 +10:00
mrjive
1500691cc2 moved submit button to the bottom in settings.tpl 2015-09-16 04:46:47 -07:00
mrjive
fae5ea749a added toggle_select 2015-09-16 02:25:44 -07:00
redmatrix
63a1d8d0db make sure we've got a doc type 2015-09-15 01:39:38 -07:00
jeroenpraat
dfd4115f7a Update siteinfo.tpl 2015-09-14 16:45:15 +02:00
redmatrix
03e3281beb mod_locs - put the primary into a (non-functioning) button for visual consistency. 2015-09-13 20:15:33 -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
2f52b6c164 Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	util/messages.po
2015-09-07 04:06:27 -07:00
Mario Vavti
ee21d87d1b uexport template fixes 2015-09-04 09:33:34 +02:00
redmatrix
fb2d2c5585 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-02 21:59:44 -07:00
redmatrix
3e7edf504d sort out some app display weirdness 2015-09-02 21:35:49 -07:00
redmatrix
1ce8ce896b provide consistent ui for things 2015-09-01 19:27:41 -07:00
redmatrix
3852b5ce7f separate objs/things from taxonomy 2015-09-01 17:06:58 -07:00
redmatrix
2d471e39dc this is weird 2015-08-25 19:23:21 -07:00
redmatrix
2a59392ba8 change name of module 2015-08-22 19:31:39 -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
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
30fd17c58d Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	view/nl/messages.po
2015-08-17 16:14:15 -07:00
redmatrix
98eeff7538 commit 631eb4b broke the checkboxes in admin/site, so separate normal checkboxes from bulk edit checkboxes in the css 2015-08-17 16:11:10 -07:00
redmatrix
b737e224b1 more work separating Diaspora from core 2015-08-03 16:52:51 -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
redmatrix
cbb6d37b6c Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-07-27 20:59:37 -07:00
redmatrix
52ccbd6b64 align buttons on event calendar 2015-07-27 20:58:25 -07:00
redmatrix
3269d4632f Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	util/messages.po
2015-07-27 18:01:20 -07:00
redmatrix
85f546e691 crude but more or less functional event import from thunderbird ics files 2015-07-26 22:44:49 -07:00
redmatrix
3880b485cb Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	mod/connedit.php
	view/pt-br/messages.po
	view/pt-br/strings.php
2015-07-26 16:50:33 -07:00
Mario Vavti
f6142d18c4 Provide connection status if status is "a-normal" 2015-07-26 20:54:09 +02:00
redmatrix
c90f14c066 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	doc/to_do_code.bb
2015-07-21 17:13:48 -07:00
Mario Vavti
4d45bc9da1 Fixes regarding the new default profile photo size. The default profile photos are just renamed. People which provided the originals are invited to reproduce them in the new 300 by 300 px format. 2015-07-20 21:01:11 +02:00
Mario Vavti
464625cd91 show icons instead of disabled checkboxes 2015-07-20 15:03:55 +02:00
redmatrix
15b6e8faa4 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	include/identity.php
	include/widgets.php
	util/messages.po
	view/it/messages.po
	view/it/strings.php
2015-07-19 21:08:34 -07:00
Mario Vavti
39a09eb525 fix missing div and a regression introduced in ec23a94b6d which broke tag removal for photos 2015-07-16 22:04:52 +02:00