Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-24 08:55:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
13915 commits 7 branches 31 tags 160 MiB
Commit graph

4476 commits

Author SHA1 Message Date
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
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
friendica
fe2d5969d2 Merge https://github.com/friendica/red into pending_merge 2015-03-26 18:10:42 -07:00
friendica
47292c612c provide ways to over-ride the datetime pickers 2015-03-26 18:03:39 -07:00
RedMatrix
f8233641e6 Merge pull request #940 from HaakonME/master 
Updated Norwegian bokmål translation
 2015-03-27 08:48:19 +11:00
Mario Vavti
b638c6e007 whitespace 2015-03-26 22:34:56 +01:00
Mario Vavti
c521a28486 do not move viewed content off the screen after collapsing a long post 2015-03-26 21:33:44 +01:00
Haakon Meland Eriksen
0853d9dca7 Updated Norwegian bokmål translation 2015-03-26 20:36:28 +01:00
Mario Vavti
a5f410d587 this might stop page scrolls while new updates drop in 2015-03-26 10:43:09 +01:00
Mario Vavti
e0a0fc507f remove some vars from style.css 2015-03-26 09:45:30 +01:00
friendica
a6be0c9e72 since several prominent sites are interested in post expiration, this reduces the usefulness of having an archive widget n the matrix page (which wasn't horribly useful anway). So remove it from the default mod_network.pdl 2015-03-25 17:50:38 -07:00
friendica
75f3f4a808 admin config for default expiration 2015-03-25 17:43:02 -07:00
Paolo T
e41958111f Merge pull request #937 from tuscanhobbit/dev 
Italian translation
 2015-03-24 13:55:47 +01:00
Paolo Tacconi
78ef81b15f Italian translation 2015-03-24 13:37:23 +01: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
fdac8373d8 remove unused vars 2015-03-20 14:10:22 +01:00
Mario Vavti
7b05c96dc5 remove more $vars from style.css 2015-03-20 13:12:55 +01:00
Mario Vavti
a185b555dc there are no vars to replace in converse_center.css 2015-03-19 17:20:16 +01:00
Mario Vavti
b3ff6da6bc remove more unused $vars 2015-03-19 16:33:15 +01:00
Mario Vavti
d1dd883d88 remove more $vars from style.css 2015-03-19 16:17:01 +01:00
Mario Vavti
db355db9a6 remove $abook_changebg from style.css 2015-03-19 15:33:15 +01:00
Mario Vavti
ad9f5079cd do not destroy page layout if feature_encrypt is not enabled 2015-03-19 12:40:04 +01:00
Mario Vavti
463bd146dc remove px from default value 2015-03-18 16:42:04 +01:00
Mario Vavti
096ab06dcb just to be sure 2015-03-18 16:37:33 +01:00
Mario Vavti
d4de2dfe7a move body-font-size setting backt to expert. most people probably use browser built in zoom capabilitie. 2015-03-18 15:47:20 +01:00
Mario Vavti
32c7d381b6 Merge branch 'master' of https://github.com/friendica/red 2015-03-18 14:42:25 +01:00
Mario Vavti
8cb31172a9 make every page regard max content width setting and move the setting out of experts mode 2015-03-18 14:41:54 +01:00
jeroenpraat
2a394b8abe Update Dutch translations 2015-03-18 13:48:24 +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
9472d0a683 move bootbox out of bootstrap 2015-03-17 23:16:22 +01:00
Mario Vavti
7966c2db4c update bootstrap-3.3.4 and bootbox-4.4.0 2015-03-17 23:07:08 +01:00
Mario Vavti
ccdb027677 Merge branch 'master' of https://github.com/friendica/red 2015-03-17 15:12:39 +01:00
Mario Vavti
8d89dde908 update templates 2015-03-17 15:12:21 +01:00
Paolo T
d18814e3c8 Merge pull request #932 from tuscanhobbit/dev 
Updated Italian strings
 2015-03-17 13:44:59 +01:00
Paolo Tacconi
0309652b6f Updated Italian strings 2015-03-17 13:40:06 +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
4212a1f589 start on some db_table doco 2015-03-15 18:49:44 -07:00
friendica
d7a6dae3cb Merge https://github.com/friendica/red into pending_merge 2015-03-15 16:51:35 -07:00
friendica
92470eb0f2 Show profile on openid server page 2015-03-15 16:15:10 -07:00
Klaus Weidenbach
792e475a78 Some JavaScript cleanups. 
Adding some missing and remove some unnecessary semicolons.
Change some comparing operators.
Changed access to objects with dot operator.
 2015-03-15 23:56:32 +01: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
friendica
4fb7d4f58a make nav badges big enough to be clickable on small touch devices 2015-03-13 15:23:15 -07: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
Mario Vavti
1d59924f4d make areYouSure alert also if default post perms change 2015-03-09 23:21:00 +01:00
Mario Vavti
00d7ea90a2 add transition effect for border-color 2015-03-09 16:52:37 +01:00
Mario Vavti
7c3fb06267 some more hover magic for field checkbox 2015-03-09 16:34:25 +01: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
Mario Vavti
9e6d85b4ea add hover effect to checkbox field 2015-03-08 21:28:58 +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