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

3824 commits

Author SHA1 Message Date
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
friendica
22b79207f9 event form hard-wired tinymce=on, made selectable 2014-05-08 19:59:26 -07:00
cvogeley
b9320c9fac Merge pull request #449 from cvogeley/master 
another one
 2014-05-08 23:48:15 +02:00
Christian Vogeley
a8cc1770b1 another one 2014-05-08 23:45:54 +02:00
cvogeley
afa9a62fa0 Merge pull request #448 from cvogeley/master 
Small adjustment
 2014-05-08 23:36:20 +02:00
Christian Vogeley
4b9c80aca9 Small adjustment 2014-05-08 23:33:04 +02:00
RedMatrix
cd8095211f Merge pull request #447 from cvogeley/master 
Trying to make the conversation better readable
 2014-05-09 06:56:08 +10:00
Christian Vogeley
167e397706 Trying to make the conversation better readable 
by adding borders and adding more space between the threads. If you
don’t like it feel free to revert it.
 2014-05-08 22:41:13 +02:00
Paolo T
b28b949e8f Merge pull request #446 from tuscanhobbit/master 
IT: strings updated
 2014-05-08 14:22:19 +02:00
Paolo Tacconi
2d17eeebcb IT: strings updated 2014-05-08 14:20:51 +02:00
marijus
6e397240a3 add some more bs fu 2014-05-08 13:53:27 +02:00
marijus
8144498803 like indicator rewrite 2014-05-08 13:44:43 +02:00
root
711719ce0c Made some changes to img tags to enforce max-width everywhere, and to the page headers to allow user scaling. 2014-05-07 12:01:12 -07:00
friendica
94b2ac6abb put permissions dialog inside the form element - should fix issue #444 2014-05-05 16:03:38 -07:00
marijus
9df61273db fix some issues with nav-tabs overrides and make their background transparent 2014-05-05 21:58:58 +02:00
jeroenpraat
e0b0c58851 Height auto or mini-height 120px. The latter. 2014-05-05 13:59:39 +00:00
jeroenpraat
d93df86298 Fixed some wrapping problems when the user has set a larger font size. And some UI love for the file permissions page (as requested by Mike ;) and changed the position of the file properties link on the cloud page. 2014-05-05 13:54:56 +00:00
friendica
806f1f0fa1 UI for deleting chatrooms 2014-05-04 20:30:52 -07:00
RedMatrix
fc5ae78079 Merge pull request #442 from cvogeley/master 
system notifications mark seen link
 2014-05-05 06:43:56 +10:00
Christian Vogeley
f7c77c7821 Add link to system notifications page 
to mark notifications seen
 2014-05-04 18:17:11 +02:00
Christian Vogeley
b2e0b6f11d system notifications mark seen link 2014-05-04 17:28:43 +02:00
jeroenpraat
98a942bd95 Dark schema: Quick fix for new search dropdown 2014-05-04 14:26:20 +00:00
Alexandre Hannud Abdo
6141b35d03 Update pt-br translation. 2014-05-03 20:13:56 -03:00
jeroenpraat
d7b9d1dd59 Share area (jot) the same max-width as the conversation area. Please revert when unwanted 2014-05-03 19:59:12 +00:00
jeroenpraat
c338281ca8 Dark schema: I forgot the dropdown menu. 2014-05-03 18:28:47 +00:00
marijus
4975d5f7c1 fix search_item.tpl 2014-05-03 18:42:02 +02:00
jeroenpraat
f9d2a5f621 Dark schema: last bits. From now on, only updates. 2014-05-02 17:59:02 +00:00
jeroenpraat
3612cdac1a Dark schema: comment border fix 2014-05-02 15:23:40 +00:00
friendica
6eedb2e972 and enable the colourpicker 2014-05-01 22:05:04 -07:00
friendica
fa68da7872 missed the template 2014-05-01 21:59:08 -07:00
friendica
07a9aaaa1f make the comment border colour configurable 2014-05-01 21:50:09 -07:00
friendica
56125f8c46 shift login box on small screens 2014-05-01 20:14:51 -07:00
friendica
a8322ba1f6 Merge https://github.com/friendica/red into pending_merge 2014-05-01 17:56:03 -07:00
friendica
b9ae19c540 Merge https://github.com/friendica/red into pending_merge 2014-05-01 17:55:01 -07:00
friendica
b666aca5c3 bring the posted-date selector widget up to date. There are no longer two different styles. 2014-05-01 17:54:12 -07:00
Olaf Conradi
cfad83084a Also for notifications. 2014-05-02 02:40:04 +02:00
Olaf Conradi
32a34f76df Fix unwanted GET {0} requests 
Because of image prefetch of browsers the <img src="{0}"> templates cause
unwanted /{0} requests to the webserver. Templates are changed to use a
data-src attribute.
 2014-05-02 02:32:52 +02:00
