Commit graph

3824 commits

Author SHA1 Message Date
Jeroen
2e6dd91599 14px>12pt as agreed on 075fc67277 - Also fixed empty delete button showing up for channels without edit photo rights. 2014-07-28 12:42:43 +00:00
friendica
1cc83dcaca style the photo like buttons 2014-07-27 19:56:06 -07:00
friendica
34d0490732 re-align the "remember me" button on login page after bootstrap update 2014-07-27 17:34:54 -07:00
friendica
34cc4cdc60 clear floats on photo page (footer content appearing on right of page instead of bottom) 2014-07-27 17:24:09 -07:00
Jeroen
075fc67277 Improved photo view page. Added a delete button, stylized other button and rearangend divs a but. I even made a javascript function (copied is the right word). I changed the application (non-posts) font size (temporary) to 14px, same as button (btn) font size. I like to change all font sizes to 1.0rem (posts) and 0.8rem (application) in the near future, but I will test that first on my hub. 2014-07-27 21:44:34 +00:00
friendica
4f90070e5e Merge https://github.com/friendica/red into pending_merge 2014-07-25 01:13:54 -07:00
friendica
52fa84135c wrong label on icon 2014-07-25 01:13:08 -07:00
marijus
9938f0c52b Merge branch 'master' of https://github.com/friendica/red 2014-07-25 09:42:50 +02:00
marijus
9c40ee9e60 fixes #545 2014-07-25 09:42:10 +02:00
friendica
18f5890cb1 make profile edit pencil stand out a bit on darker backgrounds 2014-07-24 22:29:03 -07:00
friendica
5dcd0654d4 always provide a profile edit entry in the nav usermenu 2014-07-24 21:29:07 -07:00
friendica
1a6973a670 cherry pick pull request #544 2014-07-24 19:07:04 -07:00
mycocham
936f596af4 French Translations 2014-07-24 19:23:03 -04:00
marijus
9001406346 update to bootstrap-3.2 and minor css adjustments 2014-07-24 13:51:06 +02:00
friendica
ee75efd951 Merge branch 'master' of https://github.com/mrjive/red into mrjive-master
Conflicts:
	view/it/messages.po
