Mario Vavti
|
b664af748e
|
provide help button in context help popup
|
2016-04-28 13:08:41 +02:00 |
|
Mario Vavti
|
f108838ca9
|
css fix
|
2016-04-28 11:42:37 +02:00 |
|
Mario Vavti
|
a6baa5a6da
|
some refinements on jot
|
2016-04-27 11:36:02 +02:00 |
|
Mario Vavti
|
607125e795
|
only padding-top needs adjustment
|
2016-04-26 16:15:29 +02:00 |
|
Mario Vavti
|
f34dcffbd9
|
hopefully fix jot dropdown visibility issue
|
2016-04-26 13:45:39 +02:00 |
|
Mario Vavti
|
3446e68ac2
|
move spoiler= and quote= bbcode handling from prepare_body() to bbcode() and add open tag to bbco_autocomplete
|
2016-04-26 11:41:08 +02:00 |
|
Mario Vavti
|
5553df862a
|
fix top padding for narrow navbar
|
2016-04-26 09:49:54 +02:00 |
|
jeroenpraat
|
975140634c
|
+es-es strings update
|
2016-04-25 15:15:24 +02:00 |
|
Mario Vavti
|
a9d926886e
|
make it more obvious what is behind the dropdowns
|
2016-04-25 10:00:50 +02:00 |
|
Mario Vavti
|
15cfd6fda7
|
revert inline-block for blockquote
|
2016-04-24 12:45:38 +02:00 |
|
Mario Vavti
|
9d698c0887
|
fix context help position with narrow navbar
|
2016-04-23 23:52:39 +02:00 |
|
Mario Vavti
|
1e27038b73
|
update jquery.textcomplete to version 1.3.4 and add minified version
|
2016-04-23 21:42:10 +02:00 |
|
Mario Vavti
|
78bf4564f2
|
make the link to /help in dropdown conditional to the use of context help
|
2016-04-23 17:22:39 +02:00 |
|
Mario Vavti
|
57110cbe76
|
pull-right is not needed here
|
2016-04-23 16:52:02 +02:00 |
|
Mario Vavti
|
b0a2e5d3f7
|
simplify context help js and move it to main.js where all the nav related js resides, do not close the context help if we click outside of it - members might want to work on something while help is open, move the link to /help to dropdown-menu.
|
2016-04-23 16:39:56 +02:00 |
|
Mario Vavti
|
0463df62f0
|
only display help button in collapsed panel if context help is enabled
|
2016-04-23 13:21:25 +02:00 |
|
redmatrix
|
a8823ae7d8
|
Merge branch 'master' into dev
|
2016-04-23 00:06:30 -07:00 |
|
phellmes
|
61e695e143
|
Update DE translation strings
|
2016-04-22 20:00:14 +02:00 |
|
Mario Vavti
|
d66f6c8e8c
|
make it icon-question-sign for contextual and icon-question for normal help instead of adding a caret-down
|
2016-04-22 09:16:17 +02:00 |
|
redmatrix
|
5a427dcee3
|
No idea how long RSD (Really Simple Discovery) has been broken. I had no idea it was even here.
|
2016-04-21 20:14:55 -07:00 |
|
Mario Vavti
|
cb8c83a42b
|
remove obsolete class
|
2016-04-21 23:56:53 +02:00 |
|
Mario Vavti
|
bd11b1d61a
|
indicate if we will be displayed contextual help or default help
|
2016-04-21 23:55:38 +02:00 |
|
Mario Vavti
|
96d19c09f3
|
fix help button for collapsed state
|
2016-04-21 23:19:17 +02:00 |
|
Mario Vavti
|
d7f4bfedd5
|
some fixes for contextual help and disable transition animation for now - it looked really wired because main moved with a different speed than help-content and help-content can not be displayed under the panel as it is implemented now.
|
2016-04-21 23:03:09 +02:00 |
|
Andrew Manning
|
82de68c3d3
|
Added admin/site setting that toggles context help panel. If disabled, original help menu button behavior is restored.
|
2016-04-21 06:41:55 -04:00 |
|
Andrew Manning
|
b96eb1c823
|
Merge branch 'dev' into toggle-context-help
|
2016-04-20 21:05:01 -04:00 |
|
redmatrix
|
635580091a
|
Merge branch 'master' into dev
|
2016-04-20 17:43:20 -07:00 |
|
Mario Vavti
|
59799ba2b4
|
some crossbrowser rendering work on the comment box
|
2016-04-20 21:59:29 +02:00 |
|
Mario Vavti
|
8147e6203f
|
Use stopImmidiatePropagation() only if we are in a list to not interfere with other keypress listeners (e.g. chat).
|
2016-04-20 14:13:09 +02:00 |
|
Andrew Manning
|
7594796ee1
|
Try toggling context help using onclick attribute
|
2016-04-19 05:52:16 -04:00 |
|
redmatrix
|
2a4e8972e0
|
module updates
|
2016-04-18 20:38:38 -07:00 |
|
redmatrix
|
a9f68e4d2a
|
Merge branch 'master' into dev
|
2016-04-18 01:02:44 -07:00 |
|
jeroenpraat
|
7229cd56ed
|
Making sure the great new context help works with all thmes and schema's (3rd party themes: maybe abit of tweaking is still needed). Also fixing some minor cosmetic things.
|
2016-04-18 01:57:54 +02:00 |
|
jeroenpraat
|
c8dec1fae5
|
Spanish and Dutch strings update
|
2016-04-17 19:27:40 +02:00 |
|
Andrew Manning
|
d7fe48d1b6
|
New help panel that slides in from the top and pushes the content down so it is not covered. Panel toggles with help button. Still some bugs with small screen viewing.
|
2016-04-17 07:09:42 -04:00 |
|
Mario Vavti
|
2cb04ccb8f
|
nav: move js and css out of template, provide a help button in the panel on small screens and lots of whitespace cleanup
|
2016-04-15 12:39:22 +02:00 |
|
Mario Vavti
|
ce34c4086d
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2016-04-15 09:53:34 +02:00 |
|
Mario Vavti
|
fe9df64fc2
|
fix some slight crossbrowser rendering issues with jot
|
2016-04-15 09:52:40 +02:00 |
|
Paolo Tacconi
|
45a854762b
|
Resolved conflict in view/it/hstrings.php
|
2016-04-15 09:20:58 +02:00 |
|
Paolo Tacconi
|
1806da0851
|
Updated Italian strings
|
2016-04-15 09:09:59 +02:00 |
|
redmatrix
|
9a0b61e4af
|
refactor the js detection into a checkjs class which is only enabled on demand (currently only the channel and display pages). Will probably require a bit more work to hide/disable the cover photo when js is disabled. Have not actually tested without js to discover any other potential page issues. Have only confirmed that the detection class works and redirects to set a jsdisabled cookie and reload the page with that cookie+variable set if called from the channel page.
|
2016-04-13 16:31:06 -07:00 |
|
redmatrix
|
91cc365143
|
reverse the logic of the jsenabled setting so that sessions without js are performance penalised instead of regular sessions.
|
2016-04-12 22:55:26 -07:00 |
|
Mario Vavti
|
571c72f853
|
improve bbco autocomplete to not execute listNewLineAutocomplete() many times after many ajax page reloads
|
2016-04-12 11:55:50 +02:00 |
|
redmatrix
|
b788b38edf
|
remove obsolete jotVideoURL() and jotAudioURL()
|
2016-04-11 21:40:03 -07:00 |
|
redmatrix
|
326f3cfc85
|
Merge branch 'master' into dev
|
2016-04-11 00:52:34 -07:00 |
|
redmatrix
|
0269825bc0
|
localise the opensearch link
|
2016-04-10 21:56:16 -07:00 |
|
redmatrix
|
5cb3143c04
|
issue #331 use timeago.js for reshared publish date instead of relative_date() which does not play well with other networks.
|
2016-04-10 21:30:35 -07:00 |
|
redmatrix
|
e9f1bac062
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-04-10 17:03:30 -07:00 |
|
jeroenpraat
|
f437705007
|
Update Dutch and Spanish
|
2016-04-10 20:58:00 +02:00 |
|
Mario Vavti
|
e2b4d33627
|
some work on comanche autocomplete
|
2016-04-09 12:16:42 +02:00 |
|
Mario Vavti
|
7690dca67b
|
enable bbcode autocomplete for other places
|
2016-04-09 09:24:14 +02:00 |
|
redmatrix
|
c0bdcfedeb
|
log if the session handler fails and surface the ssl_cookie config setting
|
2016-04-08 05:10:36 -07:00 |
|
Mario Vavti
|
cf84ff3344
|
translate the most common bbcodes to their *real name*. finally we should probably use an array for each bbcode containing the bbcode the real name and possibly a template for use as a peview in the dropdown
|
2016-04-07 23:03:55 +02:00 |
|
Mario Vavti
|
e419b2c18c
|
some more autocompletion for bbcode tables - leave it open if we wanna use th or td though
|
2016-04-07 11:34:38 +02:00 |
|
Mario Vavti
|
58324473a9
|
move li back in the list since it will be used far less than list
|
2016-04-07 11:16:30 +02:00 |
|
Mario Vavti
|
e41082dccc
|
automate bbcode list creation even further
|
2016-04-07 00:46:45 +02:00 |
|
Mario Vavti
|
97ccbf1bfb
|
adjust the regex to also work with asteriks and use the simpler syntax for lists
|
2016-04-06 22:18:59 +02:00 |
|
Andrew Manning
|
1eb6067c31
|
Improve (un)ordered list autocompletion for list construction
|
2016-04-05 14:46:16 -04:00 |
|
Mario Vavti
|
bd29551f9a
|
fix contextual help
|
2016-04-05 16:59:32 +02:00 |
|
Mario Vavti
|
32ccdd1f57
|
use min version of justifiedGallery
|
2016-04-05 15:28:39 +02:00 |
|
Mario Vavti
|
deaf0e99fd
|
expand list of bbcode in autocomplete
|
2016-04-05 15:27:45 +02:00 |
|
Mario Vavti
|
d99a1d8de0
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2016-04-05 15:24:42 +02:00 |
|
Mario Vavti
|
0012030826
|
update upstream lib jusutifiedGallery
|
2016-04-05 15:24:05 +02:00 |
|
redmatrix
|
ec41170121
|
Merge pull request #338 from anaqreon/contextual-help
Contextual help
|
2016-04-05 22:43:15 +10:00 |
|
Mario Vavti
|
1c9f773900
|
Merge branch 'master' into dev
|
2016-04-04 17:13:10 +02:00 |
|
Mario Vavti
|
ec651f219e
|
a simple autocomplete for bbcode or comanche - partly implemented
|
2016-04-04 17:12:23 +02:00 |
|
Mario Vavti
|
ee8a9384d5
|
Merge branch 'master' into dev
|
2016-04-04 10:37:20 +02:00 |
|
Mario Vavti
|
bba34a7a8e
|
do not use dropdown class if there is nothing to dropdown
|
2016-04-04 10:37:07 +02:00 |
|
Mario Vavti
|
dfa12b2919
|
Merge branch 'master' into dev
|
2016-04-04 10:13:30 +02:00 |
|
Mario Vavti
|
9b9f29a0b2
|
whitespace
|
2016-04-04 10:10:19 +02:00 |
|
Mario Vavti
|
4a9aad2a33
|
whitespace
|
2016-04-04 10:09:46 +02:00 |
|
Mario Vavti
|
69617b5c34
|
fullscreen mode for photo albums view
|
2016-04-04 10:09:13 +02:00 |
|
Andrew Manning
|
0523b4b2f1
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla into contextual-help
|
2016-04-03 21:36:29 -04:00 |
|
redmatrix
|
a703835b5c
|
Bug: "remember me" doesn't
|
2016-04-03 17:38:17 -07:00 |
|
Mario Vavti
|
f13096a6f3
|
various fixes
|
2016-04-03 18:00:03 +02:00 |
|
Mario Vavti
|
53311a30ad
|
reduce chat-item-title fontsize to match wall-item-ago
|
2016-04-03 15:27:10 +02:00 |
|
Mario Vavti
|
db4e9aeaad
|
fullscreen mode for events
|
2016-04-03 12:19:49 +02:00 |
|
Mario Vavti
|
b8d8be7013
|
show chat expiration time in overview and minor fixes
|
2016-04-03 11:34:07 +02:00 |
|
Mario Vavti
|
3edd4ce78f
|
ease transition between fullscreen and inline view for small screens
|
2016-04-03 00:04:05 +02:00 |
|
jeroenpraat
|
72d995d35f
|
Update nl and es-es strings
|
2016-04-01 23:24:13 +02:00 |
|
Mario Vavti
|
5b55726a93
|
on update only jump to bottom if we actually got a new message
|
2016-04-01 11:13:04 +02:00 |
|
Mario Vavti
|
bbe93d0e1d
|
scroll chat to bottom on fullscreen toggle
|
2016-04-01 10:29:58 +02:00 |
|
Mario Vavti
|
a564f495a7
|
improve scroll to bottom in chat
|
2016-04-01 10:20:10 +02:00 |
|
Mario Vavti
|
60bb8f25f7
|
move fullscreen js code to redbasic.js where it belongs to
|
2016-04-01 08:56:51 +02:00 |
|
Mario Vavti
|
c6d9100649
|
missing template
|
2016-04-01 08:36:02 +02:00 |
|
redmatrix
|
c0b3d7e1b4
|
Merge branch 'static'
|
2016-03-31 17:32:51 -07:00 |
|
redmatrix
|
9abd95fad3
|
static App
|
2016-03-31 16:06:03 -07:00 |
|
Mario Vavti
|
50d9b29347
|
slightly change the way fullscreen works and bring it to mod mail
|
2016-04-01 00:16:39 +02:00 |
|
Mario Vavti
|
90a5ba01a3
|
make fullscreen mode available for other modules and some cleanup
|
2016-03-31 23:13:40 +02:00 |
|
Mario Vavti
|
6c2673ae2a
|
various fixes regarding mod chat
|
2016-03-31 22:42:28 +02:00 |
|
Mario Vavti
|
3fdd110e07
|
mod chat rework continued
|
2016-03-31 13:21:48 +02:00 |
|
redmatrix
|
1cd3b41825
|
deprecate $a->get_baseurl()
|
2016-03-30 22:13:24 -07:00 |
|
Mario Vavti
|
df891f4ad2
|
more work on mod chat
|
2016-03-31 00:37:40 +02:00 |
|
Mario Vavti
|
08461c7049
|
more on mod chat
|
2016-03-30 14:44:03 +02:00 |
|
Mario Vavti
|
5462453bf2
|
some work on mod chat
|
2016-03-30 14:31:55 +02:00 |
|
Mario Vavti
|
ba0812c447
|
highlight table row on hover
|
2016-03-27 22:37:07 +02:00 |
|
jeroenpraat
|
dbde9a0940
|
Update es_es+n. Switch the feeds as requested by Mike.
|
2016-03-27 14:03:02 +02:00 |
|
Mario Vavti
|
97eef2b88c
|
removed link to connected apps by accident
|
2016-03-26 19:34:38 +01:00 |
|
Andrew Manning
|
661b0084f3
|
Added help for post permissions
|
2016-03-26 14:17:53 -04:00 |
|
Mario Vavti
|
f714e97d63
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2016-03-26 18:46:07 +01:00 |
|
Mario Vavti
|
a507063174
|
move link to /locs to settings menu if we have more than one location and some template work on locs
|
2016-03-26 18:43:38 +01:00 |
|
phellmes
|
9b06d952a2
|
Update DE translation strings
|
2016-03-24 09:08:12 +01:00 |
|
Andrew Manning
|
59827b6dfd
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla into contextual-help
|
2016-03-23 21:17:23 -04:00 |
|
redmatrix
|
a8ac0ed549
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2016-03-22 19:59:47 -07:00 |
|
redmatrix
|
6f2ba0c619
|
rewrite the webfinger discovery logic
|
2016-03-22 19:58:59 -07:00 |
|
Wave
|
0a14ac1f60
|
Merge pull request #332 from wave72/master
Updated Italian strings
|
2016-03-22 11:53:57 +01:00 |
|
Paolo Tacconi
|
02140b2f76
|
Updated Italian strings
|
2016-03-22 11:49:03 +01:00 |
|
Mario Vavti
|
c6b89b99b9
|
Add a link to /locs to channel manager
|
2016-03-22 10:29:17 +01:00 |
|
Mario Vavti
|
97e1a6dfde
|
whip mod manage into shape
|
2016-03-22 02:06:19 +01:00 |
|
Andrew Manning
|
56c86b6567
|
Override navbar help button to open contextual help panel. Contextual help for mail written.
|
2016-03-21 06:33:02 -04:00 |
|
redmatrix
|
d3e7ef70e8
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2016-03-20 19:56:36 -07:00 |
|
redmatrix
|
fea532af4d
|
rework salmon - important, update addons also if you have enabled gnusoc addon
|
2016-03-20 19:55:53 -07:00 |
|
Mario Vavti
|
1ddb43b0d3
|
an attempt to visualize the supremacy of dont show over show in the acl selector
|
2016-03-20 23:07:39 +01:00 |
|
jeroenpraat
|
23419e4c26
|
Update NL + es_ES strings.
|
2016-03-20 14:39:22 +01:00 |
|
Mario Vavti
|
f7ff48f806
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2016-03-20 01:46:13 +01:00 |
|
Mario Vavti
|
30cf56bdb5
|
make >>indicate group members<< in acl selector work again on group > show or group > dont show is selected
|
2016-03-20 01:45:56 +01:00 |
|
redmatrix
|
77094f8d2b
|
make the admin side menu extensible and provide a hook for a channel "move" operation that federation plugins might use to re-establish connections after a channel move.
|
2016-03-19 16:17:19 -07:00 |
|
Mario Vavti
|
51cd4e8519
|
missing return false for map link
|
2016-03-19 02:20:59 +01:00 |
|
Mario Vavti
|
bd249b276d
|
add use as cover photo link to photos view
|
2016-03-18 17:49:31 +01:00 |
|
Mario Vavti
|
40162cd6b7
|
some work on profile listing
|
2016-03-17 12:56:55 +01:00 |
|
Mario Vavti
|
a41a05e6c0
|
bring more structure to profiles edit
|
2016-03-17 11:50:53 +01:00 |
|
Mario Vavti
|
2165733ddc
|
move buttons to dropdown menu and some cleanup
|
2016-03-16 23:07:29 +01:00 |
|
Mario Vavti
|
d22b21c56f
|
still more janitor work on profiles
|
2016-03-16 13:45:24 +01:00 |
|
Mario Vavti
|
d98d7003ed
|
even more janitor work on profiles
|
2016-03-15 21:38:03 +01:00 |
|
redmatrix
|
01a28ddf8d
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2016-03-15 01:32:41 -07:00 |
|
redmatrix
|
e8d19659c0
|
some heavy lifting porting the old salmon code
|
2016-03-15 00:50:03 -07:00 |
|
jeroenpraat
|
b8e8517725
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2016-03-14 15:46:57 +01:00 |
|
jeroenpraat
|
def0454952
|
update nl + es-es strings
|
2016-03-14 15:43:51 +01:00 |
|
redmatrix
|
fbfa391965
|
Merge pull request #323 from phellmes/de20160313
Update DE translation strings
|
2016-03-14 10:45:54 +11:00 |
|
Mario Vavti
|
38beabb508
|
fix spacing
|
2016-03-13 21:27:29 +01:00 |
|
Mario Vavti
|
370a007ee2
|
more janitor work on profiles
|
2016-03-13 21:19:15 +01:00 |
|
phellmes
|
a752d44313
|
Update DE translation strings
|
2016-03-13 13:29:14 +01:00 |
|
Mario Vavti
|
2d8deb6082
|
some janitor work on profiles
|
2016-03-12 22:13:46 +01:00 |
|
redmatrix
|
7bb461380e
|
issue #319 - make sure we have a local_channel() and an App::channel before trying to change the default schema for a channel
|
2016-03-09 14:15:50 -08:00 |
|
redmatrix
|
cf4dc2caa8
|
move "generator" to HttpMeta
|
2016-03-08 16:21:35 -08:00 |
|
Wave
|
8f4fe106ef
|
Merge pull request #314 from wave72/master
Updated Italian strings
|
2016-03-08 15:54:54 +01:00 |
|
Paolo Tacconi
|
d74274c7e4
|
Updated Italian strings
|
2016-03-08 15:51:21 +01:00 |
|
Mario Vavti
|
d59268a5d8
|
removed id by mistake - add it again
|
2016-03-08 11:47:17 +01:00 |
|
Mario Vavti
|
f364343b55
|
add generic-content-wrapper and setction-content-wrapper to profile_edit.tpl
|
2016-03-08 11:43:21 +01:00 |
|
redmatrix
|
32e903e956
|
a bit of page cleanup for edit profiles
|
2016-03-07 18:49:17 -08:00 |
|
jeroenpraat
|
24fa201218
|
Small, but important fix for Dutch
|
2016-03-08 01:47:01 +01:00 |
|
redmatrix
|
1a77fb4c1d
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2016-03-07 15:12:09 -08:00 |
|
redmatrix
|
d5db25808a
|
Facebook scraper "OpenGraph" support; modules will need to set the required fields (type, image, url) as well as any desired optional or type specific fields. We will set the title during pagebuild.
|
2016-03-07 15:03:53 -08:00 |
|
Mario Vavti
|
6824fb9f93
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2016-03-07 21:48:12 +01:00 |
|
Mario Vavti
|
b2216f8203
|
prevent page jumping if the narrow navbar setting is used
|
2016-03-07 21:47:52 +01:00 |
|
jeroenpraat
|
0799a0a3be
|
Spanish and Dutch strings + fix es>es-es link
|
2016-03-07 20:29:14 +01:00 |
|
redmatrix
|
a2e0574fce
|
Merge pull request #312 from jeroenpraat/master
Redbasic: Fix the issue with derived themes and schemas
|
2016-03-08 06:03:55 +11:00 |
|
Jeroen van Riet Paap
|
68d7ab6b55
|
Merge pull request #308 from HaakonME/master
Updated Norwegian strings for Hubzilla.
@HaakonME Can you please check if this commit is correct: https://github.com/redmatrix/hubzilla/pull/308/files#diff-8844953d2396d7486ea8e8b194c1ce96
|
2016-03-07 19:53:58 +01:00 |
|
Jeroen van Riet Paap
|
4a2c805270
|
Merge pull request #310 from einervonvielen/updated_homeinstall_instructions
Updated readme.md for homeinstall script
|
2016-03-07 19:49:58 +01:00 |
|
Jeroen van Riet Paap
|
95f5f3d44d
|
Show only schema selector when Redbasic (so not a derived theme)
|
2016-03-07 17:06:10 +01:00 |
|
Jeroen van Riet Paap
|
7a5213cc8e
|
Set the schema to the default schema in derived themes.
See the documentation for creating derived themes how to override this.
|
2016-03-07 17:03:02 +01:00 |
|
Jeroen van Riet Paap
|
f1f19372ad
|
Update config.php
|
2016-03-07 17:01:12 +01:00 |
|
Tobias Luther
|
1c6faa3a00
|
Added Link to TOS to EMail templates targeting members
|
2016-03-06 18:45:43 +01:00 |
|
Haakon Meland Eriksen
|
a1e4940bea
|
Merge remote-tracking branch 'upstream/master'
|
2016-03-06 18:33:28 +01:00 |
|
root
|
287ffe93f6
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2016-03-06 17:24:15 +01:00 |
|
root
|
2407379623
|
Das ist notwendig, um weiter zu arbeien. Merge branch 'master' of https://github.com/einervonvielen/hubzilla
|
2016-03-06 17:19:33 +01:00 |
|
jeroenpraat
|
7162403292
|
Also make it clear with (mouse) hover text that you must click on the cover photo to show the channel/more
|
2016-03-06 17:02:58 +01:00 |
|
jeroenpraat
|
004468f231
|
Mouse cursor set to pointer for coverphoto div (instead of arrow). Or else it's not clear that you can click on it to show something (the channel in this case).
|
2016-03-06 16:21:26 +01:00 |
|
Haakon Meland Eriksen
|
2d7e307e74
|
Updated Norwegian strings for Hubzilla
|
2016-03-05 14:11:56 +01:00 |
|
Mario Vavti
|
25ebac8d0b
|
show cover-photo upload link only for the default profile
|
2016-03-04 16:07:41 +01:00 |
|
Mario Vavti
|
edf6da7189
|
add cover photo upload link to edit profile
|
2016-03-04 15:44:33 +01:00 |
|
Mario Vavti
|
d3491c9165
|
fix jot form
|
2016-03-03 13:46:08 +01:00 |
|
Mario Vavti
|
8ca877bdd3
|
slide up cover on click
|
2016-03-03 12:31:49 +01:00 |
|
Mario Vavti
|
b704f977da
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2016-03-03 12:08:21 +01:00 |
|
Mario Vavti
|
59e04aed1b
|
move cover-photo to template, add the ability to define a title and subtitle (defaults to channel name and addres), move js from redbasic.js to template.
|
2016-03-03 12:07:58 +01:00 |
|
redmatrix
|
6f4c45a489
|
UI cleanup for admin profile field management page
|
2016-03-02 15:36:14 -08:00 |
|
Jeroen van Riet Paap
|
aa62bad07b
|
little nl string fix
|
2016-03-02 15:33:18 +01:00 |
|
Mario Vavti
|
d3f2d2a2db
|
small fix to simple cover-photo
|
2016-03-02 14:30:33 +01:00 |
|
Mario Vavti
|
c5d08fd5fd
|
add a fade in effect to main while scrolling up cover photo
|
2016-03-02 13:33:18 +01:00 |
|
Mario Vavti
|
22729da2a2
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2016-03-02 12:31:46 +01:00 |
|
Mario Vavti
|
c97cc1487c
|
a simple cover-photo implementation for redbasic default template
|
2016-03-02 12:31:25 +01:00 |
|
redmatrix
|
428b4dbad6
|
sort out the with and howlong dependencies
|
2016-03-01 22:47:07 -08:00 |
|
redmatrix
|
548bf884a4
|
profile field admin page (functional only: still needs a lot of HTML/CSS cleanup)
|
2016-03-01 21:06:27 -08:00 |
|
redmatrix
|
a0baa480e3
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2016-03-01 15:01:48 -08:00 |
|
redmatrix
|
765dd5569b
|
Allow configuration of the display order of profile fields. This is an important piece of a more general profile configuration framework which will eventually be accessible via the admin page.
|
2016-03-01 14:55:04 -08:00 |
|
Mario Vavti
|
966d1586c0
|
fix js error and add id to field input block
|
2016-03-01 20:40:11 +01:00 |
|
Mario Vavti
|
4df78b06cf
|
fix padding
|
2016-03-01 15:11:15 +01:00 |
|
Mario Vavti
|
492609d20b
|
do not show empty buttons if not logged in
|
2016-03-01 14:41:14 +01:00 |
|
Mario Vavti
|
0f76af261c
|
another resize issue
|
2016-03-01 14:11:42 +01:00 |
|
Mario Vavti
|
9d00db06b2
|
fix resize issue
|
2016-03-01 14:03:34 +01:00 |
|
Mario Vavti
|
141f3e21b2
|
move preview content outside of editor space
|
2016-03-01 13:40:19 +01:00 |
|
Mario Vavti
|
fe6cbb414c
|
adjust padding
|
2016-03-01 13:32:18 +01:00 |
|
Mario Vavti
|
e13d65eea3
|
set line-height to initial
|
2016-03-01 13:29:59 +01:00 |
|
Mario Vavti
|
4d6050f8e5
|
another css fix
|
2016-03-01 13:22:19 +01:00 |
|
Mario Vavti
|
0ebce75c7d
|
css fixes to make jot look better with background colors or images
|
2016-03-01 13:09:04 +01:00 |
|
Mario Vavti
|
2d45f9f385
|
provide footer bbcode
|
2016-02-29 23:58:32 +01:00 |
|
Mario Vavti
|
d27a627c4f
|
simplify profile edit button(s) and make it useful for multiple profiles
|
2016-02-29 22:01:13 +01:00 |
|
jeroenpraat
|
55ab5360d9
|
update es-es. tested it and it works now. Don't know what happened earlier.
|
2016-02-29 19:36:53 +01:00 |
|
jeroenpraat
|
60b818eb24
|
revert es-es update. something went wrong. later today I will examine what.
|
2016-02-29 09:07:29 +01:00 |
|
jeroenpraat
|
69c6d8b617
|
update es-es strings
|
2016-02-28 17:33:22 +01:00 |
|
redmatrix
|
44797fe988
|
Merge pull request #302 from phellmes/de20160227
Update DE translation strings
|
2016-02-28 09:57:04 +11:00 |
|
jeroenpraat
|
df69465357
|
update NL strings
|
2016-02-27 15:56:45 +01:00 |
|
phellmes
|
e4361cb202
|
Update DE translation strings
|
2016-02-27 14:28:06 +01:00 |
|
Mario Vavti
|
58cf9d832c
|
make attach_delete() return and comment out album rename functionality since this is not supported by the backend at the moment.
|
2016-02-27 12:31:07 +01:00 |
|
Mario Vavti
|
df57c90d2d
|
several photo item template fixes
|
2016-02-26 14:25:18 +01:00 |
|
Mario Vavti
|
b2474334a7
|
provide an edit button for the profile page
|
2016-02-25 22:50:16 +01:00 |
|
Mario Vavti
|
be27fb5644
|
we have got a button for events in the nav. no need for it in the tabs if we are local.
|
2016-02-25 13:40:15 +01:00 |
|
redmatrix
|
43521bb10b
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2016-02-24 18:56:04 -08:00 |
|
redmatrix
|
c95d7c69eb
|
issue #216 - calendar sharing
|
2016-02-24 18:54:52 -08:00 |
|
jeroenpraat
|
f12b0fe316
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2016-02-25 02:05:16 +01:00 |
|
jeroenpraat
|
8944d7a7a2
|
another dutch update
|
2016-02-25 02:03:58 +01:00 |
|
redmatrix
|
6300f47cdc
|
schema change to support channel move (a completely different operation than channel clone)
|
2016-02-24 17:00:16 -08:00 |
|
redmatrix
|
2b95580cc0
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2016-02-24 16:41:46 -08:00 |
|
jeroenpraat
|
93b84f1262
|
interim dutch string update
|
2016-02-25 01:39:50 +01:00 |
|
Mario Vavti
|
9d3ce55978
|
fix boxy scheme
|
2016-02-25 00:24:58 +01:00 |
|
redmatrix
|
7e6febe2a6
|
add 'requires' field to plugin info to list other dependent plugins/addons and disable if dependencies are not installed/enabled
|
2016-02-24 15:19:28 -08:00 |
|
Mario Vavti
|
e73df9ed1d
|
give nav dropdowns a fixed width to preventtext-overflow: ellipsis cut of to much of the text in some situations
|
2016-02-24 23:16:42 +01:00 |
|
Wave
|
f15a06c0c2
|
Merge pull request #296 from wave72/master
Updated Italian strings
|
2016-02-23 11:55:23 +01:00 |
|
Paolo Tacconi
|
ab89eb050a
|
Updated Italian strings
|
2016-02-23 11:52:45 +01:00 |
|
Mario Vavti
|
dd6e3d873d
|
some work on mod/register
|
2016-02-22 13:04:48 +01:00 |
|
redmatrix
|
2c3bec3d7c
|
Merge pull request #291 from phellmes/de201602201300
Update DE strings
|
2016-02-22 12:43:15 +11:00 |
|
jeroenpraat
|
1fcc863298
|
There was nothing wrong with my pimped pubsites (was another problem). Took the opportunity to update schemas. Plus updated spanish and dutch strings.
|
2016-02-21 23:00:12 +01:00 |
|
jeroenpraat
|
0c5a2925ad
|
Pimped the pubsites page. I tried to get this into a .tpl-file, but it was to complicated for me. Pubsites page is now more narrow (fits on most devices) and location is not taking a complete column (location is almost never used). Also a fix on the auto-create-channel part on the register page.
|
2016-02-21 19:31:11 +01:00 |
|
Mario Vavti
|
22f172d697
|
grid->network, whitespace and bootstrapify create button
|
2016-02-20 14:01:20 +01:00 |
|
phellmes
|
fe9abcfaae
|
Update DE strings
|
2016-02-20 13:47:25 +01:00 |
|
Mario Vavti
|
fbc6c60805
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2016-02-19 22:28:57 +01:00 |
|
Mario Vavti
|
02e82e496e
|
pimp up mod new_channel
|
2016-02-19 22:28:21 +01:00 |
|
redmatrix
|
8e586008dd
|
issue #287 require old password to change password
|
2016-02-19 13:18:51 -08:00 |
|
jeroenpraat
|
33c34984e6
|
h1>h2 (thanks to Mario) and help text below label on register page (like on new channel).
|
2016-02-18 19:48:11 +01:00 |
|
jeroenpraat
|
fe392a3144
|
Removed export temporary from UNO. Removed 'Remove Channel' from UNO, cause a UNO member has only 1 channel, so it's logical to remove the acccount (by experience on UNO hub). Styling oauth settings.
|
2016-02-18 16:53:04 +01:00 |
|
Wave
|
eeed7077ca
|
Merge pull request #286 from wave72/master
updated Italian strings
|
2016-02-18 15:06:19 +01:00 |
|
Paolo Tacconi
|
dba1854837
|
updated Italian strings
|
2016-02-18 15:01:53 +01:00 |
|
Mario Vavti
|
ddbe3c7426
|
make always preload images before rendering the page a display setting
|
2016-02-17 12:32:12 +01:00 |
|
Mario Vavti
|
b8c7b2f81d
|
more refinement on collapsing
|
2016-02-17 11:07:47 +01:00 |
|
jeroenpraat
|
f738902107
|
@hubdomain also for auto-create-channel + adding css wrapper (ongoing work)
|
2016-02-16 21:46:24 +01:00 |
|
Mario Vavti
|
364972a292
|
Thats probably better but there are still edge cases...
|
2016-02-16 21:29:09 +01:00 |
|
Mario Vavti
|
0eb0256502
|
typo
|
2016-02-16 21:02:28 +01:00 |
|
Mario Vavti
|
679fb7d0d2
|
content -> viewport
|
2016-02-16 20:58:10 +01:00 |
|
Mario Vavti
|
45247d1595
|
only prefetch images on update_mode update
|
2016-02-16 20:53:38 +01:00 |
|
Mario Vavti
|
3be6ef6bfc
|
since we preload images now we also can collapse and calculate posts above the viewport
|
2016-02-16 14:42:13 +01:00 |
|
redmatrix
|
c5827c8b4f
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2016-02-15 20:33:10 -08:00 |
|
redmatrix
|
bb381daae3
|
update fr strings from transifex
|
2016-02-15 20:32:42 -08:00 |
|
Mario Vavti
|
afb86aa908
|
clean up some unused stuff and start loading content a bit earlier
|
2016-02-15 22:20:55 +01:00 |
|
redmatrix
|
d3c779f635
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2016-02-14 16:17:15 -08:00 |
|
redmatrix
|
4f285911f0
|
form cleanup (profile_photo and cover_photo), admin 'user_approve' not found, missing close div in mood_content.tpl
|
2016-02-14 16:15:55 -08:00 |
|
jeroenpraat
|
8ccddfefd9
|
Spanish and Dutch string update
|
2016-02-14 16:18:03 +01:00 |
|
Mario Vavti
|
0b487122f6
|
tryout: introduce loading of images before rendering content and provide some detailed logging in js-console
|
2016-02-12 11:00:50 +01:00 |
|
jeroenpraat
|
bcb94f8238
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2016-02-09 16:15:49 +01:00 |
|
jeroenpraat
|
1d2260b44e
|
Castellano and Nederlands string updates
|
2016-02-09 16:15:20 +01:00 |
|
phellmes
|
97be144913
|
[invite module] update UI template
|
2016-02-09 14:07:54 +01:00 |
|
redmatrix
|
f984502499
|
need to re-arrange a few things for a short vcard
|
2016-02-08 19:33:25 -08:00 |
|
redmatrix
|
315ce6d880
|
lots more zcard tweaks
|
2016-02-08 18:16:42 -08:00 |
|
redmatrix
|
3da8f9b13c
|
duplicated lines in en config file
|
2016-02-08 14:51:03 -08:00 |
|
redmatrix
|
a14b87baf2
|
make yet another recommended security header optional - this time because of piwik. Personally I think if you want to track people you really don't understand this project and its history, but whatever....
|
2016-02-08 14:48:11 -08:00 |
|
Mario Vavti
|
48963f62f9
|
avoid collapsing only above the viewport
|
2016-02-08 22:19:38 +01:00 |
|
redmatrix
|
00ae6bdac6
|
a few tweaks to uno settings page to allow a default ACL to be created
|
2016-02-07 21:06:17 -08:00 |
|
redmatrix
|
ec950de205
|
block public was still referenced in admin/site template
|
2016-02-07 15:44:42 -08:00 |
|
redmatrix
|
62e7fa6a23
|
update UI template for 'mood' module
|
2016-02-07 15:38:54 -08:00 |
|
redmatrix
|
a5c111ef4f
|
uno stuff
|
2016-02-05 23:13:33 -08:00 |
|
redmatrix
|
9cf105f8ea
|
initial uno config
|
2016-02-04 23:58:31 -08:00 |
|
redmatrix
|
bfeb89075f
|
comment buttons hook
|
2016-02-04 19:06:11 -08:00 |
|
redmatrix
|
d586f64e40
|
update the poke page layout and UI
|
2016-02-04 18:35:40 -08:00 |
|
redmatrix
|
c75f76f740
|
heavy lifting on admin security page
|
2016-02-03 20:24:46 -08:00 |
|
redmatrix
|
28386d7471
|
admin security page for configuring white and black lists and other security options.
|
2016-02-03 15:23:24 -08:00 |
|
redmatrix
|
06dcaaa821
|
some zcard cleanup - still eneds a lot more work
|
2016-02-02 17:14:07 -08:00 |
|
Wave
|
88669fa033
|
Merge pull request #271 from wave72/master
Updated Italian strings
|
2016-02-02 16:59:03 +01:00 |
|
Paolo Tacconi
|
225aa28a1b
|
Updated Italian strings
|
2016-02-02 16:52:25 +01:00 |
|
Mario Vavti
|
f1245206ce
|
change aside width to reflect recent widget style changes
|
2016-02-02 12:40:40 +01:00 |
|
redmatrix
|
7f453949a1
|
minor tweaks
|
2016-02-01 23:09:45 -08:00 |
|
redmatrix
|
5f5342c0d3
|
adjust for folks that still have 175px profile photos
|
2016-02-01 21:21:22 -08:00 |
|
redmatrix
|
15e003f030
|
missing template
|
2016-02-01 21:14:36 -08:00 |
|
redmatrix
|
723a49ccee
|
add photos to the profile "likes this" dropdowns
|
2016-02-01 17:42:53 -08:00 |
|
jeroenpraat
|
1f87fef968
|
es-es+nl strings and fixing css maintained schemas
|
2016-01-30 23:44:45 +01:00 |
|
Mario Vavti
|
c8d0a2b4bb
|
one more css fix
|
2016-01-30 14:40:45 +01:00 |
|
Mario Vavti
|
385709853b
|
css fixes
|
2016-01-30 14:26:38 +01:00 |
|
Mario Vavti
|
0405a49df1
|
fix a slight regression
|
2016-01-30 13:47:58 +01:00 |
|
Mario Vavti
|
b6543beca2
|
do not make a difference if there are images or not for now
|
2016-01-30 01:34:27 +01:00 |
|
Mario Vavti
|
da198fdda5
|
more on collapsing
|
2016-01-30 01:28:01 +01:00 |
|
Mario Vavti
|
d7abacb7b2
|
it is not perfect but it still may ease the collapsing of items above the viewport a little...
|
2016-01-30 00:30:49 +01:00 |
|
Jeroen van Riet Paap
|
9a4cbc05a6
|
no trailing slash
|
2016-01-27 23:48:14 +01:00 |
|
Mario Vavti
|
722d7ff38d
|
lower caution level from danger to warning for ignore button
|
2016-01-27 09:46:18 +01:00 |
|
redmatrix
|
5d6657f77a
|
provide an icon to make 'add privacy group' stand out from the list of groups. Please revert if you think it's too messy.
|
2016-01-27 00:11:15 -08:00 |
|
redmatrix
|
9b08051703
|
bring back the ability to ignore a pending connection request without deleting it and without always having it in your face and without jumping through hoops.
|
2016-01-26 16:57:36 -08:00 |
|
jeroenpraat
|
68030d12cf
|
Linking new connection notification to pending connections (see Channel 1) and improved email notifications about new connections. Could not find a way to do this also for the generic notifications. Added hub domain of channel address on the new channel page. A few people on my hub didn't understood. This example will make it more clear. Some minor bits.
|
2016-01-27 00:24:05 +01:00 |
|
redmatrix
|
9081ddb455
|
don't provide notification icons on manage page for delegated channels
|
2016-01-24 18:36:38 -08:00 |
|
jeroenpraat
|
845945e70a
|
es-es+nl string update
|
2016-01-24 15:31:08 +01:00 |
|
redmatrix
|
2be515e7bb
|
set the actual value of the password input field to a single space on remove channel and remove account because firefox does not honour 'autocomplete="off"' and insists on filling in the password, which completely defeats the purpose of password protecting this function. We want to ensure it can only be executed by somebody who knows the password and not somebody who happens upon an unattended browser session. This space is annoying and must be removed to enter the password correctly but this appears to be the only way to provide the necessary safety for that page. Setting autocomplete to a random string as suggested by the firefox doco doesn't appear to do anything useful, as autocomplete is still performed.
|
2016-01-21 14:32:41 -08:00 |
|
jeroenpraat
|
55e9bd3660
|
A few minor tweaks in schemas + link to login form in lostpass
|
2016-01-21 22:02:31 +01:00 |
|
Mario Vavti
|
b711c050db
|
make contact block look widget alike
|
2016-01-21 11:48:10 +01:00 |
|
Mario Vavti
|
928f1bfa7b
|
css cleanup
|
2016-01-21 10:58:38 +01:00 |
|
Mario Vavti
|
97ebf9021c
|
bootstrapify rating and connect buttons. position the connect button more prominent right under the profile image
|
2016-01-21 10:42:20 +01:00 |
|
redmatrix
|
b380b618bc
|
db_type not present in international config file templates issue #259
|
2016-01-18 14:42:03 -08:00 |
|
redmatrix
|
3b18c82c88
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2016-01-17 16:51:06 -08:00 |
|
redmatrix
|
be83855acf
|
generalise the site icon
|
2016-01-17 16:50:37 -08:00 |
|
jeroenpraat
|
819a331c4a
|
update es-es and nl strings. adjusted a few matrix to grid strings
|
2016-01-17 20:03:26 +01:00 |
|
Mario Vavti
|
0d5daea93d
|
move dir total ratings button to the left to prevent the connect button beeing shifted on channels with ratings
|
2016-01-16 21:30:57 +01:00 |
|
Mario Vavti
|
2498df68c7
|
change button order for consistency
|
2016-01-15 13:20:45 +01:00 |
|
Mario Vavti
|
d36aa4fc89
|
provide a recent activity link in /connections
|
2016-01-15 12:08:04 +01:00 |
|
Mario Vavti
|
f4e1b2123a
|
add an approve button to /connections and get rid of the modal popup in /connedit. for quick approval (default collection and perms etc.) we now can use the approve button in /connections else click the edit button and make changes and approval from /connedit. hope thats any better...
|
2016-01-15 11:28:05 +01:00 |
|
Mario Vavti
|
63ee0daac5
|
provide more contact infos and update some protocol type definitions
|
2016-01-15 10:42:44 +01:00 |
|
Mario Vavti
|
614dcb8bce
|
since the perms will be reset on approval better do not provide the perms tool before we approved a connection
|
2016-01-14 23:38:00 +01:00 |
|
Mario Vavti
|
588d022fbb
|
provide some info about our contacts - status (archived, hidden, etc.), public forum (like in directory) and show since when we are connected
|
2016-01-14 23:23:12 +01:00 |
|
Mario Vavti
|
9f9fdc1434
|
bring back opacity for archived contacts
|
2016-01-14 14:00:02 +01:00 |
|
Mario Vavti
|
e2b79c34bc
|
some work on connections
|
2016-01-14 13:50:47 +01:00 |
|
Mario Vavti
|
69573c6afe
|
some template work on follow widget
|
2016-01-14 10:36:45 +01:00 |
|
redmatrix
|
e500a08f15
|
more progress on cover photo cropping and storage
|
2016-01-13 20:26:27 -08:00 |
|
redmatrix
|
9584ca080c
|
some initial work on uploading and cropping cover photos
|
2016-01-13 17:32:09 -08:00 |
|
Einer von Vielen
|
f510cd3111
|
.
|
2016-01-13 23:46:31 +01:00 |
|
redmatrix
|
86b550e43e
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2016-01-13 01:36:08 -08:00 |
|
redmatrix
|
3bf9dc9f18
|
more work on auto channel creation during register
|
2016-01-13 01:17:02 -08:00 |
|
Mario Vavti
|
0ca7aa8c09
|
20em is to big for mobile use
|
2016-01-13 09:39:46 +01:00 |
|
redmatrix
|
bff33a98ce
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2016-01-11 16:37:29 -08:00 |
|
redmatrix
|
66c8658898
|
plugin version compatibility checking. To use, set MinVersion, MaxVersion or MinPHPversion in the plugin header block. Case is not important. We check the project versions against STD_VERSION, which should be rolled to a new y of x.x.y if the plugin interface or project code changes in an incompatible way.
|
2016-01-11 16:34:12 -08:00 |
|
Wave
|
42b35c5ac9
|
Merge pull request #253 from wave72/master
Italian strings updated
|
2016-01-11 11:02:09 +01:00 |
|
Paolo Tacconi
|
04180985cb
|
Italian strings updated
|
2016-01-11 10:55:51 +01:00 |
|
redmatrix
|
f4d47f825d
|
revert lost link
|
2016-01-10 20:38:47 -08:00 |
|
redmatrix
|
44137be88d
|
Merge pull request #252 from einervonvielen/homeinstall
installation script for debian next to a router at home
|
2016-01-11 15:38:07 +11:00 |
|
jeroenpraat
|
e51035ba9a
|
String update es-es and nl. Plus some extra bits, incl .gitignore update with pageheader.html
|
2016-01-10 20:45:39 +01:00 |
|
Einer von Vielen
|
51f34b6b07
|
indexed
|
2016-01-10 18:24:15 +01:00 |
|
redmatrix
|
93565ea768
|
features management page for hubmins
|
2016-01-06 13:01:28 -08:00 |
|
Wave
|
c3e2505b66
|
Merge pull request #248 from wave72/master
Updated Italian strings
|
2016-01-04 14:26:09 +01:00 |
|
Paolo Tacconi
|
c7cc595906
|
Updated Italian strings
|
2016-01-04 14:18:52 +01:00 |
|
jeroenpraat
|
9e6f43e3ff
|
added some real examples for the default-permission-role in de docu. also updated comanche template redable and another css class to tpl file
|
2016-01-03 21:56:39 +01:00 |
|
redmatrix
|
5b0a17359d
|
Provide the ability for a hub admin to specify a default permissions role for the first channel created by a new account. This simplifies channel creation by restricting the available options at registration time. The restriction is not applied to any additional channels created under the same account; and in any event can be changed immediately after channel creation, if desired.
|
2016-01-02 23:39:57 -08:00 |
|
jeroenpraat
|
1ad90b8662
|
Update es+nl strings and added title on hover for items (needed to view titles that are cut-off)
|
2016-01-02 15:14:30 +01:00 |
|
redmatrix
|
c38edfcb32
|
issue #241 (redmatrix issue 405)
|
2016-01-01 16:12:43 -08:00 |
|
jeroenpraat
|
405725875d
|
nl+es-es string update
|
2015-12-29 22:09:47 +01:00 |
|
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 |
|
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 |
|
redmatrix
|
68da4d90dc
|
fix admin plugin hooks
|
2015-11-17 20:44:57 -08: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 |
|
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 |
|
jeroenpraat
|
def5edf93c
|
nl+es and some other bits
|
2015-11-14 20:43:34 +01:00 |
|
redmatrix
|
93e5449c08
|
really basic photo album widget for content regions
|
2015-11-12 20:22:36 -08:00 |
|
jeroenpraat
|
5afe8e5aa1
|
Small update to Bluegrid and generic-content-wrapper-styled to dreport
|
2015-11-12 22:10:20 +01:00 |
|
redmatrix
|
fba2603304
|
add avatars to likes/dislikes/etc.
|
2015-11-09 15:58:19 -08:00 |
|
redmatrix
|
7d5acef20a
|
remove list bullets from extended like list
|
2015-11-09 15:18:26 -08:00 |
|
jeroenpraat
|
b99b6b5ae9
|
This is better
|
2015-11-09 16:37:22 +01:00 |
|
jeroenpraat
|
cda81e35db
|
Using bootstrap classes, so other themes/schemas also work. Plus margin when collapsed.
|
2015-11-09 15:08:50 +01:00 |
|
Wave
|
115a53225e
|
Merge pull request #137 from wave72/master
Updated Italian strings
|
2015-11-09 08:58:58 +01:00 |
|
Paolo Tacconi
|
36c196e18c
|
Updated Italian strings
|
2015-11-09 08:54:18 +01:00 |
|
redmatrix
|
5e1b61eb02
|
some more db doco
|
2015-11-08 20:02:35 -08:00 |
|
redmatrix
|
4e1c308162
|
make jotnets modal
|
2015-11-08 17:48:43 -08:00 |
|
Tobias Luther
|
8639eda70f
|
Quick fix: Moved Twitter select box to the top of ACL selector
|
2015-11-08 12:20:58 +01:00 |
|
jeroenpraat
|
2b0b03eebc
|
Fix ffsapi for non-English languages (or better when 's was used in the strings) - Update nl+es
|
2015-11-08 00:04:02 +01:00 |
|
jeroenpraat
|
0db5a8673d
|
Firefox share (that seems now the official name) button added to misc. settings.
|
2015-11-05 16:20:56 +01:00 |
|
jeroenpraat
|
1c0fe89368
|
Chat page improved (I think). Works now better with diff. resolutions, font sizes and languages. Fixed follow field on conn. page. Small schemas updates.
|
2015-11-04 22:52:40 +01:00 |
|
Wave
|
9398e49eb7
|
Merge pull request #125 from wave72/master
Updated Italian strings
|
2015-11-04 15:04:20 +01:00 |
|
Paolo Tacconi
|
50cf095c00
|
Updated Italian strings
|
2015-11-04 14:58:52 +01:00 |
|
redmatrix
|
c57926d799
|
Merge pull request #119 from sasiflo/master
Some small rebranding for Hubzilla transition from Red Matrix
|
2015-11-04 16:00:32 +11:00 |
|
redmatrix
|
77a03e376c
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/photo/photo_driver.php
include/text.php
mod/post.php
|
2015-11-03 20:46:47 -08:00 |
|
redmatrix
|
e09b49288f
|
provide admin setting to change directory server
|
2015-11-03 18:34:16 -08:00 |
|
redmatrix
|
c1cfcc78fe
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-11-03 14:59:43 -08:00 |
|
redmatrix
|
2c299a9f37
|
implement unfollow thread
|
2015-11-03 14:59:14 -08:00 |
|
jeroenpraat
|
d1aa672388
|
small update Ducth strings + fix dark schema
|
2015-11-03 21:19:23 +01:00 |
|
sasiflo
|
b21f6fd619
|
Merge branch 'rebranding'
|
2015-11-03 11:35:44 +01:00 |
|
sasiflo
|
39245238fd
|
Some small rebranding for Hubzilla transition from Red Matrix
|
2015-11-03 11:31:19 +01:00 |
|
Mario Vavti
|
43d8090182
|
timeago() works best with iso format. fix #118
|
2015-11-03 11:19:22 +01:00 |
|
redmatrix
|
d3183467e0
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-11-01 15:52:35 -08:00 |
|
redmatrix
|
b62614bbd4
|
improve /locs page with some field notes and the ability to do a forced sync
|
2015-11-01 15:51:45 -08:00 |
|
jeroenpraat
|
618155e6ab
|
More Bluegrid fine tuning and generic-content-wrapper-styled added to some tpl-files and 2 php files, cause they dont have a tpl file.
|
2015-11-01 22:59:32 +01:00 |
|
Mario Vavti
|
0353b0e04f
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2015-11-01 11:17:04 +01:00 |
|
jeroenpraat
|
3262d819de
|
update srings nl+es, wrapper-styled 1 tpl-file, more finetuning bluegrid schema.
|
2015-10-31 22:34:59 +01:00 |
|
jeroenpraat
|
52120b367a
|
Update nl+es
|
2015-10-31 21:07:57 +01:00 |
|
Mario Vavti
|
5920a96da7
|
make attachments appear in a dropdown in wall-item-tools-left
|
2015-10-31 00:38:01 +01:00 |
|
Mario Vavti
|
f8b767ed32
|
fix photo item for search_item.tpl and a minor css fix
|
2015-10-30 18:46:16 +01:00 |
|
redmatrix
|
96402a2354
|
This may take a few iterations to discover the best way to present the information, but we need a way for members to know what alternate locations are available for a channel during times of server issues - and as recently discovered if there aren't any hublocs at all; without digging around the database and probing channels and other messy stuff.
|
2015-10-29 01:23:56 -07:00 |
|
jeroenpraat
|
605381f83d
|
More fine tuning bluegrid schema. Extra generic-wrapper-styled.
|
2015-10-27 22:52:54 +01:00 |
|
Mario Vavti
|
71f70b4377
|
css fixes
|
2015-10-27 12:52:21 +01:00 |
|
jeroenpraat
|
02527552fd
|
Better -styled.
|
2015-10-27 01:23:30 +01:00 |
|
jeroenpraat
|
ac5b9f2382
|
Another .generic-content-wrapper
|
2015-10-27 01:20:48 +01:00 |
|
jeroenpraat
|
fc65496d1d
|
NEW: Redbasic schema, based on the Hubzilla project page layout.
|
2015-10-27 01:11:50 +01:00 |
|
jeroenpraat
|
35857931ef
|
2 more tpl files with generic-content-wrapper-styled
|
2015-10-26 22:47:47 +01:00 |
|
jeroenpraat
|
6cb7afcbc0
|
es+nl strings
|
2015-10-26 16:35:44 +01:00 |
|
jeroenpraat
|
32a0f5b04a
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2015-10-26 15:28:11 +01:00 |
|
jeroenpraat
|
3bc6190bdd
|
Update Dark schema
|
2015-10-26 15:27:47 +01:00 |
|
Mario Vavti
|
4fb9571136
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2015-10-26 14:20:06 +01:00 |
|
Mario Vavti
|
e70bb371d9
|
bring back item transparency
|
2015-10-26 14:19:46 +01:00 |
|
jeroenpraat
|
2099ac0615
|
Revert this one. This was hub specific.
|
2015-10-26 14:16:05 +01:00 |
|
jeroenpraat
|
5e28b1216e
|
Added a few generic-content-wrapper-styled classes and a button position fixed for lostpass. mod/search probably needs a .tpl in the future, but I don't know how to that.
|
2015-10-26 14:05:45 +01:00 |
|
jeroenpraat
|
e858ee811b
|
Fixed connection page. Page was overcrowded on systems with larger fonts.
|
2015-10-26 13:57:12 +01:00 |
|
redmatrix
|
a498fc8e72
|
looks like there may be issues with the datetime picker if the local timezone isn't the same as your settings.
|
2015-10-25 21:17:02 -07:00 |
|
redmatrix
|
917d0ced4a
|
new feature: delayed posting
|
2015-10-25 16:54:18 -07:00 |
|
Mario Vavti
|
fd1e163bf4
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2015-10-24 21:44:45 +02:00 |
|
Mario Vavti
|
ab8b4d5c36
|
another try to avoid dubble photo deletion. allow to set a photo caption and simple status body (if create status post is enabled) on upload
|
2015-10-24 21:44:25 +02:00 |
|
Wave
|
4a044351a9
|
Merge pull request #97 from wave72/master
Italian strings updated
|
2015-10-24 12:15:15 +02:00 |
|
wave72
|
e0a2268b0e
|
Italian strings updated
|
2015-10-24 12:13:17 +02:00 |
|
Mario Vavti
|
9ae215291f
|
fix app.tpl missing </div> tag if not authenticated
|
2015-10-23 10:20:01 +02:00 |
|
mcnesium
|
379fd33484
|
fix placeholder font-family
[Imgur](http://i.imgur.com/Cegabd5.png)
|
2015-10-22 13:44:33 +02:00 |
|
Mario Vavti
|
ed6629002f
|
photo object fixes
|
2015-10-22 13:01:33 +02:00 |
|
Mario Vavti
|
bcb4ac7aae
|
experiment: put the photo-item photo on top of the post
|
2015-10-22 12:58:11 +02:00 |
|
Mario Vavti
|
6f8d29ad80
|
move photo object stuff from itemObject to prepare_body() so we can do more stuff with it
|
2015-10-22 10:52:10 +02:00 |
|
Mario Vavti
|
232742a5e6
|
warn if quota exceeds 90% of storage limit
|
2015-10-21 12:52:03 +02:00 |
|
Mario Vavti
|
a33ddf373b
|
move file storage quota display to upload section. add a warning if remaining space is less than 100MB and fix % calculation
|
2015-10-21 12:40:09 +02:00 |
|
redmatrix
|
38816d7e41
|
move quota display to where it's visible on a tablet
|
2015-10-20 18:48:14 -07:00 |
|
Mario Vavti
|
13d0db5f9a
|
css cleanup
|
2015-10-20 09:47:30 +02:00 |
|
Mario Vavti
|
f7601756e9
|
create photo object if feature large photos is enabled and display those slightly different
|
2015-10-20 09:36:15 +02:00 |
|
redmatrix
|
ea37882b95
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/zot.php
install/schema_mysql.sql
install/schema_postgres.sql
install/update.php
mod/zfinger.php
|
2015-10-19 16:18:04 -07:00 |
|
Paolo Tacconi
|
8da8e02dc8
|
Replaced some old redmatrix branding
|
2015-10-19 10:51:33 +02:00 |
|
jeroenpraat
|
6eaf35a142
|
Update es+nl
|
2015-10-18 19:09:38 +02:00 |
|
jeroenpraat
|
52f3d6722d
|
Update nl+es
|
2015-10-18 16:45:11 +02:00 |
|
Mario Vavti
|
126628546b
|
tweak justify gallery options to not load to large previews
|
2015-10-18 14:21:42 +02:00 |
|
redmatrix
|
be701677d6
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
view/nl/messages.po
view/nl/strings.php
|
2015-10-17 16:38:57 -07:00 |
|
redmatrix
|
1d2797dc1f
|
bring back chat expiration setting and adjust chat size for our now smaller content region
|
2015-10-17 14:54:27 -07:00 |
|
Mario Vavti
|
b7408fa39e
|
we now provide images for all suffixes (0-3) -> simplify photo item body creation and provide width x height for any size
|
2015-10-16 16:27:51 +02:00 |
|
jeroenpraat
|
7ca5b5c928
|
Update Dutch strings
|
2015-10-16 15:31:11 +02:00 |
|
Mario Vavti
|
73082a338b
|
(re)add default image-size 320px - it is good for gallery preview. this size has the suffix -3 now
|
2015-10-15 12:56:22 +02:00 |
|
Mario Vavti
|
1593ebec1f
|
update conv_list.tpl
|
2015-10-15 11:49:33 +02:00 |
|
Mario Vavti
|
2413968021
|
double up default photo sizes - even the mos simple camera can now do images > 1024px
|
2015-10-15 11:20:56 +02:00 |
|
Mario Vavti
|
2848f5dab4
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2015-10-15 09:36:51 +02:00 |
|
redmatrix
|
de697a4267
|
issue #86 - like/dislike in photos not working
|
2015-10-14 14:16:16 -07:00 |
|
Mario Vavti
|
b4e83b6537
|
allow photo-items to appear full width if large photos feature is enabled. in prepare_body() split off mentions, tags, categories folders and attachments from body for easier theming. some other little fixes.
|
2015-10-14 22:14:19 +02:00 |
|
Wave
|
e3070eb170
|
Merge pull request #81 from tuscanhobbit/master
Italian strings updated
|
2015-10-14 09:12:58 +02:00 |
|
Paolo Tacconi
|
319b02a757
|
Italian strings updated
|
2015-10-14 09:11:05 +02:00 |
|
Mario Vavti
|
61e3ef2552
|
do not collapse content which is just slightly higher than we allow
|
2015-10-13 10:45:22 +02:00 |
|
jeroenpraat
|
43eefb5929
|
update es + nl strings
|
2015-10-13 00:43:23 +02: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
|
c963aa98e8
|
some conv-item restructuring to allow full width elements
|
2015-10-11 22:32:06 +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 |
|
Andrew Manning
|
9034765790
|
There is no mod/import_items tool in RedMatrix
|
2015-10-07 20:37:00 -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
|
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 |
|
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 |
|
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
|
5ba39fef9a
|
private mail compositor changes
|
2015-10-02 17:51:37 +02: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 |
|
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 |
|
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
|
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 |
|
zottel
|
b5f382f0ea
|
update German strings
|
2015-09-30 14:05:10 +02:00 |
|
zottel
|
d66715648a
|
update German strings
|
2015-09-30 14:01:21 +02:00 |
|
jeroenpraat
|
34f52e47eb
|
Hooray! Dutch language complete again.
|
2015-09-29 22:22:02 +02: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 |
|
redmatrix
|
55b530f0fd
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/zot.php
util/messages.po
|
2015-09-27 17:00:41 -07:00 |
|
redmatrix
|
cd2b811555
|
move string files to hmessages.po and hstrings.php for hubzilla to avoid endless merge conflicts.
|
2015-09-26 23:44:30 -07:00 |
|
Mario Vavti
|
d6293730fc
|
private mail: some work on conversations view
|
2015-09-25 23:26:28 +02:00 |
|
jeroenpraat
|
49000dadda
|
Another Spanish update
|
2015-09-25 21:25:42 +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 |
|
Mario Vavti
|
c38687725d
|
kick right aside out a little earlier
|
2015-09-20 22:12:00 +02:00 |
|
redmatrix
|
74827133b2
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
util/messages.po
|
2015-09-18 22:46:21 -07:00 |
|
Mario Vavti
|
87c8cf4892
|
css fixes
|
2015-09-18 13:07:04 +02: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 |
|
jeroenpraat
|
4090843fef
|
Converse width for a few related (old) schemas back to 1024px / Name default theme to Focus / Non expert custom display settings above expert display settings, so people can better find them.
|
2015-09-17 22:39:48 +02: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 |
|
jeroenpraat
|
582607c0f0
|
Another (hopefully final) Spanish update
|
2015-09-17 16:28:31 +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 |
|
Mario Vavti
|
b7e953f50e
|
fix calculation of content height with margins
|
2015-09-17 14:14:01 +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
|
d0a3cfe765
|
italian string correction
|
2015-09-15 19:59:06 -07:00 |
|
redmatrix
|
63a1d8d0db
|
make sure we've got a doc type
|
2015-09-15 01:39:38 -07:00 |
|
redmatrix
|
30351f5ade
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-09-14 21:35:30 -07:00 |
|
jeroenpraat
|
dfd4115f7a
|
Update siteinfo.tpl
|
2015-09-14 16:45:15 +02:00 |
|
jeroenpraat
|
31db5078c1
|
Small update Spanish strings
|
2015-09-14 16:36:06 +02:00 |
|
Mario Vavti
|
40c78d23e6
|
quick fix for choklet bannertwo
|
2015-09-14 09:27:15 +02:00 |
|
Mario Vavti
|
ec1d6d537e
|
quick fix for choklet bannertwo
|
2015-09-14 09:20:08 +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 |
|
Mario Vavti
|
3425267368
|
fix banner for full flavour
|
2015-09-13 16:16:03 +02:00 |
|
Mario Vavti
|
0c3d9af333
|
hopefully fix banner for choklet flavour
|
2015-09-13 14:56:44 +02:00 |
|
Mario Vavti
|
9821a39549
|
an attempt to fix the banner mess
|
2015-09-12 11:36:19 +02:00 |
|
Mario Vavti
|
f51124397f
|
center page content by default - css file
|
2015-09-11 11:56:56 +02:00 |
|
Mario Vavti
|
e42111545b
|
center page content by default
|
2015-09-11 11:54:35 +02:00 |
|
Mario Vavti
|
5112b4b963
|
css fix
|
2015-09-11 09:26:24 +02:00 |
|
redmatrix
|
e4231efd20
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-09-10 16:51:53 -07:00 |
|
redmatrix
|
922d2165b3
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/zot.php
|
2015-09-10 16:51:22 -07:00 |
|
Mario Vavti
|
5e576bff63
|
fix radius setting
|
2015-09-10 22:22:51 +02:00 |
|
Mario Vavti
|
e1338f5a7f
|
make redmatrix focus scheme default for hubzilla
|
2015-09-10 22:19:51 +02:00 |
|
jeroenpraat
|
672143d3a2
|
update Spanish strings
|
2015-09-10 13:18:24 +02: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
|
d702133ded
|
move mod_admin to Comanche finally
|
2015-09-08 20:48:35 -07:00 |
|
Wave
|
dc7677f5fa
|
Merge pull request #391 from tuscanhobbit/master
Updated Italian strings
|
2015-09-07 17:29:13 +02:00 |
|
Paolo Tacconi
|
78fb6f55ed
|
Updated Italian strings
|
2015-09-07 17:24:43 +02:00 |
|
redmatrix
|
2f52b6c164
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
util/messages.po
|
2015-09-07 04:06:27 -07:00 |
|
redmatrix
|
2312f03eac
|
Always open rpost editor on document ready
|
2015-09-06 20:50:31 -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
|
945ba5d788
|
more adjustment to apps containers
|
2015-09-02 21:46:19 -07:00 |
|
redmatrix
|
3e7edf504d
|
sort out some app display weirdness
|
2015-09-02 21:35:49 -07:00 |
|
redmatrix
|
3285c71995
|
increase height of app-container so edit controls aren't shadowed
|
2015-09-02 21:17:23 -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
|
d7089ab471
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/identity.php
install/update.php
util/messages.po
view/nl/messages.po
|
2015-08-31 21:00:28 -07:00 |
|
redmatrix
|
e23f86faa9
|
more work on doco search
|
2015-08-30 22:39:33 -07:00 |
|
jeroenpraat
|
60ac0cef5c
|
Removed redmatrix.nl as a fallback server (directory mode to normal) + update strings ES
|
2015-08-29 17:21:20 +02:00 |
|
jeroenpraat
|
8db5d3ba5c
|
Update es and nl strings
|
2015-08-28 14:13:13 +02:00 |
|
redmatrix
|
2d471e39dc
|
this is weird
|
2015-08-25 19:23:21 -07:00 |
|
redmatrix
|
eac9c8a7e6
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/zot.php
install/update.php
util/messages.po
|
2015-08-23 20:23:55 -07:00 |
|
redmatrix
|
2a59392ba8
|
change name of module
|
2015-08-22 19:31:39 -07:00 |
|
redmatrix
|
feabaedd83
|
increase width of tasklist input element
|
2015-08-22 15:46:40 -07:00 |
|
jeroenpraat
|
957abf1c1b
|
Final (temporary I suppose) Spanish string update
|
2015-08-22 16:29:34 +02:00 |
|
redmatrix
|
242cb047d4
|
limit the height of tasklist
|
2015-08-20 22:15:09 -07:00 |
|
redmatrix
|
3e7a76cc64
|
put tasklist into events page comanche layout
|
2015-08-20 21:02:42 -07:00 |
|
redmatrix
|
8fc321ca62
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-08-20 16:52:56 -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 |
|
jeroenpraat
|
20fc4ee021
|
Another Spanish strings update
|
2015-08-20 20:57:08 +02: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
|
4ebee195cc
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-08-17 16:12:35 -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 |
|
jeroenpraat
|
f2fdc91ad5
|
Replaced Dutch po file by Spanish po file by accident. Had no visible impact.
|
2015-08-17 22:27:33 +02:00 |
|
jeroenpraat
|
d88c25c982
|
Final Spanish strings for now
|
2015-08-17 22:21:55 +02:00 |
|
jeroenpraat
|
f70fd95361
|
Fixed Spanish strings
|
2015-08-17 13:38:43 +02:00 |
|
redmatrix
|
be3a272a80
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-08-16 19:54:38 -07:00 |
|
redmatrix
|
631eb4b2c2
|
issue #386 - account and channel bulk edit checkboxes not visible and therefore not useable. Also change wording to remove the offensive 'user' designation.
|
2015-08-16 19:52:25 -07:00 |
|
redmatrix
|
18bc12c21c
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/zot.php
util/messages.po
|
2015-08-14 22:24:15 -07:00 |
|
jeroenpraat
|
7a8d0a03f6
|
update spanish
|
2015-08-14 15:57:05 +02:00 |
|
redmatrix
|
f88dc84091
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
view/es/htconfig.tpl
view/es/update_fail_eml.tpl
|
2015-08-12 20:36:32 -07:00 |
|
jeroenpraat
|
3099562a21
|
Some corrections of Spanish strings.
|
2015-08-12 20:52:46 +02:00 |
|
jeroenpraat
|
588d22974c
|
And Catalan!
|
2015-08-12 15:16:56 +02:00 |
|
jeroenpraat
|
4c2bbe3c41
|
Thanks to Manuel. Updated Spanish to 100 procent.
|
2015-08-12 15:11:04 +02:00 |
|
redmatrix
|
44dcbeaaa4
|
forum widget
|
2015-08-11 19:22:14 -07:00 |
|
jeroenpraat
|
eae88b0815
|
Update Dutch strings
|
2015-08-09 15:56:02 +02:00 |
|
jeroenpraat
|
510cb5df86
|
Update Dutch strings
|
2015-08-05 22:31:40 +02:00 |
|
redmatrix
|
b737e224b1
|
more work separating Diaspora from core
|
2015-08-03 16:52:51 -07:00 |
|
Paolo T
|
2f5a39bc2f
|
Merge pull request #382 from tuscanhobbit/master
Italian translation
|
2015-08-03 09:24:39 +02:00 |
|
Paolo Tacconi
|
5d2f35dc60
|
Italian translation
|
2015-08-03 09:21:01 +02: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 |
|
Alexandre Hannud Abdo
|
a3de9f9e41
|
update pt-br strings
|
2015-07-24 22:37:09 -03: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 |
|
redmatrix
|
ec00c5b18a
|
the view_photos and post_photos permissions are redundant and are now mapped to view_storage and write_storage
|
2015-07-19 17:53:52 -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 |
|
Paolo T
|
5506f178a5
|
Merge pull request #376 from tuscanhobbit/master
Updated Italian strings
|
2015-07-16 11:51:50 +02:00 |
|
Paolo Tacconi
|
c9b5046fc0
|
Updated Italian strings
|
2015-07-16 11:33:49 +02:00 |
|
redmatrix
|
6046fe9c9e
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-07-15 17:50:24 -07:00 |
|
Mario Vavti
|
0c77a127f2
|
show inherited state in Connection Default Permissions
|
2015-07-15 14:03:34 +02:00 |
|
redmatrix
|
e8f19c1e15
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
mod/connedit.php
|
2015-07-14 17:10:13 -07:00 |
|
Mario Vavti
|
104cbcab72
|
make strings translateable
|
2015-07-14 21:32:18 +02:00 |
|
Mario Vavti
|
4fe64179c8
|
disable the inherited checkboxes for notself
|
2015-07-14 19:29:49 +02:00 |
|
Mario Vavti
|
cc1764989f
|
fix mod_connedit.js after cleanup
|
2015-07-14 17:37:33 +02:00 |
|
Mario Vavti
|
f267bd55d6
|
revert this until further investigation
|
2015-07-14 14:20:23 +02:00 |
|
Mario Vavti
|
a28da40fa8
|
css fixes
|
2015-07-14 12:52:50 +02:00 |
|
Mario Vavti
|
7f71297383
|
cleanup connedit
|
2015-07-14 12:46:40 +02:00 |
|
redmatrix
|
6916c1076c
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-07-13 17:43:10 -07:00 |
|
Mario Vavti
|
f81874ca49
|
fix sys channel menu in a morre standard way
|
2015-07-12 01:04:57 +02:00 |
|
Mario Vavti
|
d8f03450e7
|
make menu creation for sys channel work
|
2015-07-12 00:40:12 +02:00 |
|
redmatrix
|
69a4cf73a3
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-07-11 15:03:23 -07:00 |
|
Mario Vavti
|
138e0fe445
|
fix issue with profile photo
|
2015-07-11 13:25:06 +02:00 |
|
Mario Vavti
|
d3581d8562
|
more revert
|
2015-07-11 12:52:06 +02:00 |
|
Mario Vavti
|
d8e7f36c74
|
revert moving section and aside padding to style.css - it brings trouble to other layouts
|
2015-07-11 12:42:11 +02:00 |
|
Mario Vavti
|
d592d911c5
|
add css file for mod display
|
2015-07-11 12:05:39 +02:00 |
|
redmatrix
|
a497d8ee66
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
mod/editpost.php
util/messages.po
view/nl/messages.po
view/nl/strings.php
|
2015-07-10 14:27:41 -07:00 |
|
jeroenpraat
|
115097f139
|
update Dutch strings
|
2015-07-10 21:46:19 +02:00 |
|
Mario Vavti
|
071a233fb8
|
css fixes
|
2015-07-10 13:44:23 +02:00 |
|
Mario Vavti
|
39d68bf7c7
|
do not change selected/active class color on hover
|
2015-07-10 13:34:36 +02:00 |
|
Mario Vavti
|
ebb07de788
|
re-enable selected/active class
|
2015-07-10 13:25:50 +02:00 |
|
Mario Vavti
|
fee607db56
|
more webpages - generic-content-wrapper fixes
|
2015-07-10 13:16:45 +02:00 |
|
Mario Vavti
|
1554b5a2ee
|
add generic content wrapper to post/webpage editor and make editpost render correctly
|
2015-07-10 12:46:20 +02:00 |
|
Mario Vavti
|
7eb614c8aa
|
schema focus: refine content width to be more in balance with the recent aside width
|
2015-07-10 11:15:05 +02:00 |
|
Mario Vavti
|
e1f64b6748
|
move section and aside padding from default.css to style.css
|
2015-07-10 10:09:54 +02:00 |
|
Mario Vavti
|
2b9a480c2f
|
fix vcard title spacing
|
2015-07-09 22:23:24 +02:00 |
|
Mario Vavti
|
08996e5b9b
|
fix aside width for collapsed state
|
2015-07-09 20:54:13 +02:00 |
|
Mario Vavti
|
115c18353e
|
move profile image up and refine the aside width
|
2015-07-09 14:44:24 +02:00 |
|
Mario Vavti
|
59cddef032
|
remove padding
|
2015-07-09 14:05:35 +02:00 |
|
Mario Vavti
|
efa55437d4
|
increase width of the aside area and make default profile image size 300x300
|
2015-07-09 13:59:16 +02:00 |
|
redmatrix
|
6b41074396
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-07-07 16:50:25 -07:00 |
|
Mario Vavti
|
f6cf992aee
|
fix sorting of channel suggestions
|
2015-07-07 22:48:01 +02:00 |
|
Mario Vavti
|
f67d9d59af
|
rename function get_directory_settings => get_directory_setting and move sort options to directory title bar
|
2015-07-07 22:29:27 +02:00 |
|
Mario Vavti
|
18798b1d12
|
schema focus: adjust width to match photo width in /photos
|
2015-07-07 12:23:19 +02:00 |
|
Mario Vavti
|
adfb4072e8
|
various css fixes
|
2015-07-07 12:13:15 +02:00 |
|
Mario Vavti
|
2d0d5876ba
|
more word wrap fixes
|
2015-07-07 10:23:39 +02:00 |
|
Mario Vavti
|
807471d2a5
|
move if clause outside of the div
|
2015-07-07 09:56:30 +02:00 |
|
Mario Vavti
|
ee01e67fa7
|
use default style for default webpage
|
2015-07-07 09:41:27 +02:00 |
|
redmatrix
|
1b3e046cd2
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-07-06 17:54:29 -07:00 |
|
Mario Vavti
|
05b231b087
|
fix word wrapping in tagblock and dirtagblock and possibly other places
|
2015-07-06 10:36:57 +02:00 |
|
redmatrix
|
8fad0187ec
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-07-05 21:38:21 -07:00 |
|
Mario Vavti
|
2011784faf
|
schema focus: adjust default width
|
2015-07-05 22:37:52 +02:00 |
|
Paolo Tacconi
|
7d4615e319
|
Updated Italian localization
|
2015-07-03 12:01:30 +02:00 |
|
redmatrix
|
1a5898bf80
|
sync abook entries from redmatrix
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
include/items.php
|
2015-07-02 21:58:28 -07:00 |
|
Mario Vavti
|
f54688a547
|
since we can now use plain upstream justifiedGallery library - switch to minified version
|
2015-07-01 11:42:17 +02:00 |
|
Mario Vavti
|
9c4e9f8759
|
update justifiedGallery to versio 3.6.0
|
2015-07-01 11:34:36 +02:00 |
|
redmatrix
|
97e8275dc2
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-06-29 22:19:44 -07:00 |
|
redmatrix
|
0b347ccc14
|
turn the connection filter into a feature.
|
2015-06-29 20:35:56 -07:00 |
|
redmatrix
|
6e8ad5089e
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
view/nl/messages.po
view/nl/strings.php
|
2015-06-29 18:01:51 -07:00 |
|
jeroenpraat
|
aad8fc1946
|
Update NL + 1 revert css, see comment here: 22b9e97ae2
|
2015-06-30 00:26:16 +02:00 |
|
jeroenpraat
|
abb153e711
|
Probably a ugly hack, but it's the only way I could found that cuts off very long channel names in the admin area. If there's a better alternative, be my guest.
|
2015-06-29 23:09:36 +02:00 |
|
Mario Vavti
|
7ef4397634
|
fix directory location
|
2015-06-29 14:25:04 +02:00 |
|
redmatrix
|
63f2e9b412
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
include/zot.php
mod/connedit.php
util/messages.po
|
2015-06-28 22:33:13 -07:00 |
|
redmatrix
|
090dae46e5
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-06-28 21:19:28 -07:00 |
|
redmatrix
|
de13497333
|
no this isn't it. well ok, it's part of it, but not the important part. it's still pretty cool.
|
2015-06-28 21:16:56 -07:00 |
|
Mario Vavti
|
22b9e97ae2
|
css fixes
|
2015-06-27 22:27:17 +02:00 |
|
redmatrix
|
b06b6f798f
|
localise event calendar
|
2015-06-25 18:23:48 -07:00 |
|
Mario Vavti
|
9406c5a55c
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-06-25 12:54:42 +02:00 |
|
redmatrix
|
5f3edabd45
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
doc/de/features.bb
view/de/messages.po
view/de/strings.php
|
2015-06-24 16:34:52 -07:00 |
|
Mario Vavti
|
e9cc06dc11
|
directory: only provide connect button if we are not already connected
|
2015-06-24 21:12:20 +02:00 |
|
zottel
|
50de9325b6
|
update to German strings
|
2015-06-24 16:53:46 +02:00 |
|
Mario Vavti
|
05c7022ff8
|
Add a new redbasic scheme called focus - It is supposed to focus on the main content by adding a slight shadow and centering the main content on the screen. Also the default width of the content is set to 640px.
|
2015-06-24 13:05:33 +02:00 |
|
redmatrix
|
833098e346
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
include/items.php
mod/item.php
|
2015-06-23 17:30:35 -07:00 |
|
Mario Vavti
|
b6c4601d8f
|
some work on directory
|
2015-06-23 13:06:22 +02:00 |
|
Mario Vavti
|
a4775aab9b
|
Bring /help in line with the rest of the app
|
2015-06-22 14:02:14 +02:00 |
|
redmatrix
|
ae6612025d
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
include/items.php
util/messages.po
|
2015-06-21 20:51:07 -07:00 |
|
redmatrix
|
f59edbb48f
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-06-21 17:31:09 -07:00 |
|
redmatrix
|
68534fd5dc
|
some diaspora import issues uncovered during dry-run tests
|
2015-06-21 17:30:23 -07:00 |
|
Klaus Weidenbach
|
c3fa0a3ca7
|
Compatible update for .htaccess.
This should hopefully work in Apache 2.2 and 2.4.
|
2015-06-22 00:45:29 +02:00 |
|
Klaus Weidenbach
|
5a96f3331a
|
Compatible update for .htaccess.
This should hopefully work in Apache 2.2 and 2.4.
|
2015-06-21 23:58:19 +02:00 |
|
Mario Vavti
|
c1e0987b88
|
do not show default in scheme selection dropdown. default.php and default.css should be symlinks. adjust doco accordingly.
|
2015-06-21 17:53:44 +02:00 |
|
Mario Vavti
|
8b563951ff
|
more generic-content-wrapper and some css fixes
|
2015-06-19 15:49:06 +02:00 |
|
Mario Vavti
|
1432b1e83f
|
cloud.tpl
|
2015-06-19 12:45:18 +02:00 |
|
Mario Vavti
|
de84f48e2f
|
bring some more generic-content-wrappers and fix some of them
|
2015-06-19 12:44:11 +02:00 |
|
redmatrix
|
2963be60e5
|
more photos work
|
2015-06-17 18:26:56 -07:00 |
|
redmatrix
|
6ab20eb1b5
|
lots of work on merging photo and file albums/folders
|
2015-06-17 17:44:31 -07:00 |
|
redmatrix
|
8c7472c6c3
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
view/nl/messages.po
view/nl/strings.php
|
2015-06-15 17:30:08 -07:00 |
|
Mario Vavti
|
e0779e32b4
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-06-15 21:48:07 +02:00 |
|
Mario Vavti
|
7e3aac6d18
|
update spin.js
|
2015-06-15 21:47:29 +02:00 |
|
jeroenpraat
|
caf0cd3dbb
|
Update Dutch language strings
|
2015-06-15 16:41:03 +02:00 |
|
Mario Vavti
|
905cd1da5b
|
do not allow/show acl button on photo edit if not owner
|
2015-06-15 13:04:16 +02:00 |
|
redmatrix
|
5733491ac8
|
more work on items
and
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
include/items.php
view/it/messages.po
view/it/strings.php
|
2015-06-11 17:56:56 -07:00 |
|
Paolo T
|
aac9d60f2d
|
Merge pull request #347 from tuscanhobbit/dev
updated italian strings
|
2015-06-11 15:54:35 +02:00 |
|
Paolo Tacconi
|
98b0cfb413
|
updated italian strings
|
2015-06-11 15:47:15 +02:00 |
|
Mario Vavti
|
8c4b337918
|
set width for region_3 only if center page content is set
|
2015-06-11 13:07:45 +02:00 |
|
Mario Vavti
|
c8fe408a62
|
fix rendering of affinity slider
|
2015-06-11 11:35:21 +02:00 |
|
redmatrix
|
2128d5a256
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-06-10 15:47:23 -07:00 |
|
Mario Vavti
|
50ac9378e3
|
assign right aside the same width as we have in left aside but hide it on small and xs screens. make aside width a variablee for easier handling.
|
2015-06-10 13:08:17 +02:00 |
|
redmatrix
|
eb6a1f8387
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-06-09 19:39:21 -07:00 |
|
redmatrix
|
9592f7f3e6
|
put mirror_frontpage setting into admin/site
|
2015-06-09 19:37:12 -07:00 |
|
redmatrix
|
d08c43d80c
|
toggle diaspora protocol on a per-channel level in addition to the existing per site setting. Default is enabled if the site setting is enabled.
|
2015-06-09 18:50:11 -07:00 |
|
redmatrix
|
03357481f7
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
install/schema_mysql.sql
mod/home.php
mod/page.php
view/nl/messages.po
view/nl/strings.php
|
2015-06-09 16:52:00 -07:00 |
|
Mario Vavti
|
a6cedf0953
|
css regression fixes
|
2015-06-08 19:27:16 +02:00 |
|
redmatrix
|
10e88a3e45
|
Merge branch 'frontpage'
|
2015-06-07 21:38:11 -07:00 |
|
redmatrix
|
3c5a5a9ebf
|
more frontpage tweaks
|
2015-06-07 18:59:14 -07:00 |
|