jeroenpraat
4c9f5031eb Dark schema: there are some minor issues left, but this one should go first 2014-05-01 21:48:21 +00:00
jeroenpraat
efa943dddc A little bit less dark 2014-05-01 21:28:00 +00:00
jeroenpraat
abd69c4bf2 Update for the Dark schema because of revision/redesign of conv_item.tpl 2014-05-01 21:21:35 +00:00
marijus
40d8858e5a typo 2014-05-01 13:18:12 +02:00
marijus
5bddec983d revision/redesign of conv_item.tpl - addendum 2014-05-01 13:13:28 +02:00
marijus
daf497cf46 revision/redesign of conv_item.tpl 2014-05-01 12:51:34 +02:00
friendica
14402bdf98 missing permissions block in mod_filestorage 2014-04-30 16:35:50 -07:00
friendica
31fd284b3c clean up the webpage list a bit 2014-04-29 18:28:05 -07:00
friendica
3dc3a9441b work tree cleanup - found these which hadn't been committed. 2014-04-26 19:37:54 -07:00
marijus
ab36e7c2b7 quickfix for #write-pages behind navbar 2014-04-24 11:45:09 +02:00
RedMatrix
e400c633f7 Merge pull request #429 from solstag/master 
update pt-br translation
 2014-04-24 18:32:08 +10:00
cvogeley
8cf4abe77f Merge pull request #430 from cvogeley/master 
A CSS cheat to make the item-tools usable again
 2014-04-23 17:18:22 +02:00
Christian Vogeley
bcc936f707 A bit less z-index 2014-04-23 17:08:59 +02:00
Christian Vogeley
459d22691c A CSS cheat to make the item-tools usable again 
when opacity is set.
 2014-04-23 16:46:50 +02:00
Alexandre Hannud Abdo
75603129fb update pt-br translation 2014-04-23 04:32:26 -03:00
Paolo T
af4b23fce4 Merge pull request #425 from tuscanhobbit/master 
IT: strings updated
 2014-04-22 09:04:26 +02:00
Paolo Tacconi
e9d73d3c04 IT: strings updated 2014-04-22 09:01:26 +02:00
friendica
8b3ccc65df nb-no update 2014-04-21 23:57:34 -07:00
friendica
dfbd654d0e Merge https://github.com/friendica/red into pending_merge 2014-04-21 15:42:16 -07:00
friendica
aafbd11a37 Setting to undo/clear auto permissions 2014-04-21 15:41:04 -07:00
Christian Vogeley
3a773c5253 Alignment of icons in .item-tool 2014-04-21 12:24:31 +02:00
friendica
1f93dc054a bring back the toolicon colour 2014-04-20 20:01:23 -07:00
friendica
d0dab3fcae fix vcard truncation and escaping 2014-04-20 18:48:21 -07:00
friendica
7e52d8554b bug fix on wall-item-dislike position 2014-04-20 16:03:19 -07:00
Christian Vogeley
1c57109977 Position fix in comments 2014-04-20 21:55:39 +02:00
friendica
167bf252c0 the comment input box is still a couple pixels off but this aligns the conversation a bit better on narrow screens. 2014-04-19 21:22:45 -07:00
friendica
4bc3385e5e another minor position tweak 2014-04-19 21:12:42 -07:00
friendica
df31f04adc minor alignment issues after the wall-item-tools button conversion 2014-04-19 21:07:30 -07:00
RedMatrix
4b17f74300 Merge pull request #416 from cvogeley/master 
Bootstrapify item tools …
 2014-04-20 12:00:23 +10:00
Christian Vogeley
886d9018b7 css 2014-04-20 03:43:01 +02:00
Christian Vogeley
3b2840a2fe ok we need that div 2014-04-20 02:53:04 +02:00
Christian Vogeley
2ecf3f3395 Add descriptions to drop down 2014-04-20 02:06:24 +02:00
Thomas Willingham
891a7fb0f5 Merge pull request #417 from f03el/master 
Update Swedish translation
 2014-04-19 15:45:42 +01:00
Thomas Willingham
33ff5b3a9b Clean up legacy smarty3 2014-04-19 13:59:12 +01:00
jeroenpraat
9da7da1cbd Oeps 2014-04-19 12:11:58 +00:00
Erik Lundin
b8547039a8 Update Swedish strings 2014-04-19 14:04:03 +02:00
Christian Vogeley
4c950dc38a More work 2014-04-19 04:13:15 +02:00
Christian Vogeley
ea5d3e1774 For the moment restore old delete icon 
because the integrated button in the the bootstrap menu didn’t work on
Firefox
 2014-04-19 03:49:17 +02:00
