Commit graph

3490 commits

Author SHA1 Message Date
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