Commit graph

3606 commits

Author SHA1 Message Date
RedMatrix
498d98395a Merge pull request #501 from pixelroot/master
modified:   view/ru/messages.po
2014-06-24 10:06:06 +10:00
friendica
181623030b move the reset of "in_progress" to after the page and structures have completed updating 2014-06-23 16:55:52 -07:00
friendica
0cfcb02311 ability to like things 2014-06-23 05:19:28 -07:00
pixelroot
9c94504156 modified: view/ru/messages.po
modified:   view/ru/strings.php
2014-06-23 08:42:45 +02:00
friendica
c4c1c37bd3 profile likes 2014-06-22 22:16:26 -07:00
friendica
535aa28526 Merge https://github.com/friendica/red into pending_merge 2014-06-22 17:34:27 -07:00
friendica
3078eeaa69 give the admin a link to view channels from the channel admin page 2014-06-22 17:33:31 -07:00
Paolo T
1c432e4c49 Merge pull request #500 from tuscanhobbit/master
IT: strings updated
2014-06-22 19:55:31 +02:00
tuscanhobbit
35494c9e27 IT: strings updated 2014-06-22 19:54:07 +02:00
Klaus Weidenbach
2504d4c2a2 Add HTML5 datalist to edit photo album field.
This patch provides a datalist for the edit photo album field.
This makes it easier to move a picture to another existing folder in
the way that it provides a list of all available albums as values for
the album field.
2014-06-22 01:33:13 +02:00
Klaus
78fd496638 correct a tiny syntax error
there was a space missing between two values
2014-06-22 00:58:53 +02:00
Alexandre Hannud Abdo
b20887995a Implements a new permission level PERMS_PENDING
With this a user can allow some action to any user which connects
to them, even before they've connected back.

Ref.
https://mobiliza.org.br/display/478d9e71eaf55748dc646d3990651d6d34cfb7db5c38360538ec730ca3ccf908@zothub.com

Also some code cleanup and an alternative logic for handling
notifications of permission changes in zot.php.