jeroenpraat
2a336dbf7f Workaround alignment notify menu's 2014-04-19 01:33:30 +00:00
Christian Vogeley
b9ffc2ef44 Move javascript calls to button tag 
because otherwise it didn’t work in Firefox
 2014-04-19 03:16:26 +02:00
Christian Vogeley
8f1dde701a Bootstrapify item tools 
Only show the like buttons and the delete button permanently hide
everything else in a drop down. This will break non bootstrap themes.
So may be we also want to move this into the red basic folder. It still
a little bit work in progress. Allignment is not 100% correct. May be
we want to add text into the drop down.
 2014-04-19 02:45:44 +02:00
friendica
9e865d1e47 remove whitespace at the top of widgets because bootstrap gives us 20 pixels above an h3 element and we end up with way too much whitespace 2014-04-18 17:39:13 -07:00
friendica
b886647429 Merge https://github.com/friendica/red into pending_merge 2014-04-18 16:14:13 -07:00
friendica
ae1f9bf1c4 move create a new collection below the actual collection list again. failed experiment. 2014-04-18 15:31:15 -07:00
Erik Lundin
b7992a5544 Update Swedish email templates 2014-04-19 00:05:13 +02:00
Thomas Willingham
fdcb6052fc Merge branch 'master' of https://github.com/friendica/red 2014-04-18 16:35:31 +01:00
Thomas Willingham
4e0b85267a We know why third party zids didn't work now, so don't use hacky 
workarounds anymore.
 2014-04-18 16:34:48 +01:00
jeroenpraat
2ac7fb49b6 This should fix the preview allignment permantly. 2014-04-18 15:08:16 +00:00
jeroenpraat
59eb3b3351 Little fix and previous fix on a different place 2014-04-18 12:57:42 +00:00
Erik Lundin
e2379f2359 Add Swedish .po file and update strings 2014-04-18 00:17:38 +02:00
jeroenpraat
c463eb932c tiny fix hover preview button 2014-04-17 20:46:14 +00:00
jeroenpraat
ca5f7ef446 Last 3 dropdown menus fixed for dark schema. Dark schema completed (by now). 2014-04-17 15:18:53 +00:00
friendica
083cf12d48 Merge https://github.com/friendica/red into pending_merge 2014-04-17 01:36:17 -07:00
friendica
8dcf9e78e1 This preserves the alignment work done earlier but provides a more aesthetically pleasing page. 2014-04-17 01:33:44 -07:00
jeroenpraat
0d0751b925 Merge branch 'master' of https://github.com/friendica/red 2014-04-17 05:46:45 +00:00
friendica
962665b8b5 saved search adjustments 2014-04-16 21:46:06 -07:00
friendica
be498be840 a few more alignment issues 2014-04-16 21:08:43 -07:00
friendica
f191637ffa clean up the group selector on the connedit page 2014-04-16 20:33:15 -07:00
friendica
9be4cd4dcd Lots of positional changes on sidebar menus - reduce indented margins 
Merge branch 'master' into ruler

Conflicts:
	view/css/widgets.css
 2014-04-16 20:28:23 -07:00
friendica
acc70b9deb fixing widgets 2014-04-16 20:09:19 -07:00
friendica
d26a433a5e Merge https://github.com/friendica/red into pending_merge 2014-04-16 18:36:26 -07:00
friendica
c7712d3b45 bug fixes after widget cleanup 2014-04-16 18:35:37 -07:00
friendica
558e283260 button cleanup directory page 2014-04-16 18:28:36 -07:00
friendica
433d964dd5 this makes conversations look a lot better 2014-04-16 18:07:33 -07:00
friendica
1b0bf90d13 first cut - straighten out the margins 2014-04-16 16:41:44 -07:00
jeroenpraat
68545ceeb6 Dark schema: fixed code view, ACL window and preview 2014-04-16 21:51:13 +00:00
RedMatrix
077296ccf1 Merge pull request #414 from jeroenpraat/patch-2 
Large update dark schema
 2014-04-16 17:39:51 +10:00
friendica
925c63343e The comment submit button seems to have drifted into some strange place 2014-04-15 21:36:51 -07:00
jeroenpraat
16db393495 Needed for large update dark schema and minor fixes default. 2014-04-15 21:35:30 +02:00
jeroenpraat
74ec0530f6 Needed for large update dark schema. 2014-04-15 21:33:26 +02:00
jeroenpraat
bef2d26484 Large update dark schema 
The new ACL and some minor things still needs to be done. Style.css and style.php will follow.
 2014-04-15 21:29:03 +02:00
