Commit Graph

14662 Commits

Author SHA1 Message Date
Mario Vavti 4decceea76 add anchors to messages and links 2015-10-04 14:07:05 +02:00
Mario Vavti 26b97722c6 remove check mail - it just reloads the page. we get a notification in the panel if we get new mail 2015-10-04 13:43:16 +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
jeroenpraat ab59e41e1a Red:Notify > Hubzilla:Notify 2015-10-03 15:51:12 +02:00
jeroenpraat 392ee70fd5 Updated Spanish and Dutch language strings 2015-10-03 15:38:40 +02:00
redmatrix 7abad2ff99 get rid of the unnecessary blank space after mail recipient completion 2015-10-02 18:12:09 -07:00
Mario Vavti d337cc6618 private mail: $preid should be abook_xchan not abook_id 2015-10-02 22:53:51 +02:00
Mario Vavti 3a8bff228e Merge branch 'master' of https://github.com/redmatrix/hubzilla 2015-10-02 17:52:14 +02:00
Mario Vavti 5ba39fef9a private mail compositor changes 2015-10-02 17:51:37 +02:00
redmatrix c7160e3d25 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-10-02 04:52:27 -07:00
redmatrix 6171d164d7 need full path to deliver_hooks.php 2015-10-02 04:51:57 -07:00
redmatrix b1e0018b74 string update 2015-10-02 04:50:58 -07:00
Mario Vavti 9b8aa8d09e whitespace 2015-10-02 12:26:12 +02:00
Mario Vavti 3bed94f4ad move mail item buttons/menu to dropdown 2015-10-02 12:20:33 +02:00
Mario Vavti a895a0d79e private mail template and css fixes 2015-10-02 11:41:37 +02:00
redmatrix 1da3828a09 issue with resetting post perms to default audience - not sticking. 0.10 2015-10-01 20:22:03 -07:00
redmatrix 982ff8733f one more change 2015-10-01 19:54:28 -07:00
redmatrix ebe374d572 notification changes to support testdrive 2015-10-01 19:49:06 -07:00
redmatrix dd45e7b4eb Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-10-01 17:30:15 -07:00
redmatrix 63eb0e3a38 allow additional uses for xtags 2015-10-01 17:28:03 -07:00
redmatrix f472071f6f Merge pull request #66 from HaakonME/master
Updated Norwegian strings for Hubzilla , optional OpenShift deploy and cron
2015-10-02 09:59:44 +10:00
redmatrix 7b695aa684 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-10-01 16:56:38 -07:00
redmatrix de4b5978c3 update cert authorities 2015-10-01 16:55:15 -07:00
Haakon Meland Eriksen f23f8f7f5d Small fix to deploy 2015-10-01 22:08:38 +02:00
Haakon Meland Eriksen f64acadd58 Small fix to deploy 2015-10-01 22:03:12 +02:00
Haakon Meland Eriksen 68ea1d0289 Changed deploy script - removed hot_deploy and changed poller to every 10 minutes rather than 5 minutes. 2015-10-01 21:59:12 +02:00
Haakon Meland Eriksen 1574043a9e Updated Norwegian strings for Hubzilla 2015-10-01 17:51:31 +02:00
Haakon Meland Eriksen a2a5580e68 Updated Norwegian string for Hubzilla 2015-10-01 17:46:31 +02:00
Haakon Meland Eriksen 2696cf9b9e Merge remote-tracking branch 'upstream/master' 2015-10-01 17:31:22 +02:00
Wave d9f962ee6f Merge pull request #65 from tuscanhobbit/master
More updates on Italian translation from transifex
2015-10-01 17:31:00 +02:00
Paolo Tacconi 7468d8a000 More updates on Italian translation from transifex 2015-10-01 17:29:04 +02:00
Wave 270bb4e2d9 Merge pull request #64 from tuscanhobbit/master
First Hubzilla Italian localization
2015-10-01 17:12:31 +02:00
Paolo Tacconi d3d9b06eb7 First Hubzilla Italian localization 2015-10-01 17:11:36 +02:00
redmatrix e7131bc8f8 this is an even better fix for issue #61 2015-09-30 22:10:26 -07:00
redmatrix 1df1c15e48 issue #61 - provide un-useable icons as placeholders for location setting options on deleted hublocs 2015-09-30 21:59:33 -07:00
redmatrix 986244eeea issue #63 - missing table fields in db query 2015-09-30 21:38:21 -07:00
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
redmatrix 54e7d5d260 Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	include/zot.php
	view/de/messages.po
	view/de/strings.php
2015-09-30 16:31:06 -07:00
redmatrix 5265c190d4 document the issue with cloned delivery to self vs normal delivery to self 2015-09-30 16:27:24 -07:00
redmatrix 4b7c052ed8 undo self deliver check 2015-09-30 12:59:13 -07:00
redmatrix b62e7e7d8b Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-30 12:57:43 -07:00
redmatrix fd290882fd undo self-deliver check 2015-09-30 12:57:02 -07:00
zzottel 09015f8924 Merge pull request #394 from zzottel/master
update German strings
2015-09-30 15:42:10 +02:00
zottel b5f382f0ea update German strings 2015-09-30 14:05:10 +02:00
zzottel ccd13dd643 Merge pull request #62 from zzottel/master
update German strings
2015-09-30 14:03:12 +02:00
zottel d66715648a update German strings 2015-09-30 14:01:21 +02:00
Haakon Meland Eriksen e07ff7d3fb Merge remote-tracking branch 'upstream/master' 2015-09-30 12:21:36 +02:00
zottel 0d60789f69 Merge remote-tracking branch 'upstream/master' 2015-09-30 08:45:13 +02:00