Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 12:15:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
15093 commits 7 branches 30 tags 160 MiB
Commit graph

4745 commits

Author SHA1 Message Date
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
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
Mario Vavti
3298b4a0cb remove unused variables 2015-03-08 12:56:16 +01:00
Mario Vavti
a65e3c432d copy/paste typo 2015-03-08 12:52:31 +01:00
Mario Vavti
5bf49dabc6 Merge branch 'master' of https://github.com/friendica/red 2015-03-08 12:07:43 +01:00
Mario Vavti
488d5b8714 port boxy scheme 2015-03-08 12:07:32 +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
Mario Vavti
fc6e7db7dc remove unused var 2015-03-06 15:28:50 +01:00
Mario Vavti
e67983f327 add more css files 2015-03-06 15:24:56 +01:00
Mario Vavti
1cea6144c9 if we have not got a schema also look for default.css 2015-03-06 14:56:35 +01:00
Mario Vavti
83c4c5b095 create schema/dark.css and create a sample 2015-03-06 14:51:11 +01:00
Mario Vavti
29c2223c67 narrow navbar fixes 2015-03-06 12:16:36 +01:00
Mario Vavti
dcfa26819f add ability to use css files with schemes 2015-03-06 12:15:56 +01: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
ca641468a1 update theme screenshot 2015-03-05 17:39:15 +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
b9a1b01c92 fix theme preview image css 2015-03-05 12:52:09 +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
friendica
ddaf5c067d cleanup mail buttons 2015-03-04 14:00:36 -08:00
Mario Vavti
12be436a59 more on/off switch colour adjustment 2015-03-04 14:34:24 +01:00
Mario Vavti
fdd70c1949 make on/off switches work better with schemes 2015-03-04 14:19:20 +01:00
Mario Vavti
e5e96dfbff cleanup removeaccount 2015-03-04 11:11:36 +01:00
Mario Vavti
431a462d60 cleanup removeme 2015-03-04 11:01:16 +01:00
Mario Vavti
eceafd5777 fix wording 2015-03-04 10:26:25 +01:00
Mario Vavti
4b08ccd873 clean up account settings 2015-03-04 10:11:48 +01:00
Mario Vavti
6d30abe4bf Accordionize feature settings 2015-03-04 09:54:33 +01:00
friendica
df90677f90 add the tag hijacking preference to Diaspora settings 2015-03-03 17:43:13 -08:00
friendica
52f42e7d81 Merge https://github.com/friendica/red into pending_merge 2015-03-03 14:39:03 -08:00
friendica
44b714d0eb group/collection edit page cleanup 2015-03-03 14:38:34 -08:00
jeroenpraat
e3a559128d yes switch to bootstrap blue again (same as link colour in default light redbasic schema). using link_colour for yes switch didnt work on dark schemas (displayes as white on white). 2015-03-03 23:32:40 +01:00
Mario Vavti
2d38e58adb revert login max-width 2015-03-03 12:38:23 +01:00
Mario Vavti
6e0b5b742c login adjustment 2015-03-03 11:32:54 +01:00
Mario Vavti
7644a23de4 typo 2015-03-03 09:52:35 +01:00
Mario Vavti
74c1b61689 make remove channel button work again 2015-03-03 09:18:04 +01:00
friendica
ec65c76a66 Merge https://github.com/friendica/red into pending_merge 2015-03-02 18:03:00 -08:00
friendica
37384c0b27 automated warning after a few days if poller is dead 2015-03-02 18:02:06 -08:00
Mario Vavti
ea800c0b8c Merge branch 'master' of https://github.com/friendica/red 2015-03-02 20:52:03 +01:00
Mario Vavti
6b467974a3 some more work on settings 2015-03-02 20:51:32 +01:00
friendica
e6eee5ba92 tagcloud tweaks 2015-03-02 11:09:38 -08:00
Paolo T
5a2914880f Merge pull request #914 from tuscanhobbit/dev 
Updated Italian strings
 2015-03-02 09:16:57 +01:00