marijus
efe80bb8e9 minor css fix 2014-04-15 20:48:15 +02:00
marijus
02c08d0cda fixes rconnect button for bs-default scheme 2014-04-14 21:47:00 +02:00
marijus
d371ad3da7 a small fix for bs-default scheme 2014-04-14 21:10:48 +02:00
friendica
bf8f5d5b2b directory: make "connect" more prominent, but this ultimately needs more theme work. 2014-04-14 02:37:04 -07:00
friendica
08435e5b1a minor alignment issues 2014-04-13 16:07:47 -07:00
friendica
aa5054d5ba this is looking better, call the forum version of a tag "foobar network", besides altering the icon 2014-04-12 00:41:36 -07:00
friendica
2212ddb913 use icons for identification 2014-04-11 23:54:11 -07:00
RedMatrix
df7c2afc68 Merge pull request #405 from beardy-unixer/master 
A few little fixes
 2014-04-12 07:20:44 +10:00
Thomas Willingham
2fdcd0c27e Never set background or color unless you set both. If this is needed 
in future, it should probably be reimplmented with the class anyway.
 2014-04-11 20:02:52 +01:00
marijus
3197ccbf5e bootstrapify aclselector 2014-04-11 16:06:39 +02:00
Paolo T
93a56db391 Merge pull request #403 from tuscanhobbit/master 
IT: strings updated
 2014-04-11 14:23:52 +02:00
Paolo Tacconi
a36d1d5e92 IT: strings updated 2014-04-11 14:22:27 +02:00
friendica
a798dd767d push notes widget updates to channel clones on focusout (final save). Don't do this for the auto-save events (every ten seconds) which could generate superfluous network traffic. 2014-04-10 18:46:22 -07:00
friendica
c97222c2fc improve the appearance of the ACL selector in a hackish way on the short term - 
it really needs to be re-worked for bootstrap but in any event the words "show" and "don't show" make a mess of it. We should probably just use icons (with a bit of padding) that people can select with a touchscreen and reformat the box accordingly.
 2014-04-09 21:49:38 -07:00
friendica
8d8d739242 Merge https://github.com/friendica/red into pending_merge 2014-04-09 21:13:40 -07:00
friendica
795d741713 issue #400 - lock not showing up for previews of private mentions (or 'new/search' item view) 
also reformat the new/search template to pick up recent changes to conv_item.tpl
 2014-04-09 21:11:49 -07:00
RedMatrix
5d5ff22b1d Merge pull request #399 from git-marijus/master 
change the way jot tools are displayed/hidden
 2014-04-10 13:54:34 +10:00
sasiflo
9cb48204eb Correction for #401: Theme redbasic extended. 
Use max-width instead of width to allow mobile devices to reflow the content.
 2014-04-10 00:22:52 +02:00
sasiflo
036d907a4b Extended theme redbasic: Allow to center the content (aside + converse) 
Added an option to settings of redbasic theme. You are now able to
activate centering the left aside and the conversion regions in the
middle of the screen. This respects configuration of conversion region
width and works without special actions for mobile devices.

TODO: Find a way to handle conversion width given in percent.
 2014-04-09 23:13:25 +02:00
marijus
b88a7fc23a use $showacl to show/hide acl in jot.tpl - remove $pvisit and repair editblock and editlayout which still depended on it. 2014-04-09 18:29:22 +02:00
marijus
74bd772a5b replace lock icon with icon-{lock, unlock} 2014-04-09 17:10:07 +02:00
marijus
c4233232b7 Merge branch 'master' of https://github.com/friendica/red 2014-04-09 10:08:12 +02:00
friendica
c7080edb16 strip affinity tool labels on ultra-small screens; otherwise they just smush together 2014-04-08 21:19:55 -07:00
marijus
b52ccaa9e1 whitespace cleanup 2014-04-08 22:37:58 +02:00
marijus
9f621dac85 change the way jot tools are displayed/hidden 2014-04-08 22:07:06 +02:00
friendica
28228f5862 pass the original element title through the element stack so that it we don't lose it in the ajaxuploader. 2014-04-07 17:34:53 -07:00
friendica
03753f463e convert /network saved search to bootstrap buttons 2014-04-07 16:25:35 -07:00
friendica
7d429b2894 subdue archived connections in mod/connections 2014-04-06 22:21:51 -07:00
friendica
68296bb857 better alignment of channels with long names on mod/connections 2014-04-06 21:52:47 -07:00
friendica
75b6aa235e more work on #395 2014-04-06 21:40:23 -07:00
marijus
f7cb4e0ef0 jot and location style fixes 2014-04-06 21:14:24 +02:00
sasiflo
9f54a8f96b Hope I have repaired the channel admin page. 
Channel blocking and deleting was copied from user actions. This was not
done to an end. Hope what I do is enough to enable channel blocking and
deleting the correct way.

On deletion all entities that belong to the channel are deleted. But the
channel itself is just marked as deleted. Do not really understand why
it is done this way.
 2014-04-06 00:34:52 +02:00
