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
Mario Vavti
08f799fff5
fix center page content setting
2015-05-04 15:58:49 +02:00
jeroenpraat
35a446445b
Updating Dutch
2015-05-02 18:23:23 +02:00
friendica
c4221f3273
Merge branch 'master' into tres
...
Conflicts:
include/notifier.php
2015-04-29 21:49:43 -07:00
Mario Vavti
2376d2140a
fix block view
2015-04-29 21:43:41 +02:00
friendica
bc44b6f793
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-04-28 13:14:40 -07:00
friendica
8711c223f3
version update
2015-04-28 13:14:15 -07:00
Mario Vavti
d6152d809a
revert some changes in justified gallery
2015-04-28 22:06:09 +02:00
Mario Vavti
31b5b06e42
Provide webpage layout description
2015-04-25 22:35:24 +02:00
Mario Vavti
fcaa980a3f
css fixes
2015-04-24 22:51:59 +02:00
Mario Vavti
b7f6cceaea
provide block titles in blocklist
2015-04-24 22:37:22 +02:00
Mario Vavti
c6a75f407d
webpages layout fixes
2015-04-24 11:36:49 +02:00
friendica
6679734135
Merge branch 'master' into tres
...
Conflicts:
include/Contact.php
include/ItemObject.php
include/api.php
include/attach.php
include/diaspora.php
include/dir_fns.php
include/enotify.php
include/event.php
include/expire.php
include/items.php
include/notifier.php
include/notify.php
include/photos.php
include/taxonomy.php
include/text.php
include/widgets.php
include/zot.php
mod/admin.php
mod/channel.php
mod/dirsearch.php
mod/display.php
mod/editwebpage.php
mod/events.php
mod/home.php
mod/item.php
mod/manage.php
mod/mood.php
mod/network.php
mod/page.php
mod/photos.php
mod/ping.php
mod/post.php
mod/thing.php
mod/viewsrc.php
view/css/mod_events.css
2015-04-23 19:49:41 -07:00
Mario Vavti
c696860cc5
webpages blocks fixes
2015-04-23 21:04:01 +02:00
Mario Vavti
b4dff3a9ff
provide headings for blocks and layouts
2015-04-22 10:31:36 +02:00
Mario Vavti
09096811ca
missing class
2015-04-21 23:30:12 +02:00
Mario Vavti
ba524e1a72
move .lockview to style.css and a typo
2015-04-21 23:27:30 +02:00
Mario Vavti
c52682c68f
missing dropdown class
2015-04-21 23:21:09 +02:00
Mario Vavti
e58e8f3f75
bring lockstate to webpages
2015-04-21 23:08:54 +02:00
Mario Vavti
21704ecb93
bring lockview to menu items, slightly change the way /lockview is called
2015-04-21 22:45:54 +02:00
Mario Vavti
0bd9fe0b11
rework and hopefully improve webpage menu creation workflow
2015-04-21 10:05:26 +02:00
friendica
6bc2766d79
issue #162
2015-04-20 20:49:55 -07:00
Mario Vavti
71117628bc
attach an id to menues, allow $menu_title to be empty, if no custom menu class is provided use default redbasic classes
2015-04-19 15:22:50 +02:00
Mario Vavti
dd5b97639e
Introduce wrap variable in comanche blocks (if set to none the block will not be wrapped in a div), fix menu item permissions (it was not possible to set them visible for everybody) and a typo
2015-04-19 13:25:05 +02:00
Mario Vavti
11b7fedd29
css fix
2015-04-18 16:23:14 +02:00
Mario Vavti
3ee78398aa
fix page-title margin
2015-04-18 13:32:40 +02:00
friendica
9f35971860
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-04-17 17:21:10 -07:00
friendica
3d99a6b5c4
hide event share button when editing an event
2015-04-17 17:20:24 -07:00
Mario Vavti
c02ff823f6
adjus webpage font size to match conv item font size
2015-04-17 13:53:09 +02:00
Mario Vavti
61e4ee753d
allow jot to be displayed expanded, remove deprected datetimepicker js and some random fixes
2015-04-17 11:20:22 +02:00
Mario Vavti
10cc643f65
wording and css fixes
2015-04-16 23:46:12 +02:00
Mario Vavti
9addc4581e
provide a separate input field for rpost attachments
2015-04-16 23:26:11 +02:00
Mario Vavti
86ac9c0d6b
move share webpage element from editwebpage to webpages and make it shareable with rpost
2015-04-16 10:43:14 +02:00
mrjive
324fd61d7f
Added string for item ID in view source
2015-04-15 12:59:22 +02:00
Mario Vavti
834044b15b
title=>name
2015-04-15 09:20:27 +02:00
Mario Vavti
953819e7da
css fixes and remove expert mode for block page content type
2015-04-14 12:52:31 +02:00
Mario Vavti
bf2a97147e
some more on webpages
2015-04-14 11:50:21 +02:00
Mario Vavti
865b602cf8
webpages appearence
2015-04-13 23:38:36 +02:00
Mario Vavti
05f018e509
add bs classes to design tools menu
2015-04-13 17:24:37 +02:00
Mario Vavti
aeb162e963
remove superfluous view/preview buttons
2015-04-13 16:49:08 +02:00
Mario Vavti
22c3202f22
remove widget class from webpage blocks and make titles h2 to match the rest of the matrix
2015-04-13 16:17:10 +02:00
Michael Johnston
6e633924bd
only add the h3 tag to the page if there is a title
2015-04-12 17:24:32 -04:00
Mario Vavti
c6873529f4
bring ajax delete to files
2015-04-12 15:01:06 +02:00
Mario Vavti
70b109702e
make dropItem more universal and move delete up in the dropdown menu
2015-04-12 14:30:33 +02:00
Mario Vavti
7c8b9397ae
reverse file activity logic
2015-04-12 13:13:22 +02:00
Mario Vavti
8138373973
move style to style.css
2015-04-10 14:14:19 +02:00
Mario Vavti
a3b18adbcb
bring ajax item delete to conv list
2015-04-10 09:30:43 +02:00
friendica
3fd2e4b716
program the affinity slider labels
2015-04-09 19:51:58 -07:00
Mario Vavti
7e7678364b
make jRange behave again
2015-04-09 10:53:37 +02:00
Mario Vavti
a73dbb3073
delete conv items on the fly in background
2015-04-08 14:10:38 +02:00
Mario Vavti
b3f80c049f
update jquery to 1.11.2
2015-04-08 10:46:46 +02:00
Mario Vavti
549bcf5a72
this is easier on the eyes when collapsing a long post/comment
2015-04-08 08:53:28 +02:00
friendica
5bc7c0e798
add endless scroll to viewconnections module
2015-04-06 22:36:46 -07:00
friendica
3a3563a4b1
commit 59828593c broke some important poco stuff, looks like the cat might have climbed over the keyboard and deleted something that wasn't intended to be deleted.
2015-04-06 19:00:13 -07:00
friendica
04c993ff2a
now add back the navsearch param
2015-04-06 16:18:35 -07:00
Klaus Weidenbach
754ac2cff7
Fix Design Tool navigation for sys channel.
...
Fix creating menu for sys channel.
2015-04-06 23:52:13 +02:00
jeroenpraat
c2517eca56
Update/fix Dutch and removing an ugly space
2015-04-02 02:23:26 +02:00
friendica
6199af6a79
revert iconic change to collection list widget
2015-04-01 01:07:38 -07:00
friendica
68c1aac1e3
make search box border radius consistent with everything else. It looks really weird when it's so different.
2015-03-31 19:02:02 -07:00
friendica
7f6ba91dfa
allow webpage for home to use its own layout file
2015-03-31 17:52:03 -07:00
Paolo T
642ab1c256
Merge pull request #945 from tuscanhobbit/dev
...
Italian translation
2015-03-30 20:14:01 +02:00
tuscanhobbit
aecd2432b0
Italian translation
2015-03-30 20:10:38 +02:00
friendica
cff7696e98
change "create new collection" to iconic, document the account table
2015-03-30 00:51:03 -07:00
friendica
c29d3fc08a
mod_connections ajax failure see http://stackoverflow.com/questions/14347611/jquery-client-side-template-syntax-error-unrecognized-expression
2015-03-29 18:42:05 -07:00
jeroenpraat
d423c9b12c
Make sure long words (channel addresses, homepages) on the vcard are not on top of the content to the right.
2015-03-29 00:38:47 +01:00
Mario Vavti
2899c500ee
some colorbox styling
2015-03-27 12:12:12 +01:00
Mario Vavti
b59e2870ab
Move bootstrap dependencies (tagsinput) to theme redbasic (we only have it there). Comment out some most probably deprecated js includes. Some css cleanup.
2015-03-27 11:52:59 +01:00
friendica
1bf93916db
adjust category auto-complete background color (blue) to match the blue we use for buttons. It was a completely unrelated shade of blue and looked out of place.
2015-03-26 23:51:58 -07:00
