redmatrix
|
42db2bc93d
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-10-12 16:16:14 -07:00 |
|
redmatrix
|
a2f5b55d10
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-10-12 16:12:51 -07:00 |
|
redmatrix
|
8e7e9b7040
|
version roll
|
2015-10-12 16:11:55 -07:00 |
|
jeroenpraat
|
43eefb5929
|
update es + nl strings
|
2015-10-13 00:43:23 +02:00 |
|
redmatrix
|
dcdcba9f1f
|
Merge pull request #79 from HaakonME/master
Updated Help pages to include Hubzilla on OpenShift
|
2015-10-12 17:29:34 +11:00 |
|
Mario Vavti
|
dec37b3dbe
|
another collapseHeight() fix
|
2015-10-11 22:58:59 +02:00 |
|
Mario Vavti
|
9431112f77
|
fix an issue with collapseHeight() and css margins/paddings in directory
|
2015-10-11 22:49:36 +02:00 |
|
Mario Vavti
|
7bdd5c9e0d
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2015-10-11 22:32:27 +02:00 |
|
Mario Vavti
|
c963aa98e8
|
some conv-item restructuring to allow full width elements
|
2015-10-11 22:32:06 +02:00 |
|
redmatrix
|
0f6e1c1c05
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-10-11 12:41:39 -07:00 |
|
redmatrix
|
ce8d49a47d
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-10-11 12:41:28 -07:00 |
|
redmatrix
|
70dc305f12
|
version roll
|
2015-10-11 12:40:23 -07:00 |
|
Haakon Meland Eriksen
|
df45374041
|
Updated Hubzilla on OpenShift HOWTO with use of logging
|
2015-10-11 14:32:01 +02:00 |
|
jeroenpraat
|
22a5a91bd5
|
Added Hubzilla banner to the Readme (for Github)
|
2015-10-11 00:05:41 +02:00 |
|
Haakon Meland Eriksen
|
d5788ba53a
|
Updated help page for Hubzilla on OpenShift
|
2015-10-10 15:06:36 +02:00 |
|
Haakon Meland Eriksen
|
4d8a1c67c3
|
Updated help page for Hubzilla on OpenShift
|
2015-10-10 14:46:58 +02:00 |
|
Haakon Meland Eriksen
|
ea34e4bad8
|
Updated README for Hubzilla on OpenShift
|
2015-10-10 14:45:57 +02:00 |
|
Haakon Meland Eriksen
|
258e2d197a
|
Updated help page for Hubzilla on OpenShift
|
2015-10-10 14:41:01 +02:00 |
|
Haakon Meland Eriksen
|
e75e09dae8
|
Updated help page for Hubzilla on OpenShift
|
2015-10-10 14:38:13 +02:00 |
|
Haakon Meland Eriksen
|
4aee8ba27f
|
Added link to Hubzilla on OpenShift HOWTO using Projectname
|
2015-10-10 14:31:41 +02:00 |
|
Haakon Meland Eriksen
|
90c6276fe2
|
Added link to Hubzilla on OpenShift HOWTO
|
2015-10-10 14:28:17 +02:00 |
|
Haakon Meland Eriksen
|
1cae3baaea
|
Hubzilla on OpenShift HOWTO added to Help
|
2015-10-10 14:24:35 +02:00 |
|
redmatrix
|
209882d5a9
|
Merge pull request #76 from kenrestivo/update-post-docs
Update the post docs adding how to post to a channel
|
2015-10-10 09:11:52 +11:00 |
|
redmatrix
|
2999096221
|
Merge pull request #77 from HaakonME/master
Updated Hubzilla on OpenShift README with HOWTO
|
2015-10-10 09:11:29 +11:00 |
|
redmatrix
|
d076255c98
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
mod/uexport.php
view/tpl/uexport.tpl
|
2015-10-09 14:27:47 -07:00 |
|
redmatrix
|
b2f2deffe6
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-10-09 14:25:56 -07:00 |
|
redmatrix
|
b31aa4aacb
|
string update
|
2015-10-09 14:25:29 -07:00 |
|
Haakon Meland Eriksen
|
85962a3eb1
|
Updated Hubzilla on OpenShift README with HOWTO
|
2015-10-09 19:37:49 +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 |
|
ken restivo
|
e22448fb5c
|
Update the post docs adding https://github.com/redmatrix/hubzilla/issues/67
|
2015-10-08 21:17:59 -07:00 |
|
redmatrix
|
db0a102703
|
Merge pull request #397 from anaqreon/uexport
There is no mod/import_items tool in RedMatrix
|
2015-10-08 13:52:26 +11:00 |
|
Andrew Manning
|
9034765790
|
There is no mod/import_items tool in RedMatrix
|
2015-10-07 20:37:00 -04:00 |
|
redmatrix
|
3377b29957
|
Merge pull request #395 from anaqreon/uexport
Add message about exporting by year/month to uexport
|
2015-10-08 11:25:08 +11:00 |
|
redmatrix
|
5390594f40
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-10-06 20:33:12 -07:00 |
|
redmatrix
|
e95753b184
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-10-06 20:32:24 -07:00 |
|
redmatrix
|
6bd0d57c1e
|
version update
|
2015-10-06 20:32:08 -07:00 |
|
redmatrix
|
192b5a41f0
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-10-06 20:31:45 -07:00 |
|
redmatrix
|
c76da2e77d
|
functions to update urls in items when doing migrations
|
2015-10-06 20:30:49 -07: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 |
|
jeroenpraat
|
f5fe37ab09
|
Updated Spanish strings
|
2015-10-05 16:53:43 +02:00 |
|
jeroenpraat
|
08813f1650
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-10-05 16:51:51 +02:00 |
|
jeroenpraat
|
8f7dd2f858
|
Final Spanish strings for Redmatrix
|
2015-10-05 16:50:59 +02:00 |
|
Mario Vavti
|
05050381d3
|
bring our bbcode tools to private mail
|
2015-10-05 12:26:04 +02:00 |
|
redmatrix
|
95d6d2644f
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-10-04 13:49:13 -07:00 |
|
redmatrix
|
dbd981939c
|
version and strings update
|
2015-10-04 13:48:06 -07:00 |
|
Mario Vavti
|
2e45b41902
|
do not show delete conversation in single message view
|
2015-10-04 19:58:20 +02:00 |
|
Mario Vavti
|
7776c56c6c
|
bring single message view to inbox/outbox view
|
2015-10-04 19:51:23 +02:00 |
|
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 |
|