friendica
4901ef8faf provide the ability for rpost to post as another of your channels. This does not yet work, so the functionality has not been enabled. 2014-04-05 02:32:07 -07:00
marijus
3f1a78fa69 some work on jot, remove some deprecated js and some random style fixes 2014-04-03 17:03:32 +02:00
jeroenpraat
39a02d29eb No empty strings 2014-04-03 13:37:41 +02:00
jeroenpraat
a65bf5beee Update and fix dark scheme 
Updated the dark scheme as far as possible. Some items do not have a string, so they can't be themed. A dark derived theme would probably better.
 2014-04-03 13:32:39 +02:00
friendica
69513441f5 removed default maximagesize - it can be set in the admin pages. 2014-04-02 15:36:18 -07:00
friendica
0a097b8337 snakebite: bring back some of the legacy XML discovery interfaces, update as required. 2014-04-02 14:56:20 -07:00
Alexandre Hannud Abdo
39e5370db8 update pt-br translation 2014-04-01 23:13:46 -03:00
friendica
6ba32d714d save notes every ten seconds while focused, then save them once more on focusout 2014-04-01 14:52:47 -07:00
friendica
3791cee52b Merge https://github.com/friendica/red into pending_merge 2014-03-30 17:41:53 -07:00
friendica
ac91331c18 notes widget: jquery.live is deprecated, replacing with jquery.on and binding to focusout, as the input and paste callbacks are a bit wasteful - they are presumably called on every character typed, yet some of these events have gone missing (probably due to having a lot of network calls in quick succession) so hopefully a single save of the workspace on focusout should be more reliable. 2014-03-30 17:37:12 -07:00
Thomas Willingham
1093e8d83e Default discover to on. 2014-03-30 22:59:37 +01:00
Alexandre Hannud Abdo
fedd19ec95 Let the site admin choose whether to display the Discover tab. 2014-03-30 00:03:12 -03:00
friendica
7ed177c7cd check that aside actually exists before querying the html length 2014-03-29 00:04:06 -07:00
marijus
c1435fdfda more css fixes 2014-03-27 20:19:30 +01:00
marijus
3a190ddd2b css fixes 2014-03-27 19:56:22 +01:00
friendica
5a3903a40c firehose testing (network?f=&fh=1) - some possible security bugs so testing purposes only 2014-03-26 22:05:19 -07:00
friendica
9a3a2819c1 add admin/channels 2014-03-26 17:05:45 -07:00
friendica
bd7be38da5 improve scannability of content with per-item bottom border, but lighten the per-item borders considerably so it isn't in your face. This is an experiment based on sound principles, but I'm not a UI expert. If this uglifies it too much - please revert. 2014-03-25 21:13:04 -07:00
friendica
7375e30506 This should be a slight improvement in setting ciphers - we'll punt on RedHat but open up the list just for openssl distros which seem to have all the problems at the moment. 2014-03-25 15:19:18 -07:00
RedMatrix
0e10f81d44 Merge pull request #379 from cvogeley/master 
Well, if you want to add a color picker it is indeed a good idea
 2014-03-26 06:37:47 +11:00
Christian Vogeley
51ee3964c0 Well, if you want to add a color picker it is indeed a good idea 
to include the color picker.
 2014-03-25 19:36:44 +01:00
marijus
89b573a6f3 fix lock permissions view and autoload not kicking in on touch devices under certain conditions 2014-03-25 15:27:45 +01:00
friendica
e6ea4a7574 ssl ciphers - be liberal in what we accept, conservative in what we generate 2014-03-24 17:16:01 -07:00
friendica
34eb79e6ba provide 'style' option to archive widget to choose between 'select' and 'list' format 2014-03-23 16:20:44 -07:00
Christian Vogeley
c972a94b01 Add color picker to theme settings 2014-03-23 21:35:20 +01:00
friendica
ff0a07655d Merge pull request #375 from cvogeley/master 
Narrow navbar:Switch to bs default on small screens
 2014-03-23 08:43:19 +11:00
