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
e858ee811b
Fixed connection page. Page was overcrowded on systems with larger fonts.
2015-10-26 13:57:12 +01: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
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
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
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
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
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
Mario Vavti
5ba39fef9a
private mail compositor changes
2015-10-02 17:51:37 +02:00
Mario Vavti
a895a0d79e
private mail template and css fixes
2015-10-02 11:41:37 +02:00
Mario Vavti
d6293730fc
private mail: some work on conversations view
2015-09-25 23:26:28 +02:00
Mario Vavti
b9723aa85b
some heavy private mail restructuring - work in progress
2015-09-24 14:07:44 +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
Mario Vavti
b7e953f50e
fix calculation of content height with margins
2015-09-17 14:14:01 +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
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
e42111545b
center page content by default
2015-09-11 11:54:35 +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
feabaedd83
increase width of tasklist input element
2015-08-22 15:46:40 -07:00
redmatrix
242cb047d4
limit the height of tasklist
2015-08-20 22:15:09 -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
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
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
e8f19c1e15
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
mod/connedit.php
2015-07-14 17:10:13 -07:00
Mario Vavti
7f71297383
cleanup connedit
2015-07-14 12:46:40 +02:00
redmatrix
69a4cf73a3
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-07-11 15:03:23 -07: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
Mario Vavti
e1f64b6748
move section and aside padding from default.css to style.css
2015-07-10 10:09:54 +02:00
Mario Vavti
115c18353e
move profile image up and refine the aside width
2015-07-09 14:44:24 +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
adfb4072e8
various css fixes
2015-07-07 12:13:15 +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
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
Mario Vavti
22b9e97ae2
css fixes
2015-06-27 22:27:17 +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
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
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
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
friendica
4b348d2489
Merge branch 'master' into tres
...
Conflicts:
view/css/mod_events.css
view/theme/redbasic/css/style.css
2015-02-05 19:38:43 -08:00
friendica
abcc70722c
event form cleanup backported from trinidad - still need to style the checkboxes
2015-02-05 19:37:55 -08:00
friendica
1b5bd1d808
increase size of rating value to make it stand out a bit.
2015-02-05 15:11:51 -08:00
friendica
561bab4ece
remote rating and addition of rate-me to channel profile sidebar
2015-02-04 17:32:29 -08:00
friendica
3988948516
first cut at rating widget. The flaw is that it is limited because it requires local_channel() (formerly local_user()). We need to extend this to take you home like rpost does if you're logged in as remote_channel() - and/or we need zot to send the rating message to the source channel and target in addition to the directories.
2015-02-04 15:48:39 -08:00
friendica
4ead2cd79d
final cleanup on ratings feature
2015-02-03 21:19:29 -08:00
friendica
17ffe122b3
ratings - mopping up, most everything but directory sync implemented
2015-02-03 18:10:55 -08:00
friendica
5cb2f55dbb
rating form work
2015-02-03 16:52:09 -08:00
friendica
8a78d1d5df
that didn't look so good on a small screen - let it hang out on the right margin
2015-02-03 15:52:57 -08:00
friendica
c417a43338
styling for the directory page when it comes to ratings
2015-02-03 15:50:12 -08:00
friendica
df632c4232
run ratingsearch on the server
2015-02-03 15:06:16 -08:00
friendica
4a243b63f7
cleanup event form and various required indicators on inputs
2015-01-29 20:09:48 -08:00
marijus
17c684e123
tpl and css cleanup
2015-01-27 19:33:30 +01:00
marijus
65aa6cf708
move userReadableSize() and getIconFromType() from /include/RedDAV/RedBrowser.php to include/text.php and add template for mod/sharedwithme
2015-01-27 19:00:16 +01:00
friendica
d0258c0da2
More styling for poco reputation page. Note: the reason this isn't yet linked to the UI is because we need to age some old '1' values that are bogus.
2015-01-20 20:58:55 -08:00
marijus
43326a26b7
css fixes - hopefully
2015-01-20 22:19:51 +01:00
marijus
5ee815b2fa
satisfy the floated images
2015-01-20 21:10:41 +01:00
marijus
33380b3c30
as a workaround make nav-search dropdown behave a little better
2015-01-20 15:00:44 +01:00
friendica
dfe31dc3b7
more heavy lifting on poco rep
2015-01-15 19:05:42 -08:00
friendica
e7932d97a2
editing stuff for poco reputation
2015-01-15 16:37:47 -08:00
friendica
580c30f516
another attempt to explain default permissions on connedit page
2015-01-11 21:18:29 -08:00
friendica
43f43d78cf
regression: need float clear on manage page so footer doesn't end up floated,
...
add default value to features so that features can be created that are default enabled, or modified later to default enabled without requiring a system config to accomplish this.
2015-01-05 20:57:30 -08:00
friendica
31648d65c8
some work on the edit connection workflow explanation and connedit page. This needs a lot more attention, but it was screaming for any improvement in documenting why we tell you that the permissions have been changed but not saved.
2015-01-02 19:20:52 -08:00
Stefan Parviainen
42773a1122
Reworked switch to also display text
2015-01-02 18:14:23 +01:00
Stefan Parviainen
ef6680f7ad
Possibly make switches work on IE8 (untested)
2015-01-01 11:33:00 +01:00
Stefan Parviainen
70f0019905
Checkboxify yesno-fields, but use CSS to show them as switches in Redbasic
2015-01-01 10:08:20 +01:00
marijus
6cbbe854d5
css fixes
2014-12-30 12:12:55 +01:00
RedMatrix
619733e297
Merge pull request #789 from pafcu/chanman
...
Don't show current channel separately in channel manager, highlight it i...
2014-12-30 08:57:37 +11:00
marijus
f2bfdf0c76
some work on cloud actionspanel and minor cleanup
2014-12-29 22:45:07 +01:00
Stefan Parviainen
e69e59d260
Don't show current channel separately in channel manager, highlight it instead
2014-12-29 22:07:40 +01:00
marijus
d801c361d6
css fixes and remove sloppy photos setting since it is not supported anymore in redbasic
2014-12-29 21:53:00 +01:00
marijus
fa23439b9c
more files css fixes
2014-12-28 20:46:16 +01:00
marijus
801ab709ad
more work on files
2014-12-28 18:16:27 +01:00
marijus
0cb0c2b1bf
more work on files
2014-12-27 10:10:56 +01:00
RedMatrix
c732b72a0d
Merge pull request #757 from git-marijus/master
...
files: make mod/filestorage.php load via ajax and some design work. work...
2014-12-22 09:45:33 +11:00
marijus
02328bfdbe
forgot to git add files
2014-12-21 20:27:43 +01:00
Stefan Parviainen
aa73259a47
Fancy categories input with bootstrap-tagsinput
2014-12-21 12:42:07 +01:00
friendica
6d8214f96b
provide link to help for channel permission roles when creating a channel
2014-12-19 01:48:47 -08:00
friendica
faf1f672df
make the size of directory photos fixed so that the screen doesn't jump around when loading.
2014-12-17 19:17:33 -08:00
marijus
960c35bad3
move profile css to mod_profile and minoor fixes
2014-12-11 11:44:46 +01:00
marijus
242713ebef
show clear browser location button only if use browser location option is set and minor css fixes
2014-12-09 15:09:19 +01:00
marijus
3855be4910
bootstrap-3.3.1 and minor css fixes
2014-11-29 14:33:36 +01:00
friendica
3fa003b5a8
add some subtle delineation to directory entries, remove forced link on homepage element (SECURITY)
2014-11-11 15:13:18 -08:00
marijus
d145ef2021
some work on directory widgets
2014-11-11 23:09:55 +01:00