2014-07-23 16:46:02 -07:00
mrjive
aa6d61d3b1 Just a small typo
Fixed a small typo (and also to try if I'm doing right)
2014-07-24 00:29:36 +02:00
Jeroen
02a4dac39b Merge branch 'master' of https://github.com/friendica/red 2014-07-23 13:03:12 +00:00
Jeroen
06470cd114 update nl 2014-07-23 13:02:14 +00:00
friendica
5c6a251213 some backend JS support for an endless scroll directory 2014-07-22 22:15:34 -07:00
friendica
8dc3446be4 when telling somebody that permissions have changed but not yet submitted, give them a submit button *right there* so they don't have to look for it. 2014-07-22 20:20:01 -07:00
tuscanhobbit
7b8edeaead IT: updated strings 2014-07-19 11:47:48 +02:00
friendica
b19176169c provide a specific permission for liking profiles (reuse the obsolete bookmark permission), also remove the unused 'unconnected contacts' view for now. 2014-07-17 20:54:30 -07:00
friendica
bfe4bdc30b make mod_like interactive if requested 2014-07-17 18:20:12 -07:00
Jeroen
010d4071ad Introducing page template Redable (sic). A template for making it easier to read long texts on a wide range of devices. Using rem and em for font sizes and region widths. Regions: aside, content, right_aside and footer. Advised to only use the middle content region as much as possible (but left and right can be used for indexes if you like). Based on the default template. Maybe later I will add some alternative css's. 2014-07-16 18:09:46 +00:00
jeroenpraat
07070b0a20 small fix nl 2014-07-09 19:04:21 +00:00
friendica
7c40a41e1b more event display formatting 2014-07-07 01:42:46 -07:00
friendica
0764b78da3 event render improvements 2014-07-06 23:13:17 -07:00
jeroenpraat
dcf4bf595c nl 100%git status 2014-07-06 18:32:03 +00:00
friendica
5ed9444bee some initial work towards email address verification 2014-07-03 18:29:32 -07:00
jeroenpraat
0f5cd7d7fa fix nl 2014-07-03 22:36:58 +00:00
friendica
c7086b77fd move code out of templates - not sure how this even worked. 2014-07-03 00:58:49 -07:00
jeroenpraat
1cbec39af8 Red Matrix default instead of global default. Is more clear. Update nl to 99%. Update util/messages.po 2014-07-02 13:26:44 +00:00
jeroenpraat
06935e96eb Merge branch 'master' of https://github.com/friendica/red 2014-07-02 13:20:08 +00:00
jeroenpraat
42c9a67dee Changed Default to Light (global default). So if hub owners want to change the default, they don't get two defaults. Please revert when not needed/wanted. 2014-07-02 13:13:29 +00:00
Paolo T
647ca2ee43 Merge pull request #525 from tuscanhobbit/master
IT: strings updated
2014-07-02 11:47:58 +02:00
Paolo Tacconi
fea5bfe388 IT: strings updated 2014-07-02 11:46:23 +02:00
friendica
7a082394c3 minor adjustments 2014-07-01 22:02:36 -07:00
jeroenpraat
c5123b59cc fix 1 error in nl that somehow sneaked in 2014-07-01 23:09:18 +00:00
jeroenpraat
9c40071509 update/approve nl to 98%git status 2014-07-01 22:59:03 +00:00
jeroenpraat
502b30e768 update nl 2014-07-01 15:46:05 +00:00
RedMatrix
406740479a Merge pull request #520 from pixelroot/master
Updated Russian translation
2014-07-01 09:19:24 +10:00
RedMatrix
bb4ece672a Merge pull request #521 from tuscanhobbit/master
Changed the lock icon behaviour
2014-07-01 09:19:08 +10:00
jeroenpraat
2f56472f0c update nl 2014-06-30 20:30:06 +00:00
Paolo Tacconi
78c25cf2f0 Changed the lock icon behaviour 2014-06-30 17:10:42 +02:00
pixelroot
cadcd45e89 Updated Russian translation 2014-06-30 14:18:02 +02:00
jeroenpraat
52adbb6504 update nl 2014-06-29 23:26:04 +00:00
RedMatrix
0926c2d849 Merge pull request #516 from dawnbreak/master
Fixed a wrong timestamp update when adding a file.
2014-06-30 09:19:52 +10:00
Christian Vogeley
eb41b0ba7c Remove Remove Account link from account settings
because it doesn’t remove the account. Move channel removal link to
channel page
2014-06-29 22:19:45 +02:00
Klaus Weidenbach
322091cd12 Fixed some more timestamp bugs in RedDAV.
Fixed an SQL-query in RedFile::put(), where parameters where in wrong order.
2014-06-29 17:49:46 +02:00
Paolo T
628f121804 Merge pull request #515 from tuscanhobbit/master
IT:updated strings
2014-06-29 12:43:24 +02:00
tuscanhobbit
98324cb277 IT:updated strings 2014-06-29 12:41:19 +02:00
RedMatrix
e228c2ed32 Merge pull request #513 from dawnbreak/master
Some documentation for include/reddav.php and a new tpl-file.
2014-06-29 10:16:51 +10:00
RedMatrix
f29f8a1b40 Merge pull request #514 from tuscanhobbit/master
Checkboxes were not aligned in connedit, added a table and removed orphaned filestorage.tpl
2014-06-29 10:15:55 +10:00
Klaus Weidenbach
f49b74c5f6 Some documentation for include/reddav.php and a new tpl-file.
Documented include/reddav.php a bit more to understand what it is
about to try to clean up some parts. Still a lot to be done here.
I put serveral @todo markers that need to be checked.

Moved some more HTML to template file.

Changed getETag() return format according to documentation. (ETag MUST
be surrounded by double-quotes)
2014-06-29 01:17:06 +02:00
tuscanhobbit
dfe45342f6 Checkboxes were not aligned in connedit, added a table 2014-06-28 23:14:34 +02:00
friendica
253f2cde9f Merge https://github.com/friendica/red into pending_merge 2014-06-26 17:19:15 -07:00
friendica
6d05d502e3 still trying to sort out the liveupdate issues. This was getting overly complicated with all the different ways we've tried to fix this issue so let's step back and simplify it a bit. 2014-06-26 17:17:24 -07:00
jeroenpraat
aeab6431d2 update nl 2014-06-27 00:13:22 +00:00
marijus
c6cae8e0c2 make it a div to prevent extra borders in some browsers after click 2014-06-26 19:08:16 +02:00
Klaus Weidenbach
45dde16f3e Templified cloud's directory listing.
Moved HTML for the directory listing from include/reddav.php to it's
own template file.
Still need to clean it up bit more, but should be useable already.
2014-06-26 02:01:53 +02:00
friendica
ecd472b7bb Merge https://github.com/friendica/red into pending_merge 2014-06-24 17:27:35 -07:00
friendica
6848a5f9a7 Events show up as notifications about a week in advance so you know they're coming. But let's put an indicator next to the notification count when there's an event that is actually happening today -- so you don't have to look at the calendar or notification detail every day for a week to figure out if the day has finally arrived yet. 2014-06-24 17:23:58 -07:00
RedMatrix
44abcd83b3 Merge pull request #506 from dawnbreak/master
Set backlink to the parent folder, not cloud's root.
2014-06-25 08:38:54 +10:00
RedMatrix
fa1dc7aba2 Merge pull request #504 from HaakonME/master
Updated Norwegian bokmål translation
2014-06-25 08:37:48 +10:00
Klaus Weidenbach
a6403905ef Set backlink to the parent folder, not cloud's root.
If you edit a file and click on the backlink you always returned to
the root folder of your cloud. This patch sets the correct parent
folder as backlink.
Bit messy, but looks like it works.
2014-06-24 21:05:00 +02:00
Haakon Meland Eriksen
19bc9b53c9 Updated Norwegian bokmål translation 2014-06-24 19:47:14 +02:00
tuscanhobbit
b8e8adcd51 IT: updated strings & fixed readme img link 2014-06-24 16:28:44 +02:00
tuscanhobbit
cc4001fce7 Fixes to links and forward URLs in filestorage 2014-06-24 12:05:11 +02:00
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
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