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
redmatrix
60cfea5d1f
reverse logic of homepage login setting
2015-06-07 18:27:05 -07:00
redmatrix
0537ff1e4a
frontpage tweaks
2015-06-07 18:15:26 -07:00
redmatrix
65bea5e02c
frontpage changes
2015-06-07 16:19:59 -07:00
jeroenpraat
fd73ffe291
Upd NL
2015-06-07 16:39:00 +02:00
redmatrix
ec1dcb8f2e
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
util/messages.po
2015-06-06 17:31:22 -07:00
Mario Vavti
f5e439236c
missing comma
2015-06-06 20:23:00 +02:00
jeroenpraat
93237f8d0a
Added translatable strings to the Display Settings page and refreshed util/messages.po.
2015-06-06 19:49:30 +02:00
Mario Vavti
2c52be8780
css fixes
2015-06-06 17:05:38 +02:00
Mario Vavti
d60c2b1621
whitespace
2015-06-06 15:51:15 +02:00
Mario Vavti
dff402293f
some cleanup after scheme transition
2015-06-06 15:06:27 +02:00
jeroenpraat
f51cfa6960
More schemas in new format
2015-06-05 21:15:21 +02:00
jeroenpraat
6e336d680d
Schemas: should be ok now.
2015-06-03 22:53:48 +02:00
jeroenpraat
03361acce5
2 more schemas in new format
2015-06-03 15:45:50 +02:00
jeroenpraat
76d7278c0a
empty php schema back
2015-06-03 13:57:10 +02:00
redmatrix
7cbc504874
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-06-02 17:47:47 -07:00
jeroenpraat
89fbd5c0f6
First schema completely to the new format. git-marijus: Can you please quickly check if I'm doing it right?
2015-06-02 23:22:12 +02:00
redmatrix
f3b95f591a
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-05-31 19:26:00 -07:00
Mario Vavti
d11d130021
add some yes/no labels and minor template fixes
2015-05-29 15:23:51 +02:00
Mario Vavti
b8d3280763
some fixes to make menu sharing work and expose it in the ui.
2015-05-29 13:08:01 +02:00
Mario Vavti
5f1ae2930b
show created/edited dates for menus
2015-05-29 11:07:57 +02:00
redmatrix
8fe3daab21
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
install/schema_mysql.sql
mod/impel.php
view/pt-br/messages.po
view/pt-br/strings.php
2015-05-28 19:06:31 -07:00
Alexandre Hannud Abdo
af46587f3c
update pt_BR translation
2015-05-28 16:18:58 -03:00
redmatrix
675aa96f22
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-05-25 17:01:02 -07:00
redmatrix
29a8d580be
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-05-25 16:57:47 -07:00
redmatrix
23abfb0a5b
add toggle for ALLOWCODE to admin/channel and also fix the ability to toggle the censor flag from that page.
2015-05-25 16:56:28 -07:00
Mario Vavti
d9b9faaa89
add this to better support mobile devices out of the box in zen template
2015-05-25 21:27:33 +02:00
redmatrix
3763f74a10
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
include/items.php
include/text.php
mod/item.php
view/nl/messages.po
2015-05-20 20:49:06 -07:00
redmatrix
c55d13a836
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-05-20 18:48:05 -07:00
redmatrix
6466774b6e
PRIVACY: possible privacy leakage under a defined set of circumstances
2015-05-20 18:46:23 -07:00
jeroenpraat
a7d39cf654
Another update for Dutch with complete $Projectname substitutions (and channel activity as suggested on previous discussion)
2015-05-20 15:24:23 +02:00
redmatrix
c78869e437
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
view/nl/messages.po
view/nl/strings.php
2015-05-19 17:36:11 -07:00
jeroenpraat
5e87bd8843
New update Dutch
2015-05-19 12:12:16 +02:00
redmatrix
2dd0e7f6bd
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
view/nl/messages.po
view/nl/strings.php
2015-05-18 15:58:13 -07:00
jeroenpraat
6ab7394565
Update Dutch (Projectname variable not translated yet, because of undefined variable)
2015-05-18 16:25:22 +02:00
redmatrix
7c7a5cba8f
Merge branch 'master' into tres
2015-05-17 19:49:36 -07:00
redmatrix
76558df966
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
include/bb2diaspora.php
include/diaspora.php
include/enotify.php
mod/admin.php
mod/cloud.php
mod/dav.php
mod/home.php
mod/invite.php
mod/like.php
mod/mitem.php
mod/p.php
mod/pubsites.php
mod/setup.php
mod/siteinfo.php
util/messages.po
2015-05-17 19:48:57 -07:00
Razlo
fc1c188a7e
updated the templates to the {{}}, compared to
2015-05-17 02:40:51 +02:00
redmatrix
f0cb3cba12
Merge branch 'master' into tres
2015-05-14 22:12:56 -07:00
redmatrix
9de88c49c3
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-05-14 20:10:45 -07:00
redmatrix
a6cb90c81c
Merge branch 'master' into tres
...
Conflicts:
include/Import/refimport.php
include/activities.php
include/attach.php
include/event.php
include/externals.php
include/identity.php
include/items.php
include/notifier.php
include/photos.php
include/taxonomy.php
include/zot.php
mod/channel.php
mod/connedit.php
mod/events.php
mod/item.php
mod/like.php
mod/manage.php
mod/mood.php
mod/ping.php
mod/poke.php
mod/subthread.php
mod/tagger.php
mod/thing.php
2015-05-14 18:02:29 -07:00
Klaus Weidenbach
c62e75d789
Add sprintf.js v1.0.2.
...
This script provides sprintf() for JavaScript. It can be used for
example for translating strings used in JavaScript with variables.
It is licensed under BSD-3-Clause and can be found on GitHub:
https://github.com/alexei/sprintf.js
2015-05-14 10:39:56 +02:00
jeroenpraat
643d7db4a3
Dutch 100\% again
2015-05-12 23:03:13 +02:00
Alexandre Hannud Abdo
e9bdd46cc6
update pt-br transation
2015-05-11 09:09:29 -03:00
redmatrix
0a644a2f41
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
mod/mitem.php
view/de/messages.po
view/de/strings.php
2015-05-10 13:26:44 -07:00
Mario Vavti
ca36fce9a7
provide drop down submenu suggestions in edit mode
2015-05-10 21:17:37 +02:00
Mario Vavti
fad37eb6d0
copy/paste typo
2015-05-10 15:08:18 +02:00
Mario Vavti
616338c17e
provide ability to create submenus
2015-05-10 15:00:18 +02:00
zottel
9ef31e0402
update to German strings
2015-05-08 14:55:52 +02:00
redmatrix
37a63365f1
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-05-07 16:44:28 -07:00
Mario Vavti
cd8ecb8649
provide wrap variable for comanche menus
2015-05-07 23:02:14 +02:00
jeroenpraat
ef384be35f
Update Dutch
2015-05-07 14:32:24 +02:00
Mario Vavti
8ca10dcbab
adjust icon size
2015-05-07 10:35:22 +02:00
redmatrix
90591bcbc9
missed one...
2015-05-06 22:56:08 -07:00
redmatrix
c186e6ed96
change notification colour
2015-05-06 21:25:59 -07:00
redmatrix
75b8bfc07a
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-05-06 18:39:12 -07:00
Mario Vavti
9391f6f905
allow blocks to have custom classes and add a new template called zen which gives you an empty page to work with
2015-05-06 10:53:26 +02:00
redmatrix
245080a6d7
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-05-05 19:24:35 -07:00
redmatrix
f559c91b7a
turn consensus items into diaspora polls for that network
2015-05-05 19:23:21 -07:00
redmatrix
5b5f0666f9
second pass name change
2015-05-05 03:59:51 -07:00
redmatrix
a3c37f1458
first pass name change
2015-05-05 03:56:10 -07:00
Paolo T
15fc4d05ec
Merge pull request #317 from tuscanhobbit/dev
...
Italian translation
2015-05-04 16:36:00 +02:00
Paolo Tacconi
80e24b489f
Italian translation
2015-05-04 16:34:27 +02:00