Christian Vogeley
b533e67d52 Narrow navbar:Switch to bs default on small screens 2014-03-22 22:34:11 +01:00
marijus
13916566f0 use border-box for everything 2014-03-22 21:10:26 +01:00
marijus
c968a18db3 re-enable nav opacity and minor style.css cleanup 2014-03-21 17:37:23 +01:00
friendica
2dda5d6c70 add expire setting, take out unknown mailers and max friend requests per day which aren't implemented 2014-03-19 20:40:35 -07:00
git-marijus
afca10a071 lesson learned.... dont fix anything on a mobile device 2014-03-19 14:03:40 +01:00
git-marijus
804d8bd73b this shouldnt be there 2014-03-19 13:56:38 +01:00
marijus
20d47c4478 bootstrapify common tabs and make show aside/tabs buttons only appear if there is something to show 2014-03-19 09:43:23 +01:00
friendica
254885c5ee Merge https://github.com/friendica/red into zpull 2014-03-13 15:37:29 -07:00
friendica
a8ea919765 remove allowed friend domains and allowed email domains from admin settings - as they are not implemented 2014-03-13 15:36:35 -07:00
marijus
a8de28cc16 Merge branch 'master' of https://github.com/friendica/red 2014-03-13 19:50:28 +01:00
marijus
b32f8f0ba7 move region_1 to off instead of removing it and dont squelch region_2 when region_1 moves in again 2014-03-13 19:50:22 +01:00
friendica
40b54410b3 Merge https://github.com/friendica/red into zpull 2014-03-12 16:22:50 -07:00
friendica
b30ddfaaf9 fix colors on input elements which bootstrap set to "inherit" and doesn't play nicely with dark themes. 2014-03-12 16:21:20 -07:00
Thomas Willingham
031b888e2c Stick help in a template 2014-03-12 17:13:58 +00:00
friendica
3f337dad2c file had wrong extension 2014-03-11 21:45:20 -07:00
friendica
d7dcf463ed update acl internal list whenever there is a change - the submit handler seems to be unreliable or is getting into a race condition. 2014-03-11 20:17:14 -07:00
friendica
c903ff7aab get rid of fancybox for photos upload, not just photo edit 2014-03-11 17:09:02 -07:00
friendica
7733be7b58 norwegian strings update 2014-03-11 15:53:06 -07:00
friendica
25901a7bc4 revert recent changes to cmtBbClose which removed the ability to insert quotes into an empty comment box 2014-03-11 15:43:51 -07:00
friendica
403a0fa158 nb-no language update 2014-03-10 18:14:33 -07:00
marijus
f78c4f485c 10px is probably to close 2014-03-10 19:25:38 +01:00
marijus
313240488a fix lock position 2014-03-10 18:08:44 +01:00
marijus
3f20debf5e fixes locations with a link 2014-03-10 17:47:53 +01:00
marijus
34fd387438 this commit is an attempt to make conv items better scalable on smaller screens. also save some horizontal space. 2014-03-10 17:17:49 +01:00
friendica
a79072ce47 update cacert.pem , don't hide url link for rmagic 2014-03-09 13:53:55 -07:00
friendica
80e381176e collapse the advanced directory search so that folks who think they're advanced but really aren't don't whinge about it. 2014-03-08 19:04:07 -08:00
friendica
bef416a2d1 advanced search front-end 2014-03-08 17:39:20 -08:00
marijus
56c84ba267 style fixes 2014-03-08 11:24:53 +01:00
friendica
d83ebcdab5 showwarning when manually changing also 2014-03-07 22:00:23 -08:00
friendica
5ec38459dc notify when permissions change and haven't been saved. 2014-03-07 21:55:52 -08:00
friendica
ab0eab49e8 start new connections out with even more sane defaults than before by pre-filling the connedit form page. This still lets them change things before any damage has been done or before any privacy has leaked, but should reduce the number of new connections that can't comment. 2014-03-07 20:28:04 -08:00
friendica
3b0b59dfad When approving a connection automatically select Full Sharing. 2014-03-07 20:15:54 -08:00
marijus
ce136a1e3b fix of fix 2014-03-07 21:17:29 +01:00
marijus
8b315ac22f fix 2014-03-07 21:14:17 +01:00
marijus
f85346673f thats better 2014-03-07 20:12:23 +01:00
marijus
55d66cc2fb probably should indicate the appearence of aside visualy somehow 2014-03-07 19:58:20 +01:00
marijus
21db60c991 might be needed by not local users aswell 2014-03-07 13:46:45 +01:00
marijus
e8da840eec remove aside on navbar collapse and add button to toggle visibility 2014-03-07 13:36:49 +01:00
friendica
42f184b87c Merge https://github.com/friendica/red into zpull 2014-03-05 14:18:28 -08:00
friendica
40746eae57 add new template 2014-03-05 14:18:06 -08:00
marijus
b1c29e9126 improve navbar collapsed state a little 2014-03-05 20:23:13 +01:00
friendica
61f47cd5ed move language selector to a module 2014-03-05 03:19:20 -08:00
friendica
cdcbc5816e add Comanche help link to pdledit 2014-03-04 21:03:56 -08:00
friendica
efc828bed5 add pdl editor to settings/display 2014-03-04 20:58:12 -08:00
friendica
aa9d25f517 add system PDL editor (lets you change/personalise the layout for any module which has a system PDL file.) 2014-03-04 18:12:27 -08:00
Paolo T
5b33d98f08 Merge pull request #354 from tuscanhobbit/master 
IT: strings updated
 2014-03-04 12:56:52 +01:00
