Andrew Manning
|
3d6359f2e7
|
Removed defunct URL from old auto-update idea
|
2015-12-26 16:20:56 -05:00 |
|
redmatrix
|
31fbd19c86
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-12-25 14:32:16 -08:00 |
|
redmatrix
|
a085f4df7f
|
regression: default inherited permission was not being set for a connection if the permission was 'inherited'. We need to set these so that if somebody changes the top level permissions they don't have to go back and manually edit every connection to allow/deny what used to be an automatic inherited setting.
|
2015-12-25 14:25:58 -08:00 |
|
jeroenpraat
|
cd2c6779b7
|
update es-es strings
|
2015-12-25 17:37:05 +01:00 |
|
redmatrix
|
d39cd088a1
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-12-24 14:41:47 -08:00 |
|
jeroenpraat
|
7d5e066056
|
After reading and talking with experts I came to the conclusion that es-es and es-419 (and such) dont differ that much. Latin-American Spanish (es-419) is a good idea, but we are not in a rush. So linked es to es-es. That's the proper way to do. See also https://github.com/redmatrix/hubzilla/issues/234#issuecomment-167117960
|
2015-12-24 15:29:52 +01:00 |
|
jeroenpraat
|
ba920260b8
|
reverted my previous commit. this is going to be fixed remotely upstream. Meanwhile es points to .es-419. See https://github.com/redmatrix/hubzilla/issues/234#issuecomment-166961958.
|
2015-12-23 19:18:46 +01:00 |
|
jeroenpraat
|
2988d96cf0
|
Spanish language codes. See issue #234
|
2015-12-23 16:41:22 +01:00 |
|
redmatrix
|
36717e5f32
|
start on refactor of plugin/theme/widget info block parsing
|
2015-12-22 19:53:00 -08:00 |
|
jeroenpraat
|
4dff54bcb8
|
update es+nl strings
|
2015-12-22 19:29:52 +01:00 |
|
redmatrix
|
f23e8f8d41
|
merge hell
|
2015-12-20 14:55:43 -08:00 |
|
Haakon Meland Eriksen
|
6409237b29
|
Updated Norwegian strings for Hubzilla
|
2015-12-20 14:42:14 +01:00 |
|
Haakon Meland Eriksen
|
1cfb83f003
|
Merge remote-tracking branch 'upstream/master'
|
2015-12-20 14:09:30 +01:00 |
|
Wave
|
e2692a4baa
|
Merge pull request #230 from wave72/master
Updated Italian strings
|
2015-12-20 10:17:55 +01:00 |
|
wave72
|
474a1267d7
|
Updated Italian strings
|
2015-12-20 10:08:43 +01:00 |
|
Haakon Meland Eriksen
|
628e565a6c
|
Merge remote-tracking branch 'upstream/master'
|
2015-12-18 16:04:07 +01:00 |
|
Mario Vavti
|
f78e9001f3
|
fix search item attachment rendering
|
2015-12-17 19:39:26 +01:00 |
|
zottel
|
020fea3031
|
update to German strings
|
2015-12-16 14:00:23 +01:00 |
|
Wave
|
871ee0f571
|
Merge pull request #222 from wave72/master
Updated Italian strings
|
2015-12-16 09:13:40 +01:00 |
|
Paolo Tacconi
|
933e105f32
|
Updated Italian strings
|
2015-12-16 09:00:27 +01:00 |
|
jeroenpraat
|
5a59cd9b8c
|
Invitation only added to the admin site page. Plus css wrapper class to docu search.
|
2015-12-15 21:00:40 +01:00 |
|
Haakon Meland Eriksen
|
3b1ab5e79c
|
Merge remote-tracking branch 'upstream/master'
|
2015-12-14 18:55:43 +01:00 |
|
jeroenpraat
|
04d3ac9aaf
|
es+nl strings update
|
2015-12-12 17:01:43 +01:00 |
|
Haakon Meland Eriksen
|
565126a888
|
Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version
|
2015-12-12 10:00:15 +01:00 |
|
Haakon Meland Eriksen
|
e7d9863432
|
Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version
|
2015-12-11 19:40:09 +01:00 |
|
Haakon Meland Eriksen
|
b9af0645c2
|
Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version
|
2015-12-11 19:34:29 +01:00 |
|
redmatrix
|
f73c82632f
|
some minor cleanup - change the default of the discover tab (public stream access)
|
2015-12-10 19:18:55 -08:00 |
|
Haakon Meland Eriksen
|
d86bc0b6cf
|
Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version
|
2015-12-10 20:43:32 +01:00 |
|
Haakon Meland Eriksen
|
e01d4f289b
|
Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version
|
2015-12-10 07:27:42 +01:00 |
|
jeroenpraat
|
47f7165b07
|
Some work on the login, register and default home page. Mostly neatly centering things on different viewport widths. Bluegrid schema updated.
|
2015-12-09 23:41:37 +01:00 |
|
jeroenpraat
|
2e73e6bfb6
|
Fix #109.
|
2015-12-09 14:37:14 +01:00 |
|
Haakon Meland Eriksen
|
6a3995014e
|
Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version
|
2015-12-09 07:38:58 +01:00 |
|
Haakon Meland Eriksen
|
534a537319
|
Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version
|
2015-12-09 07:31:18 +01:00 |
|
Haakon Meland Eriksen
|
10eefc4eed
|
Hubzilla textbox - promoting Hubzilla features in jot.tpl - second version
|
2015-12-09 07:28:55 +01:00 |
|
Haakon Meland Eriksen
|
3d4b3b6a92
|
Hubzilla textbox - promoting Hubzilla features in jot.tpl
|
2015-12-09 07:19:31 +01:00 |
|
redmatrix
|
29ac533cc9
|
remove some unused stuff
|
2015-12-08 16:32:06 -08:00 |
|
redmatrix
|
b9f5076cfc
|
move the diaspora templates out of core (except for diaspora_vcard, which is still stuck here for the present time)
|
2015-12-07 19:17:40 -08:00 |
|
jeroenpraat
|
96d94551f9
|
update es+nl
|
2015-12-07 21:10:36 +01:00 |
|
Mario Vavti
|
68cbebe1a5
|
mod_mitem.js is obsolete
|
2015-12-07 20:28:17 +01:00 |
|
Mario Vavti
|
293df6308c
|
some style.css janitor work
|
2015-12-07 18:57:03 +01:00 |
|
Mario Vavti
|
af29822f04
|
override bs default margin
|
2015-12-07 15:45:21 +01:00 |
|
Mario Vavti
|
69c9f4588c
|
make justify gallery work with more than one albums per page (eg album widget)
|
2015-12-07 12:13:51 +01:00 |
|
Mario Vavti
|
c8c9916b59
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2015-12-07 00:01:03 +01:00 |
|
Mario Vavti
|
5490919557
|
css fixes for blockquote and code (use same padding)
|
2015-12-07 00:00:47 +01:00 |
|
redmatrix
|
a88ec1b1af
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-12-06 14:22:55 -08:00 |
|
Mario Vavti
|
78a70fed2f
|
fix css issue in directory
|
2015-12-06 16:37:57 +01:00 |
|
redmatrix
|
9dfe5dee64
|
change text "Red developers" in update failed email
|
2015-12-05 13:56:32 -08:00 |
|
Haakon Meland Eriksen
|
7119976199
|
Merge remote-tracking branch 'upstream/master'
|
2015-12-05 11:26:07 +01:00 |
|
Haakon Meland Eriksen
|
dd7edc8ced
|
Updated Norwegian translation
|
2015-12-05 11:25:36 +01:00 |
|
Andrew Manning
|
0bb7589418
|
Enlarge the default mail composition text area.
|
2015-12-04 15:29:57 -05:00 |
|
jeroenpraat
|
bc0e415926
|
es+nl and bluegrid update
|
2015-12-03 00:01:51 +01:00 |
|
Mario Vavti
|
c48965ea2f
|
fix nav search popup active background color
|
2015-12-02 22:58:38 +01:00 |
|
Mario Vavti
|
593423434c
|
fix attachment rendering for mail
|
2015-12-02 09:44:25 +01:00 |
|
Mario Vavti
|
78e18fcdcf
|
fix badge padding in narrow navbar
|
2015-12-01 13:28:50 +01:00 |
|
Mario Vavti
|
706598313e
|
make narrow navbar setting work again
|
2015-12-01 13:18:08 +01:00 |
|
Wave
|
de1abf9981
|
Merge pull request #201 from wave72/master
Updated Italian strings
|
2015-11-30 16:29:16 +01:00 |
|
Paolo Tacconi
|
c69f6ca1f4
|
Updated Italian strings
|
2015-11-30 16:25:24 +01:00 |
|
Mario Vavti
|
7db86a4e05
|
css fixes
|
2015-11-28 14:47:17 +01:00 |
|
Mario Vavti
|
122d7281f7
|
fix tpl if clause
|
2015-11-28 11:04:33 +01:00 |
|
Mario Vavti
|
fce1dc083b
|
add templates
|
2015-11-27 22:53:36 +01:00 |
|
Mario Vavti
|
bcfa72ed31
|
move events tools to aside widget
|
2015-11-27 22:45:28 +01:00 |
|
Mario Vavti
|
b92cc852d1
|
css fixes
|
2015-11-27 21:44:02 +01:00 |
|
Mario Vavti
|
e569f5d6eb
|
unset does not work in webkit browsers
|
2015-11-27 14:00:37 +01:00 |
|
Mario Vavti
|
ee153f64d4
|
add spinner to events
|
2015-11-27 13:32:20 +01:00 |
|
Mario Vavti
|
a73c385831
|
lost calendar icon
|
2015-11-26 23:29:49 +01:00 |
|
Mario Vavti
|
91b35c5349
|
various css fixes
|
2015-11-26 23:19:06 +01:00 |
|
Mario Vavti
|
056db37c66
|
beautify event item code
|
2015-11-26 22:14:20 +01:00 |
|
Mario Vavti
|
5cb71fa5da
|
default timepicker to 15 min steps. abbr -> span
|
2015-11-26 21:00:04 +01:00 |
|
Mario Vavti
|
8a269823d2
|
improve event rendering
|
2015-11-26 20:53:42 +01:00 |
|
Mario Vavti
|
c407e72dcc
|
add location
|
2015-11-26 16:40:40 +01:00 |
|
Mario Vavti
|
8e3b796a2f
|
fix event rendering
|
2015-11-26 16:38:14 +01:00 |
|
Mario Vavti
|
17e7b276f6
|
we also need nofinish in the object. css fices
|
2015-11-26 14:45:22 +01:00 |
|
Mario Vavti
|
306ce3819e
|
css fixes
|
2015-11-26 14:16:35 +01:00 |
|
Mario Vavti
|
c7cbd41c16
|
first iteration on the event item
|
2015-11-26 12:26:27 +01:00 |
|
redmatrix
|
41542e6886
|
document that you probably shouldn't set a primary directory server in somebody else's realm.
|
2015-11-25 17:34:03 -08:00 |
|
redmatrix
|
192e85ffa4
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-11-25 15:14:20 -08:00 |
|
redmatrix
|
b334201797
|
removed block style on dropdown contact name and details, added dropdown-menu-img-sm on nav search dropdown; as many dropdowns were unuseable
|
2015-11-25 15:12:54 -08:00 |
|
Mario Vavti
|
3ea84d7eab
|
some basic event styling
|
2015-11-25 22:55:07 +01:00 |
|
Mario Vavti
|
a80c45940e
|
add a if clause for the case we do not have a finish date
|
2015-11-25 19:02:48 +01:00 |
|
Mario Vavti
|
ab71e33d83
|
note to self: do not make things more complicated than they need to be.
|
2015-11-25 17:28:26 +01:00 |
|
Mario Vavti
|
fe57e7059b
|
events: make sure default finish date is one hour after start date and shift the finishdate if startdate is shifted
|
2015-11-25 15:05:21 +01:00 |
|
Mario Vavti
|
74a40adece
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2015-11-24 19:18:52 +01:00 |
|
Mario Vavti
|
1767a07f4d
|
efent form template fixes
|
2015-11-24 19:18:26 +01:00 |
|
Wave
|
af7549d2f6
|
Merge pull request #187 from wave72/master
Updated Italian strings
|
2015-11-24 17:02:58 +01:00 |
|
Paolo Tacconi
|
e785b723aa
|
Updated Italian strings
|
2015-11-24 16:50:12 +01:00 |
|
Mario Vavti
|
f520cd92d0
|
open form on dbl-click
|
2015-11-24 14:33:23 +01:00 |
|
Mario Vavti
|
987619130b
|
some event heavy lifting - please test and report issues
|
2015-11-24 14:15:28 +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 |
|
redmatrix
|
a7e4553ea7
|
delivery report tweaks
|
2015-11-22 17:12:30 -08: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 |
|
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 |
|
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 |
|
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 |
|