This assumes that private posts are still restricted to people in
your addressbook. Regardless of your global permissions, a
pending channel won't get private posts, even if the post
only has a deny clause not matching the pending channel.
2014-06-19 15:13:32 -03:00
friendica
224a2b9ddf put viewsrc back in a lightbox 2014-06-18 20:33:28 -07:00
friendica
5a0e135679 stylistic improvements to the suggestions page 2014-06-18 18:57:01 -07:00
friendica
80d84206ed now we should be able to remove the function check. Revert if live updates or page loads go weird. I've tested, but it went weird on me last time I tried this a week or so ago so I'm crossing fingers. 2014-06-18 15:53:26 -07:00
friendica
8b66329a8f add photo count to photo album list 2014-06-17 20:45:53 -07:00
jeroenpraat
b7f9a70be7 Update nl / Dark schema: Some minor, but important fixes 2014-06-16 22:55:29 +00:00
marijus
4b1625dd16 animate show/hide comments 2014-06-16 20:51:00 +02:00
jeroenpraat
b18d48b01b update nl 2014-06-16 17:47:06 +00:00
friendica
02825f597f remove overflow property on banner 2014-06-16 01:32:23 -07:00
Paolo T
e2a0778e08 Merge pull request #495 from tuscanhobbit/master
IT: updated strings
2014-06-15 20:53:00 +02:00
tuscanhobbit
c566668d7e IT: updated strings 2014-06-15 20:51:35 +02:00
marijus
0b4e1715de move hide-comments to center and change its appearence a little 2014-06-15 16:00:27 +02:00
friendica
794cded66e Merge https://github.com/friendica/red into pending_merge 2014-06-14 15:13:53 -07:00
friendica
3714bdfc54 Merge branch 'master' of https://github.com/pixelroot/red into pixelroot-master 2014-06-14 15:12:16 -07:00
marijus
b9256eed30 unclutter menues a little 2014-06-14 15:31:36 +02:00
pixelroot
aea19a5b3a modified: view/ru/strings.php 2014-06-14 15:14:07 +02:00
pixelroot
7f4516d747 modified: .htaccess
modified:   view/ru/strings.php
2014-06-14 14:34:17 +02:00
RedMatrix
9ac236d57d Merge pull request #491 from pixelroot/master
modified:   view/ru/messages.po
2014-06-14 21:49:58 +10:00
pixelroot
6a307f0db1 modified: view/ru/messages.po
modified:   view/ru/strings.php
2014-06-14 10:20:57 +02:00
RedMatrix
651f8c3dba Merge pull request #489 from pixelroot/master
modified:   view/ru/messages.po
2014-06-14 17:35:39 +10:00
pixelroot
39418fc35b modified: view/ru/messages.po
modified:   view/ru/strings.php
2014-06-14 09:25:01 +02:00
friendica
b5ea259666 try to force the update mode to fix the "starting up browser, quickly loads page 2 at the beginning" bug 2014-06-13 05:38:00 -07:00
RedMatrix
0c51aae768 Merge pull request #486 from pixelroot/master
modified:   view/ru/messages.po
2014-06-13 09:30:35 +10:00
Alexandre Hannud Abdo
01a0fec2c7 update pt-br translation 2014-06-12 13:02:54 -03:00
pixelroot
0d33b03633 modified: view/ru/messages.po
modified:   view/ru/strings.php
2014-06-12 16:30:58 +02:00
marijus
b05eca295b Merge branch 'master' of https://github.com/friendica/red 2014-06-12 15:23:59 +02:00
marijus
822358adca add hover effect to expand/collaps 2014-06-12 15:23:48 +02:00
jeroenpraat
3e20a0d784 update nl / dark schema: fixed prev/next buttons connections page and directory / same css layout for those buttons 2014-06-11 14:32:57 +00:00
marijus
4a4281448f move expand/collapse to the center 2014-06-11 10:04:51 +02:00
jeroenpraat
de31ba5432 update nl 2014-06-11 07:09:35 +00:00
friendica
13ba9ef003 merge the app menus 2014-06-10 21:21:50 -07:00
friendica
40c03c642e Merge https://github.com/friendica/red into pending_merge 2014-06-10 16:34:52 -07:00
friendica
059ccae278 remote install app (untested) 2014-06-10 16:34:21 -07:00
jeroenpraat
31d19efd1f update nl - there was an odd syntax error in strings.php 2014-06-10 21:39:59 +00:00
jeroenpraat
c5c57b865f Update nl 2014-06-10 21:26:17 +00:00
jeroenpraat
31dce02701 Update nl 2014-06-10 21:23:46 +00:00
jeroenpraat
c802a6cd71 update nl 2014-06-09 18:26:40 +00:00
jeroenpraat
3e04e2313d update nl 2014-06-09 18:24:52 +00:00
jeroenpraat
d919464493 update nl 2014-06-09 18:12:16 +00:00
Paolo T
89c2b99c16 Merge pull request #481 from tuscanhobbit/master
IT: updated strings
2014-06-06 19:38:37 +02:00
tuscanhobbit
dd873ae6dd IT: updated strings 2014-06-06 19:34:24 +02:00
jeroenpraat
359814eee7 Merge branch 'master' of https://github.com/friendica/red 2014-06-05 20:48:03 +00:00
marijus
fed8b6b566 move new comment open/close js functions to core so they can be used by other themes 2014-06-05 17:53:06 +02:00
jeroenpraat
6ccf6455c4 Merge branch 'master' of https://github.com/friendica/red 2014-06-05 14:00:05 +00:00
marijus
48f856e84c we probably want a seperate namespace to not disable all click events in document 2014-06-05 11:21:02 +02:00
marijus
4c9d8fd79d possible fix for 2nd comment collapsing 2014-06-05 11:02:27 +02:00
Alexandre Hannud Abdo
06088a2877 update pt-br translation 2014-06-05 04:13:33 -03:00
jeroenpraat
d9688e5ab3 Merge branch 'master' of https://github.com/friendica/red 2014-06-04 14:00:08 +00:00
friendica
424f23858e add an icon to connect actions 2014-06-03 22:30:05 -07:00
jeroenpraat
5869836180 expand/collapse is also used for comments, so removing 'post'. 2014-06-03 15:42:13 +00:00
jeroenpraat
ad378cbe07 Updated strings for show entire post and show less to expand and collapse. See last few comments from me and Mario at https://redmatrix.nl/channel/jeroenpraat/?f=&mid=5138fdee2ade50a7ef7a5a59e01a7dc91012c125e712d1ce483be6e31543dffe@redmatrix.nl 2014-06-03 12:14:51 +00:00
jeroenpraat
b4e7d7f7c0 Updated to [+] show more, [+] show more comments, etc. See https://redmatrix.nl/channel/jeroenpraat/?f=&mid=5138fdee2ade50a7ef7a5a59e01a7dc91012c125e712d1ce483be6e31543dffe@redmatrix.nl 2014-06-03 05:12:00 +00:00
jeroenpraat
9ea8169240 Update nl before doing something new 2014-06-02 20:17:17 +00:00
jeroenpraat
c452aab0e5 Update nl 2014-06-02 15:18:31 +00:00
jeroenpraat
004b8ec311 Update nl 2014-06-02 15:08:31 +00:00
friendica
17e575e1eb don't show app editing options to non-authenticated folks 2014-06-01 22:15:21 -07:00
jeroenpraat
894b8e4b15 idem 2014-06-01 21:25:59 +00:00
jeroenpraat
2632ac80bb Minor adjustment to Dutch translation 2014-06-01 21:16:46 +00:00
jeroenpraat
db4321f8ea New language: Dutch! Nederlands! (messages.po: 69% translated) 2014-06-01 21:10:02 +00:00
Paolo T
f650fb6268 Merge pull request #475 from tuscanhobbit/master
IT: updated strings
2014-05-30 11:45:05 +02:00
Paolo Tacconi
f753a14997 IT: updated strings 2014-05-30 11:43:29 +02:00
friendica
832cbbec15 testing new event code 2014-05-29 21:25:19 -07:00
friendica
22ed5b1d03 newevent: front end functions 2014-05-29 20:09:21 -07:00
friendica
dabf82bbb7 Merge https://github.com/friendica/red into pending_merge 2014-05-27 16:50:53 -07:00
friendica
b17f923abb give the cloud file list a bit of padding 2014-05-27 16:49:47 -07:00
marijus
c0e1139a46 some fixes and cleanup 2014-05-27 16:44:18 +02:00
marijus
c61da303dd fix one more bootstrap override regression - addendum 2014-05-26 22:40:33 +02:00
marijus
83ffad4b9d fix one more bootstrap override regression 2014-05-26 22:34:43 +02:00
23n
88bedec56c divide autodate from item.app 2014-05-26 18:50:54 +02:00
marijus
f6ee43c883 Collapsed textareas are like buttons. They should not grow/shrink in size if app font-size changes. 2014-05-26 11:32:58 +02:00
friendica
810515f1a1 auto-highlight app embed code on click 2014-05-25 22:42:07 -07:00
friendica
f7d99ed7ff fix the intermittent theme preview 2014-05-25 18:24:27 -07:00
marijus
2bdecdce17 for some reason this is also needed to make it work reliable in webkit browsers 2014-05-24 19:16:11 +02:00
marijus
5b0db721f8 should be redbasic not red 2014-05-24 18:00:44 +02:00
marijus
bf88720fae possible fix for empty commentbox colapsing on tool-button click 2014-05-24 17:50:09 +02:00
friendica
da523fcfac app basic style 2014-05-24 03:28:25 -07:00
friendica
059b6cd411 add randprof app and do away with the universally hated chanview-iframe mode. It's gone. Please do not try and bring it back. We are not Diaspora and we have no desire to be like them. ("And they're all made out of ticky-tacky and they all look just the same"). Our profiles do not have to look the same and they won't anyway. We don't have to sugar coat the fact that some of the content in the matrix doesn't look like the rest of the content in the matrix. 2014-05-23 15:30:22 -07:00
Alexandre Hannud Abdo
dca11210bd update pt-br translation 2014-05-23 07:56:19 -03:00
friendica
345f784f67 fix search to use in app 2014-05-22 21:24:41 -07:00
Paolo T
8e2771cbd4 Merge pull request #469 from tuscanhobbit/master
IT: strings fixed
2014-05-22 14:22:19 +02:00
Paolo Tacconi
b7390f8849 IT: strings fixed 2014-05-22 14:20:24 +02:00
Paolo T
031d73ea20 Merge pull request #468 from tuscanhobbit/master
IT: updated strings
2014-05-22 14:03:17 +02:00
Paolo Tacconi
bc31e89eb0 IT: updated strings 2014-05-22 14:00:10 +02:00
friendica
751fda9704 more app work 2014-05-21 20:54:09 -07:00
friendica
d17768d4e7 change app dropdown to point to apps module (changes nav template). Important: Plugins using the app-menu hook will no longer be accessible from there and may require re-writing to plug into the system apps page. Also filter apps in items from the language detector to avoid false triggers from the base64 content. 2014-05-21 17:23:34 -07:00
RedMatrix
3e75f9cbb1 Merge pull request #464 from solstag/master
Bunch of translation work
2014-05-21 19:24:24 +10:00
friendica
77ca117218 make it possible to edit/delete apps via /apps/personal/edit 2014-05-21 01:55:32 -07:00
Alexandre Hannud Abdo
ac8400ac0c Update pt-br translation. 2014-05-21 05:03:21 -03:00
friendica
5d9f924642 more app work 2014-05-20 22:25:36 -07:00
friendica
cad481d94f unfinished work for creating app 2014-05-20 21:22:19 -07:00
friendica
fc0967b84b most of the remaining apps basic infrastructure except a form to create the things. Don't let this fool you - there is still a lot of work, but there isn't a whole lot of work to create a demo; in fact you can demo it now. 2014-05-20 18:08:49 -07:00
marijus
1aa7f3136f the js seems to interfere with something else... comment out for now... 2014-05-20 19:16:05 +02:00
marijus
c530a7a936 some work on comment_item.tpl 2014-05-20 17:33:06 +02:00
friendica
6d01707a72 more app backend work 2014-05-19 16:49:11 -07:00
marijus
89b8bc07ac implement modal for more then 10 likes/dislikes 2014-05-18 09:14:21 +02:00
jeroenpraat
eab440d321 Dark schema: Minor minor edit 2014-05-17 18:57:56 +00:00
Paolo T
8562143034 Merge pull request #462 from tuscanhobbit/master
IT: strings updated
2014-05-17 11:27:42 +02:00
tuscanhobbit
2d91268b5d IT: strings updated 2014-05-17 11:25:39 +02:00
friendica
659714956c add hover tips - except we need a way to translate the things 2014-05-15 20:58:26 -07:00
friendica
2fdc13e91d some sidebar content (doesn't yet do anything) 2014-05-15 20:20:20 -07:00
friendica
2450caa161 add the theme file 2014-05-15 19:58:23 -07:00
friendica
077b97eac4 the app menu takes form 2014-05-15 19:54:37 -07:00
friendica
8b233723c5 clear the jot-nets float 2014-05-14 20:49:33 -07:00
friendica
7a78da7982 major cleanup of choklet+bannertwo 2014-05-14 18:12:18 -07:00
friendica
7c4503968d Merge branch 'navbacker' 2014-05-14 18:07:43 -07:00
friendica
0bfd08b547 fix fluid layout for choklet_bannertwo 2014-05-14 18:07:01 -07:00
friendica
b31aa49a43 this doesn't really work 2014-05-14 16:33:48 -07:00
marijus
ce25601ed0 whitespace 2014-05-14 17:24:01 +02:00
marijus
9bfcc0c5e2 colorpicker: enable rgba for for item and comment colors 2014-05-14 17:16:55 +02:00
friendica
2f1e4a6370 xss prevention 2014-05-14 00:55:32 -07:00
friendica
de550d45ff more choklet work 2014-05-13 22:39:58 -07:00
friendica
ca7888b7ce choklet tweaks 2014-05-13 22:35:33 -07:00
friendica
a4869394f4 allow jgrowl 'close all' message to be translated 2014-05-13 17:59:47 -07:00
friendica
e664d6486a fix ca anomaly 2014-05-13 02:21:01 -07:00
friendica
71ded9388b missing paren 2014-05-13 02:17:17 -07:00
friendica
8c948f4bbe forbid redefinition of language plural_select function 2014-05-13 02:10:06 -07:00
marijus
0bf68af0a7 make comment_indent an option and removeitem_opacity as it is not working properly at the current state - we have got item background opacity now (allthough not yet for custom colors because the colorpicker does not work with rgba colors). Reset left comment border width to 3px as it is barely visible otherwise. 2014-05-12 20:33:14 +02:00
marijus
0446db8104 fix bootstrap override position issue with dropdown menu 2014-05-12 16:57:13 +02:00
RedMatrix
d1841911b3 Merge pull request #458 from pixelroot/master
modified:   view/ru/messages.po
2014-05-12 18:27:05 +10:00
pixelroot
5830e85912 modified: view/ru/messages.po
modified:   view/ru/strings.php
2014-05-12 09:57:48 +02:00
friendica
045d23a27c Merge https://github.com/friendica/red into pending_merge 2014-05-11 17:38:22 -07:00
friendica
b5372f8152 button styling mitemlist 2014-05-11 17:37:54 -07:00
RedMatrix
c455663509 Merge pull request #456 from cvogeley/master
Move "boxy" conversation design into a schema file
2014-05-12 09:43:58 +10:00
Christian Vogeley
3fbac93619 grrr 2014-05-11 13:23:38 +02:00
Christian Vogeley
889aaad668 For the moment last change 2014-05-11 13:16:01 +02:00
Christian Vogeley
2d69a81c00 saved 2 2014-05-11 04:22:52 +02:00
Christian Vogeley
f9ad959f17 saved 2014-05-11 04:13:54 +02:00
Christian Vogeley
7da462ada1 some corrections and cleanup 2014-05-11 03:16:39 +02:00
Christian Vogeley
5f1f82df5d Move "boxy" conversation design into a schema file
Default design is now again basically the previous one
2014-05-11 02:22:27 +02:00
Christian Vogeley
e2b96df27b another experiment 2014-05-10 23:43:37 +02:00
root
d1e0479f58 Removed some unnecessary changes. 2014-05-10 11:35:16 -07:00
root
ed5cebd3d6 Made code changes to serve higher resolution images in displays with high pixel density. 2014-05-10 11:15:27 -07:00
root
80796c78f5 Merge branch 'master' of https://github.com/chriswinstead/red 2014-05-10 10:55:50 -07:00
friendica
b854e58a7b issue #452 2014-05-09 15:24:54 -07:00
friendica
7302a3690e Merge https://github.com/friendica/red into pending_merge 2014-05-09 01:53:41 -07:00
friendica
6d56c9b603 better button theming on oauth connected apps page 2014-05-09 01:53:03 -07:00
Paolo Tacconi
dd6c09d096 IT: strings updated 2014-05-09 10:10:19 +02:00
marijus
56eb9e75cc Merge branch 'master' of https://github.com/friendica/red 2014-05-09 07:39:27 +02:00
friendica
831b18cf28 move the event "unknown finish time" checkbox up so it actually precedes entering the finish time.
TODO: we should probably disable the finish time selector with jquery if this is checked.
2014-05-08 21:22:07 -07:00