Commit Graph
3400 Commits
Author SHA1 Message Date
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