Paolo Tacconi
4fd0d14898 IT: strings updated 2014-03-04 12:54:17 +01:00
friendica
f2c8559170 minor template and doc fixes 2014-03-04 03:27:53 -08:00
friendica
cdd2e9cd95 layout export to file 2014-03-03 20:05:23 -08:00
friendica
5c08713ee5 remove test menu 2014-03-03 15:22:54 -08:00
friendica
d16324685a implement horizontal menu class in redbasic 2014-03-03 15:21:43 -08:00
friendica
a36014f011 Merge https://github.com/friendica/red into zpull 2014-03-03 14:39:42 -08:00
friendica
81c439bc7d revert the temporary fix for the missing hdr.tpl and add the ability to provide context sensitive help/documentation by passing the current URL path to the help module as $_REQUEST['cmd']. So we could create a special help page for settings/display or whatever. The only issue is whether this should be presented first with a link to the main help page, or if we put a line at the top of the main help page that says "I need help for settings/display". Also edited the help target window name, as "friendika-help" is a bit dated. 2014-03-03 14:33:49 -08:00
friendica
f8de124244 Merge pull request #353 from git-marijus/master 
little css fixes
 2014-03-04 09:27:52 +11:00
friendica
002a86fb71 Merge https://github.com/friendica/red into zpull 2014-03-03 11:34:15 -08:00
friendica
608c7501fe missing file 2014-03-03 11:33:42 -08:00
marijus
64b32d9146 var update 2014-03-03 19:56:38 +01:00
marijus
239550b0c9 one got lost and a typo 2014-03-03 19:48:16 +01:00
marijus
ad10eb2875 little css fixes 2014-03-03 19:14:35 +01:00
Thomas Willingham
c028d9b1d0 Partially revert 895c9411d9 
Not entirely sure why the lines in question were removed, but this is
required as a quick fix for broken notifications.
 2014-03-03 17:16:25 +00:00
friendica
7baeb45183 some anomolies found when viewing connections in various cases. 2014-03-02 19:40:59 -08:00
friendica
b98ddc69de disable the right_aside on choklet two-column layouts 2014-03-02 17:21:06 -08:00
friendica
895c9411d9 add choklet template with several defined flavours, two and three column fluid layouts with optional side margins and a region for a blog-style header photo 2014-03-02 16:46:34 -08:00
friendica
e931af8307 first cut at choklet template 2014-03-02 15:47:01 -08:00
marijus
57cc77f6d5 make navbar themable again 2014-03-02 22:50:53 +01:00
friendica
bf401a5afa allow templates to have multiple styles - this would be a bit like having a schema for a template file. At first you'll think this is insane and overly complicated, you'll just have to wait and see what I'm up to. Then it will start to make sense. 2014-03-02 00:24:29 -08:00
friendica
1920873c34 s/layout/template/g *.pdl 2014-03-01 19:28:21 -08:00
friendica
52c2085176 Merge pull request #347 from solstag/master 
Update pt-br translation.
 2014-03-02 12:46:14 +11:00
Alexandre Hannud Abdo
1bdea24238 Update pt-br translation. 2014-03-01 03:00:35 -03:00
marijus
6b6052d5a9 Revert "a little fix against bootstrap 3.1.1" 
This reverts commit e82c9eb176.
 2014-02-28 23:34:52 +01:00
marijus
e82c9eb176 a little fix against bootstrap 3.1.1 2014-02-28 23:23:19 +01:00
marijus
b390336016 add hover effect to usermenu caret 2014-02-28 23:04:38 +01:00
friendica
7cb295bbe6 over-ride code tags within pre blocks as bootstrap which puts a border around pre tags, which messes up markdown code blocks which have yet another border. 2014-02-27 20:55:25 -08:00
friendica
102521844b put schemas in Comanche (this requires theme support (!)) 2014-02-27 20:48:10 -08:00
friendica
d2bc7c606a minor fixes to suggested chatrooms 2014-02-27 17:10:26 -08:00
friendica
642da17b86 chatroom suggestions 2014-02-27 17:07:11 -08:00
marijus
8860d80bd4 Revert "little correction" 
This reverts commit 496a5a556f.
 2014-02-26 23:34:36 +01:00
marijus
496a5a556f little correction 2014-02-26 23:31:35 +01:00
marijus
c5b8224dcc properly fix profile edit dropdown menu 2014-02-26 23:20:40 +01:00
friendica
364fc9f163 comanche: provide an option to add a menu class for different theming choices on some menus (e.g. horizontal, tabbed, etc.) 2014-02-25 20:58:20 -08:00
friendica
9a2e73ae15 move bootstrap to theme and out of core. 2014-02-25 16:29:00 -08:00
friendica
b1021df485 provide ability to bookmark chatrooms using rbmark 2014-02-24 21:34:49 -08:00
friendica
51a895471b Merge pull request #338 from solstag/master 
Fix typo that broke jquery.divgrow. Sorry I should have tested.
 2014-02-25 15:50:19 +11:00