Paolo Tacconi
b3f1fbf04f Updated Italian strings 2015-03-02 09:14:23 +01:00
friendica
41415d934f here's the email template 2015-03-01 20:18:08 -08:00
friendica
e006658b01 raise the default upload limit for the application. We eliminated this in English long ago, but several of the translated htconfig files still have the old limit. 2015-03-01 19:14:59 -08:00
friendica
bc1afbc762 Merge https://github.com/friendica/red into pending_merge 2015-03-01 15:57:56 -08:00
friendica
ba7bdd79b7 queue management actions. Still needs further work such as indication of last successful connection or indication that the hub was marked offline, but these are potentially expensive queries. 2015-03-01 15:55:27 -08:00
Mario Vavti
e8e6231a4e settings: missing /form and whitespace 2015-03-01 21:51:44 +01:00
Mario Vavti
ea6e86fecc more settings work 2015-03-01 21:45:49 +01:00
Mario Vavti
b4a2f764ab fix login 2015-03-01 16:21:32 +01:00
Mario Vavti
6e64f9af54 first pile of work on settings 2015-03-01 15:22:23 +01:00
Mario Vavti
7018aefd6f Merge branch 'master' of https://github.com/friendica/red 2015-02-28 23:21:25 +01:00
Mario Vavti
b286ad221c some css fixes for settings 2015-02-28 23:21:05 +01:00
jeroenpraat
016f096208 Dutch language updated 2015-02-28 21:46:15 +01:00
zottel
08a4c714db update to German strings 2015-02-27 11:02:07 +01:00
friendica
a00c072f02 high level queue inspector - needs a lot more, like the ability to dump certain destinations and indicating known dead sites, but this is a start 2015-02-26 20:00:47 -08:00
friendica
5d57df2694 per Randal overheard on a foreign network - tab in post/comment edit window goes to submit instead of the next button. 2015-02-26 17:18:09 -08:00
friendica
dce0bb0ef8 finish converting "delete" to trash icons for consistency. The 'x' was left in a couple of places like the group list widget and saved search term widget and ignoring friend suggestions where it was more appropriate to leave it. 2015-02-26 16:41:38 -08:00
friendica
86aefe0e01 new session functions 2015-02-22 15:27:45 -08:00
zottel
2c7e8bea88 show item title in channel/mid and display pages 2015-02-20 14:07:56 +01:00
Paolo Tacconi
062a386c75 Italian strings updated 2015-02-19 17:14:03 +01:00
zottel
2cd705a1b5 update to German translations 2015-02-19 12:43:42 +01:00
RedMatrix
4a75d2d754 Merge pull request #900 from einervonvielen/doc_dev_beginner_corrections 
Changed bbcode [toc] and changed doc for beginning deveopers
 2015-02-19 13:40:23 +11: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
friendica
8c717f910a Merge https://github.com/friendica/red into pending_merge 2015-02-17 18:14:47 -08:00
marijus
0bedf3e5d2 advanced css calc() failback 2015-02-17 10:58:18 +01:00
friendica
3d9273afad Merge https://github.com/friendica/red into pending_merge 2015-02-16 17:01:41 -08:00
friendica
533f39debe bring back like/dislike summaries on photos 2015-02-16 17:01:13 -08:00
marijus
e0c9929325 quickfix for eventual css calc() not supported bug 2015-02-17 00:32:38 +01:00
friendica
b4f639239f mopping up the public site ratings 2015-02-16 11:09:12 -08:00
friendica
1c4b919980 force site_url to be lowercase when stored. Otherwise rating hubs on postgres could get real messy. 2015-02-15 23:45:22 -08:00
friendica
8774089005 preparatory work for site ratings 2015-02-15 21:22:05 -08:00
friendica
0249fbb7e6 lost ability to delete events 2015-02-15 16:04:59 -08:00
marijus
db7b4ea2bf update justifiedGallery to version 3.5.4 and add ignoreElement option which will hopefully be accepted upstream 2015-02-14 22:18:50 +01:00
Einer von Vielen
6ed8fb30b8 Changed bb code [toc] to make it more flexible 
This usage is know closer to the original usage of
http://ndabas.github.io/toc/

Changed:
- jquery.toc.js: Do not check for empty headings
- bbcode.php: Added processing of [toc] with parameters
- main.js: Use the default params for jquery.toc.js
- bbcode.html: Added more help for [toc] and corrected some html
 2015-02-14 20:33:51 +01:00
