redmatrix
|
f3b95f591a
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-05-31 19:26:00 -07: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
|
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 |
|
Mario Vavti
|
616338c17e
|
provide ability to create submenus
|
2015-05-10 15:00:18 +02:00 |
|
Mario Vavti
|
8ca10dcbab
|
adjust icon size
|
2015-05-07 10:35:22 +02:00 |
|
friendica
|
c4221f3273
|
Merge branch 'master' into tres
Conflicts:
include/notifier.php
|
2015-04-29 21:49:43 -07: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
|
ba524e1a72
|
move .lockview to style.css and a typo
|
2015-04-21 23:27:30 +02:00 |
|
Mario Vavti
|
e58e8f3f75
|
bring lockstate to webpages
|
2015-04-21 23:08:54 +02:00 |
|
Mario Vavti
|
0bd9fe0b11
|
rework and hopefully improve webpage menu creation workflow
|
2015-04-21 10:05:26 +02: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
|
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
|
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 |
|
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
|
7c8b9397ae
|
reverse file activity logic
|
2015-04-12 13:13:22 +02:00 |
|
Mario Vavti
|
7e7678364b
|
make jRange behave again
|
2015-04-09 10:53:37 +02:00 |
|
friendica
|
7f6ba91dfa
|
allow webpage for home to use its own layout file
|
2015-03-31 17:52:03 -07: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
|
0837e67a53
|
minor tweak on event form
|
2015-03-26 21:03:54 -07:00 |
|
friendica
|
b1f2c29a96
|
bring event form into line with other forms
|
2015-03-26 20:56:05 -07:00 |
|
Mario Vavti
|
d6ad74c649
|
indicate new or updated items
|
2015-03-23 10:59:54 +01:00 |
|
friendica
|
7a9aca6ecb
|
fix the map embed issue by keeping the map visible but moving it far off the screen.
|
2015-03-17 18:45:56 -07:00 |
|
friendica
|
bc22df9057
|
display a map for photos if allowed. Note: there is a bug in that if the map div starts with display:none one needs to reload the frame or zoom in or they end up at minimum resolution. Still trying to sort this out.
|
2015-03-16 22:06:03 -07:00 |
|
Mario Vavti
|
fdcbb61bcb
|
assure that badges will be displayed as circles no matter what font is used and if there is only one digit inside. move css to its proper place
|
2015-03-14 12:37:48 +01:00 |
|
Mario Vavti
|
8113ee1c4a
|
some work on feature/addon settings
|
2015-03-12 10:19:56 +01:00 |
|
friendica
|
4237e8052e
|
buttons for admin_accounts + admin_channels
|
2015-03-09 20:40:02 -07:00 |
|
friendica
|
ddaf5c067d
|
cleanup mail buttons
|
2015-03-04 14:00:36 -08:00 |
|
friendica
|
df90677f90
|
add the tag hijacking preference to Diaspora settings
|
2015-03-03 17:43:13 -08:00 |
|
friendica
|
44b714d0eb
|
group/collection edit page cleanup
|
2015-03-03 14:38:34 -08:00 |
|
Mario Vavti
|
6b467974a3
|
some more work on settings
|
2015-03-02 20:51:32 +01:00 |
|
Mario Vavti
|
6e64f9af54
|
first pile of work on settings
|
2015-03-01 15:22:23 +01:00 |
|
Mario Vavti
|
b286ad221c
|
some css fixes for settings
|
2015-02-28 23:21:05 +01:00 |
|
friendica
|
d8d175d7e4
|
first step of theme separation. Only put redbasic under git control. Ignore any other themes in view/theme .
|
2015-02-18 17:01:40 -08:00 |
|
friendica
|
e00be4de23
|
The Diaspora communications policies allow comments to public posts literally from anybody. Allow this policy model by default for commenters from that network. This policy decision can be set or disabled on the addon/features settings page.
|
2015-02-17 19:47:36 -08:00 |
|
marijus
|
4616c13f3b
|
yet another icon change
|
2015-02-13 10:40:52 +01:00 |
|
friendica
|
fce51876c9
|
bring some styling back to the colorbox and improve the event preview ability
|
2015-02-09 18:58:43 -08:00 |
|
friendica
|
ed810a360f
|
event form - provide map ability for location field and add preview ability
|
2015-02-09 15:57:22 -08:00 |
|
marijus
|
b31a2f109f
|
fix transparent background in collapsed nav with project home enabled
|
2015-02-09 08:35:53 +01:00 |
|
friendica
|
08b757a22c
|
Merge branch 'master' into tres
Conflicts:
mod/events.php
view/css/mod_events.css
|
2015-02-08 20:57:37 -08:00 |
|
friendica
|
69894e28c4
|
we still need an event preview but this looks a lot better.
|
2015-02-08 20:23:02 -08:00 |
|