friendica
2becbae402 remote "add bookmark" - like rpost but saves a bookmark from a remote hub into one of your own bookmark folders (or a new one if desired). 2014-02-24 20:46:52 -08:00
Alexandre Hannud Abdo
5691a609c4 Fix typo that broke jquery.divgrow. Sorry I should have tested. 2014-02-25 01:15:47 -03:00
Alexandre Hannud Abdo
59211e0ac8 Translation for jQuery.divgrow strings. Fix mismatch in jQuery.timeago strings 2014-02-24 17:47:57 -03:00
Alexandre Hannud Abdo
e4eeb9d101 Updates to pt-br translation, including some email templates. 2014-02-24 16:17:50 -03:00
Christian Vogeley
a5f70f6c10 little tweaks 2014-02-22 20:30:41 +01:00
Christian Vogeley
f9eddb89ef Add option for narrow navbar instead of the bootstrap default 
thick version
 2014-02-22 16:10:46 +01:00
Tobias Diekershoff
65d5fae324 DE: update to the strings 2014-02-22 14:10:21 +01:00
marijus
32d0189b56 remove some design fixes which got fixed in bootstrap 3.1.1 2014-02-21 14:38:21 +01:00
marijus
8c37a01f74 dont allow bootstrap to mess with blockquote font-size 2014-02-21 13:57:00 +01:00
marijus
7b1cabdd58 quickfix for edit profile dropdown 2014-02-21 13:26:13 +01:00
marijus
593631d8f5 oups... to much cleaning... 2014-02-21 13:03:32 +01:00
marijus
052be3c92b cleanup style.css 2014-02-21 12:16:26 +01:00
friendica
9db40322ab move jgrowl (alert popup) out of the now taller navbar 2014-02-20 18:51:35 -08:00
friendica
df8e8c3bc5 Merge pull request #327 from git-marijus/master 
fixes issue #326 initial scale to big
 2014-02-21 10:18:34 +11:00
Paolo T
aa9ae54ee6 Merge pull request #328 from tuscanhobbit/master 
PT-BR: update to the strings
 2014-02-20 23:40:21 +01:00
tuscanhobbit
34d30e4d7e PT-BR: update to the strings 2014-02-20 23:37:54 +01:00
friendica
e56abd1782 updated fr translation 2014-02-20 14:15:57 -08:00
marijus
a3191996e7 fixes issue #326 initial scale to big 2014-02-20 19:54:16 +01:00
friendica
c219451702 Merge pull request #324 from tonybaldwin/master 
Do not view remote profiles in frames. (changed description for display->settings), in ALL relevant files
 2014-02-20 15:26:17 +11:00
friendica
a29b71547a use a "fullscreen" icon for chanview full screen mode; add channel_menu selection and setting to the settings page. 2014-02-19 20:19:56 -08:00
tony baldwin
9715176a56 s/View remote profiles as webpages/Do not view remote profiles in 
frames/g
 2014-02-19 22:56:52 -05:00
friendica
5ae05e32e5 Merge pull request #321 from git-marijus/master 
bootstrapify the nav
 2014-02-20 14:06:00 +11:00
Paolo T
eae1063663 Merge pull request #323 from tuscanhobbit/master 
IT: update to the strings
 2014-02-19 22:03:48 +01:00
tuscanhobbit
c82970c6bb IT: update to the strings 2014-02-19 21:57:37 +01:00
marijus
82b028173c another correction 2014-02-19 20:08:02 +01:00
marijus
31d9bf0417 Merge branch 'master' of https://github.com/friendica/red 2014-02-19 19:31:29 +01:00
marijus
3a6760f6d1 one pixel to much... 2014-02-19 18:55:24 +01:00
marijus
c09087262c bootstrapify the nav 2014-02-19 18:42:37 +01:00
friendica
24d119b8c4 introduce a new privacy level "PERMS_AUTHED" to indicate somebody that is able to successfully authenticate (but is not necessarily in this network). 2014-02-18 20:59:25 -08:00
friendica
a258c8b98b Merge https://github.com/friendica/red into zpull 2014-02-18 19:17:45 -08:00
friendica
87bb568d67 change edit/delete to icons on filestorage page 2014-02-18 19:17:11 -08:00
friendica
2e305742fa Merge pull request #320 from dawnbreak/master 
Let user cancel the red_encrypt dialogue
 2014-02-19 12:01:34 +11:00
friendica
9a51f8ce65 edit bookmarks 2014-02-18 14:26:23 -08:00
Klaus
aa44d3abab Let user cancel the red_encrypt dialogue 
If the user press cancel on the prompt also cancel the encryption. Maybe should also add this to passhint promt.
 2014-02-18 17:41:59 +01:00