marijus
7c45f23f8f some shifting to make button groups render properly 2015-02-13 12:37:05 +01:00
marijus
4616c13f3b yet another icon change 2015-02-13 10:40:52 +01:00
friendica
da2349bb6a provide relief to sites that are severely impacted by the slow ITEM_UNSEEN searches. This does not incorporate any other flag optimisations as that will require a major DB update and possibly involve significant downtime. This is just to bite off a little chunk now and provide some much needed relief. 2015-02-12 17:45:25 -08:00
friendica
94a9aa9610 possibly better icons, possibly not. There is no [x]. 2015-02-12 14:54:53 -08:00
friendica
e8bdf2b8d7 more permissions tweaking 2015-02-10 21:21:18 -08:00
friendica
d010712517 wrong icons in list mode 2015-02-10 19:32:12 -08:00
friendica
79223b6b3d item voting tools 2015-02-10 19:10:18 -08:00
friendica
4632d30a78 more attendance 2015-02-10 14:47:09 -08:00
friendica
f7cce63447 cleanup event attendance - make sure it works in list mode. 2015-02-10 00:44:34 -08:00
friendica
81e7b47b76 more progress on event confirmations 2015-02-10 00:11:37 -08:00
friendica
c694945245 like formatting for extended consensus items 2015-02-09 21:18:50 -08: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
ad731b7c7b make preview button larger 2015-02-09 16:00:46 -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
ad25baf035 generate the Swedish strings file from the last sv/messages.po update 2015-02-08 22:42:38 -08: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
RedMatrix
247579ebf1 Merge pull request #890 from f03el/master 
Update Swedish strings
 2015-02-09 15:52:07 +11:00
friendica
69894e28c4 we still need an event preview but this looks a lot better. 2015-02-08 20:23:02 -08:00
friendica
a1d84f96b6 first cut at putting editor tools in event form 2015-02-08 19:25:35 -08:00
Erik Lundin
352dfb8d7b Update Swedish strings 2015-02-07 13:48:19 +01:00
friendica
e7a68eaef0 style the checkboxes in the event form 2015-02-05 21:01: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
68978ad1c0 collapse overly-verbose ratings 2015-02-05 15:28:46 -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
331c72b3be author profile photo in reshare wasn't linked 2015-02-05 14:46:08 -08:00
friendica
561bab4ece remote rating and addition of rate-me to channel profile sidebar 2015-02-04 17:32:29 -08:00
friendica
48a145a8ed add the required js file 2015-02-04 15:52:12 -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
127bf82187 probably enough for now - couldn't get the censorship filter in today, I think that's the only bit missing. 2015-02-03 23:30:07 -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
448af7458f Merge branch 'master' into pocorate 2015-02-03 11:19:50 -08:00
jeroenpraat
0281a2c32a Fixed height of items in dropdown notification lists. They overlapped when the browser uses a higher font size. This must work for everyone. 2015-02-03 19:58:15 +01:00
jeroen
39a8c9e454 NL on 100 percent again :/ 2015-02-03 17:45:26 +01:00
friendica
6067274b51 start to tie ratings to the directory page 2015-02-02 23:58:44 -08:00
marijus
c29483b88c respect parent dir permissions 2015-02-02 15:18:44 +01:00
friendica
aafed50a0e Merge branch 'master' into tres 2015-02-01 20:30:47 -08:00
jeroenpraat
e238b639f8 typo, see #884 2015-02-02 00:00:13 +01:00
friendica
e6a5f78003 Merge branch 'master' into tres 
Conflicts:
	include/zot.php
 2015-01-31 00:50:20 -08:00
marijus
dbd3999117 better cross-browser compatibility for td hover colour 2015-01-30 14:23:07 +01:00
RedMatrix
b381579959 Merge pull request #881 from cvogeley/master 
Add allowed and not allowed emails to the UI in the
 2015-01-30 18:14:10 +11:00
friendica
4a243b63f7 cleanup event form and various required indicators on inputs 2015-01-29 20:09:48 -08:00
friendica
3e22de0be0 how did that stuff merge? grrrr.... 2015-01-29 18:17:24 -08:00
friendica
df6d54c64e Merge branch 'master' into pocorate 2015-01-29 15:21:19 -08:00