Haakon Meland Eriksen
|
2b2723cb74
|
Merge remote-tracking branch 'upstream/master'
|
2015-11-24 07:23:43 +01:00 |
|
redmatrix
|
8c5203f7e1
|
issue #185 - prevent liveUpdate from updating while the built-in html5 media player is "active". This will not have any affect on flash or other media players, and could potentially get confused if you have more than one media player actively playing at any given time.
|
2015-11-23 17:47:18 -08:00 |
|
redmatrix
|
34b804e9dc
|
Merge pull request #182 from anaqreon/url-selected
Place link around selected text
|
2015-11-24 09:41:55 +11:00 |
|
Haakon Meland Eriksen
|
7338649fa5
|
Merge remote-tracking branch 'upstream/master'
|
2015-11-23 14:16:14 +01:00 |
|
redmatrix
|
a7e4553ea7
|
delivery report tweaks
|
2015-11-22 17:12:30 -08:00 |
|
Haakon Meland Eriksen
|
9ba1b8d720
|
Merge remote-tracking branch 'upstream/master'
|
2015-11-21 17:18:44 +01:00 |
|
Mario Vavti
|
d726c921eb
|
make calendar week start (sun or mon) configurable
|
2015-11-21 15:33:57 +01:00 |
|
Andrew Manning
|
fee8503093
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla into url-selected
|
2015-11-20 21:57:10 -05:00 |
|
Andrew Manning
|
6083cd2559
|
If text is selected in profile-jot-text when the link button is pressed, the input URL is applied around the text. Otherwise, the normal link data fetch occurs.
|
2015-11-20 21:55:13 -05:00 |
|
Haakon Meland Eriksen
|
de1b3d5113
|
Space between Preview and Submit in jot.tpl
|
2015-11-20 21:15:12 +01:00 |
|
Haakon Meland Eriksen
|
830b01bd2a
|
Space between Preview and Submit in jot.tpl
|
2015-11-20 21:12:09 +01:00 |
|
Haakon Meland Eriksen
|
90187eae37
|
Merge remote-tracking branch 'upstream/master'
|
2015-11-20 19:51:57 +01:00 |
|
Mario Vavti
|
7399f7a087
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2015-11-20 16:40:13 +01:00 |
|
Mario Vavti
|
a3e47d26f6
|
make calendar language aware
|
2015-11-20 16:39:55 +01:00 |
|
jeroenpraat
|
d3bef2adc3
|
update es+nl
|
2015-11-20 15:18:51 +01:00 |
|
Haakon Meland Eriksen
|
3b7b3ef2bb
|
Rearranging buttons
|
2015-11-20 07:38:59 +01:00 |
|
Haakon Meland Eriksen
|
b6e4611a91
|
Rearranging buttons
|
2015-11-20 07:35:43 +01:00 |
|
Haakon Meland Eriksen
|
2929bb672a
|
Rearranging buttons
|
2015-11-20 07:29:45 +01:00 |
|
Haakon Meland Eriksen
|
a4765bf954
|
Rearranging buttons
|
2015-11-20 07:03:36 +01:00 |
|
Haakon Meland Eriksen
|
0c2045beff
|
Rearranging buttons
|
2015-11-20 06:52:35 +01:00 |
|
Haakon Meland Eriksen
|
22f6687f44
|
Merge remote-tracking branch 'upstream/master'
|
2015-11-20 06:27:46 +01:00 |
|
jeroenpraat
|
c7652fc29c
|
Had to switch these 2. Sorry.
|
2015-11-20 00:50:54 +01:00 |
|
jeroenpraat
|
a890ee6864
|
Some bits
|
2015-11-20 00:39:47 +01:00 |
|
Haakon Meland Eriksen
|
059886a1e4
|
Merge remote-tracking branch 'upstream/master'
|
2015-11-19 18:44:33 +01:00 |
|
Mario Vavti
|
ba52af786e
|
move today button from aside to section title
|
2015-11-19 11:38:34 +01:00 |
|
Mario Vavti
|
929f524e77
|
css fixes
|
2015-11-19 11:17:24 +01:00 |
|
Haakon Meland Eriksen
|
7b4cfffc03
|
Merge remote-tracking branch 'upstream/master'
|
2015-11-19 00:00:35 +01:00 |
|
Mario Vavti
|
b23284cba2
|
move moment.min.js and remove unneeded files
|
2015-11-18 23:56:25 +01:00 |
|
Mario Vavti
|
e4145deeb7
|
some events refacturing
|
2015-11-18 23:50:42 +01:00 |
|
Haakon Meland Eriksen
|
0d232c612b
|
Merge remote-tracking branch 'upstream/master'
|
2015-11-18 06:48:29 +01:00 |
|
redmatrix
|
68da4d90dc
|
fix admin plugin hooks
|
2015-11-17 20:44:57 -08:00 |
|
Haakon Meland Eriksen
|
545dc5cf65
|
Merge remote-tracking branch 'upstream/master'
|
2015-11-18 01:52:11 +01:00 |
|
redmatrix
|
a089064588
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-11-17 15:04:04 -08:00 |
|
redmatrix
|
a06f7fbe2e
|
photo album widget permissions issue
|
2015-11-17 15:03:27 -08:00 |
|
Mario Vavti
|
6fa0807550
|
more css fixes
|
2015-11-17 23:01:24 +01:00 |
|
Haakon Meland Eriksen
|
c545ada746
|
Merge remote-tracking branch 'upstream/master'
|
2015-11-17 16:49:11 +01:00 |
|
Mario Vavti
|
9e3d130ad9
|
css fixes
|
2015-11-17 11:32:37 +01:00 |
|
Mario Vavti
|
b531486dab
|
show jotnets toggle button only if there are jotnets and whitespace fixes
|
2015-11-17 10:46:38 +01: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 |
|
Haakon Meland Eriksen
|
fd5d1416d9
|
Merge remote-tracking branch 'upstream/master'
|
2015-11-15 00:27:23 +01:00 |
|
jeroenpraat
|
def5edf93c
|
nl+es and some other bits
|
2015-11-14 20:43:34 +01:00 |
|
Haakon Meland Eriksen
|
9d6a4c1d05
|
Reorder buttons HME
|
2015-11-13 19:44:42 +01:00 |
|
Haakon Meland Eriksen
|
94bef08f15
|
Adding original jot.tpl from GitHub
|
2015-11-13 18:32:25 +01:00 |
|
Haakon Meland Eriksen
|
0178840c19
|
Merge remote-tracking branch 'upstream/master'
|
2015-11-13 16:45:31 +01:00 |
|
Haakon Meland Eriksen
|
d04c73ae00
|
Reorder buttons
|
2015-11-13 16:31:48 +01:00 |
|
Haakon Meland Eriksen
|
495f21c08c
|
Reverted changes - got white screen
|
2015-11-13 07:36:32 +01:00 |
|
Haakon Meland Eriksen
|
d238cbea19
|
Regrouped post buttons
|
2015-11-13 07:03:30 +01:00 |
|
redmatrix
|
93e5449c08
|
really basic photo album widget for content regions
|
2015-11-12 20:22:36 -08:00 |
|
Haakon Meland Eriksen
|
921a2e0dc4
|
Regrouped post buttons
|
2015-11-13 00:07:09 +01:00 |
|
jeroenpraat
|
5afe8e5aa1
|
Small update to Bluegrid and generic-content-wrapper-styled to dreport
|
2015-11-12 22:10:20 +01:00 |
|