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
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
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
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
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
adfb4072e8
various css fixes
2015-07-07 12:13:15 +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
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
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
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
redmatrix
b06b6f798f
localise event calendar
2015-06-25 18:23:48 -07:00
Mario Vavti
e9cc06dc11
directory: only provide connect button if we are not already connected
2015-06-24 21:12:20 +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
68534fd5dc
some diaspora import issues uncovered during dry-run tests
2015-06-21 17:30:23 -07: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
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
Mario Vavti
c8fe408a62
fix rendering of affinity slider
2015-06-11 11:35:21 +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
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
ec1dcb8f2e
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
util/messages.po
2015-06-06 17:31:22 -07:00
jeroenpraat
93237f8d0a
Added translatable strings to the Display Settings page and refreshed util/messages.po.
2015-06-06 19:49:30 +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
675aa96f22
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-05-25 17:01:02 -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
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
6466774b6e
PRIVACY: possible privacy leakage under a defined set of circumstances
2015-05-20 18:46:23 -07: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
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
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
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
Mario Vavti
2376d2140a
fix block view
2015-04-29 21:43:41 +02:00
friendica
8711c223f3
version update
2015-04-28 13:14:15 -07:00
Mario Vavti
31b5b06e42
Provide webpage layout description
2015-04-25 22:35:24 +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
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
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
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
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
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
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
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
a73dbb3073
delete conv items on the fly in background
2015-04-08 14:10:38 +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
friendica
6199af6a79
revert iconic change to collection list widget
2015-04-01 01:07:38 -07: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
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
47292c612c
provide ways to over-ride the datetime pickers
2015-03-26 18:03:39 -07:00
friendica
75f3f4a808
admin config for default expiration
2015-03-25 17:43:02 -07:00
Mario Vavti
d6ad74c649
indicate new or updated items
2015-03-23 10:59:54 +01:00
Mario Vavti
9980645ab8
fix acl for if we have an cid in /network and make $bang better visible
2015-03-21 13:37:55 +01:00
Mario Vavti
ead45292e1
some tabs title statuseditor restructuring
2015-03-21 00:06:18 +01:00
Mario Vavti
ad9f5079cd
do not destroy page layout if feature_encrypt is not enabled
2015-03-19 12:40:04 +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
Mario Vavti
8d89dde908
update templates
2015-03-17 15:12:21 +01: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
friendica
841f94ce2a
regression: visual feedback that page/content is loading when affinity slider value changed went missing
2015-03-16 18:10:14 -07:00
friendica
2bd3dc6101
Merge https://github.com/friendica/red into pending_merge
2015-03-16 15:50:27 -07:00
friendica
52374bcd6e
phase one of the great file storage unification - use one button for uploads of any type (image or attachment). We'll sort out which one it is and deal with it appropriately.
2015-03-16 15:33:08 -07:00
Mario Vavti
4146f9d3da
show generic submit button only if plugin name is provided
2015-03-16 21:19:27 +01:00
friendica
f507a5cd5a
prepare for demise of google code
2015-03-12 16:05:56 -07:00
Klaus Weidenbach
c6162c4c88
Fix JavaScript problems on channels where you are not allowed to upload photos.
...
Add some try...catch blocks around JavaScript that throws errors.
This commit should fix the current problems that were introduced by an
earlier commit.
2015-03-12 22:57:00 +01:00
Mario Vavti
d11bec6f58
add generic_addon_settings template and minor fixes
2015-03-12 22:22:52 +01:00
Mario Vavti
8113ee1c4a
some work on feature/addon settings
2015-03-12 10:19:56 +01:00
friendica
b3a9a6c802
remove the now redundant audio/video buttons and label the editor text style buttons which didn't have them. Unused editor buttons were commented in case we need to bring them back. If things go smoothly we can remove them. Use the link icon going forward - for all links.
2015-03-11 18:56:28 -07:00
friendica
5b35f1e6c4
Change logic of "don't create a status post for this photo upload" and turn it into a bona-fide on/off toggle. This takes up one more vertical line, but we have it to spare, and the single button (while concise visually) provided no feedback of the current state, or indicate whether a second click toggled it. Some addons use this setting so addons will need to be pulled when this is pulled in order to remain in sync.
2015-03-10 15:43:15 -07:00
Klaus Weidenbach
946beb6191
View upload photo button only if you have permission.
...
Check if post_photos permission is available otherwise hide the photo
upload button.
Or should we show the button and just disable it with a title, about
missing permission to upload photos?
In comments we use the same icon, but just add [img] bb-code. Should we
provide this if no permission to upload photos. Do we need different
icons for [img] and photo upload buttons?
2015-03-10 21:51:14 +01:00
Mario Vavti
637f0eba4f
collapse jot tools to submenu on small and extra small screens
2015-03-10 13:20:10 +01:00
friendica
98dffd77ef
channel delegation
2015-03-10 02:23:14 -07:00
friendica
4237e8052e
buttons for admin_accounts + admin_channels
2015-03-09 20:40:02 -07:00
friendica
b2e33435f7
increase the cell padding (any jokes about padded cells will be ignored)
2015-03-09 20:00:20 -07:00
friendica
0134a41015
more work on queue optimisations
2015-03-09 19:57:35 -07:00
friendica
c3d20cfba9
Bring simple editor formatting functions back to the main editor (bold, italic, underline, quote, code) so as to maintain parity and consistency with comments. Currently this will make the editor toolbar seem a bit cluttered but be aware that the second button group (attach and link tools) will be reduced to two buttons (attach and link) when the next phase of this work is completed. The third group of tools are optional features and will only be presented based on personal choice. Visual editors may need to disable, relocate, or redefine these buttons.
2015-03-09 18:32:51 -07:00
friendica
26a414fe4b
make network page default options work more or less universally instead of just from the navbar, and fix some saved-search weirdness related to the delete-term icon
2015-03-09 16:27:12 -07:00
habeascodice
f7d1fb9c5a
Merge pull request #920 from dawnbreak/master
...
Add alert to admin page about old PHP version. Fixing (un)blocking accounts in admin.
2015-03-08 16:51:42 -07:00
Klaus Weidenbach
c6d45858bb
Fixing (un)blocking accounts in /admin/users.
...
When I look at the instructions in sql_conventions about setting bit
flags I don't understand how this could have worked before. Changed the
behavior for (un)blocking so that it should work now.
2015-03-08 22:22:45 +01:00
Klaus Weidenbach
23ea974615
Add alert to admin page about old PHP version.
...
Add an alert message to admin summary page when a PHP version < 5.4 was
detected as this has reached EOL and will not be supported with the new
SabreDAV library.
Some styleguide optimisation.
Add NULL_DATE example to doc/sql_conventions.bb.
Display a "0" when no plugins active in summary page.
Added some more numbers to summary admin page, expired accounts,
channels. Hope I interpreted them right. I have no idea how to get
blocked accounts.
2015-03-08 17:51:58 +01:00
friendica
480dac1af2
add reddress to profile - but all is not as it seems. Copy to clipboard is blocked because it isn't really a reddress and won't work if you copy it and try and use it somewhere. We should really convert the symbol back to '@' on copy and allow it to be copied, but this isn't as easy as it sounds and is left as an exercise for the community. If we just allow it to be copied we'll get a lot of bugs that making friends doesn't work. It does, but that isn't a legitimate reddress and even if we made allowances for it, Diaspora and Friendica and other webfinger based services wouldn't and would just say it can't be found or it's an illegal address. So if we block copy we'll just get bugs that it can't be copied. Eventually somebody will see this checkin and take it on themselves to figure out how to fix the address when copied to clipboard and then allow it to be copied. And there will be joy.
2015-03-07 23:35:56 -08:00
friendica
f6da235a7d
major cleanup of directory options
2015-03-05 23:31:01 -08:00
friendica
22391a2437
straighten out some directory stuff, which required some Comanche structural changes
2015-03-05 18:24:49 -08:00
friendica
ec5c989352
make destructive queue management functions an expert option
2015-03-05 15:53:25 -08:00
Mario Vavti
ce229d73f8
whitespace and minor restructuring
2015-03-05 19:08:32 +01:00
Mario Vavti
688ef34d98
only show theme settings if we have any themes
2015-03-05 18:16:43 +01:00
Mario Vavti
44b74365dd
restructure display settings
2015-03-05 17:12:27 +01:00
Mario Vavti
c62e4bcdca
can not use element id more than once
2015-03-05 13:03:58 +01:00
Mario Vavti
3fa4123161
only allow theme selection forms if there are any themes to select
2015-03-05 12:47:18 +01:00
Mario Vavti
61f398e055
fix theme preview disappearing
2015-03-05 12:38:51 +01:00
Mario Vavti
beace0f57a
more yes/no labels
2015-03-05 10:20:49 +01:00
friendica
068699ae31
missed removing a test case
2015-03-04 20:14:47 -08:00
friendica
2ea162136e
the link icon on comments now calls the link parsing tool (just like the main editor window). Eventually the link specific icons (image, link, audio, video) will all be handled by inserting a link using the link icon (here and in the main editor window) and the separate buttons will go away. We also need to tie this to oembed so that there's one place to insert a link - no matter what kind of link it is, and we'll try to find the best way to render that as content. Similarly upload will upload content, no matter what kind of content; and we'll likewise try and figure out the best way to present whatever content was uploaded (img, file, audio, video, whatever).
2015-03-04 20:00:54 -08:00
