Commit graph

3265 commits

Author SHA1 Message Date
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
friendica
70526915c8 several things were not working correctly w/r/t community tagging. The preference vanished from settings at some point, and we also weren't updating the original post timestamp so that the changed taxonomy would propagate correctly as an edit. 2014-02-16 16:04:46 -08:00
Tobias Diekershoff
06680e504a DE: update to the strings 2014-02-16 08:18:43 +01:00
marijus
d7546c7a63 This makes advanced privacy settings adjustable in expert mode only. Also they are hidden behind a button. This is a design hotfix should probably come up with something better someday... 2014-02-13 19:29:06 +01:00
friendica
99c19b307e don't fix the height of the archive widget - fix the maximum height 2014-02-13 02:55:16 -08:00
friendica
ec99cac9e8 very simple scheme 2014-02-13 00:52:54 -08:00
friendica
2c1b366fdf make activities optional for profile things, clean up the forms 2014-02-12 14:44:27 -08:00
friendica
ba360b4347 ui improvements on the manage page 2014-02-12 03:05:55 -08:00
Tobias Diekershoff
8ffd076884 DE: update to the strings 2014-02-12 09:01:42 +01:00
friendica
95a45a119d shamelessly steal, and cut/paste from the settings page to get mod_photos edit permissions working - and it looks like we still have some other fancybox instances (yet another lightbox) which haven't yet been converted to colorbox and will need to be fixed. Way too many lightboxes. 2014-02-11 18:45:50 -08:00
friendica
12319c41e3 add chanview mode to settings 2014-02-10 15:14:03 -08:00
marijus
3ad9cf67c6 whitespace 2014-02-10 00:00:35 +01:00
marijus
46153e4a57 moving background-color to style.css 2014-02-09 23:59:19 +01:00
marijus
4fc0126661 theming chat a little 2014-02-09 23:52:09 +01:00
Christian Vogeley
176b0881ce . 2014-02-09 01:39:37 +01:00
friendica
97739920eb create a new "subdued" CSS class for things that shouldn't be in your face unless you want them and intentionally hover over them. Typically this would be accomplished via an opacity or colour change, but themes are free to use other methods. Also changed the channel_tabs "chatroom" link to use the subdued class if no rooms have been created rather than a count of chatrooms. Themse should probably create a .subdued and .subdued:hover definition because we'll probably take most of the stuff which is now hardwired to use opacity by id and change it to use the class definition instead. 2014-02-08 00:48:19 -08:00
friendica
1ec7ffc774 Merge https://github.com/friendica/red into zpull 2014-02-07 13:40:26 -08:00
friendica
63589d4f2e from olivier: use double quotes in js strings, updated FR translation
from me: provide future ability to have an optional edit link/icon next to menus (such as bookmarks)
2014-02-07 13:39:13 -08:00
Paolo T
6d1f211fab Merge pull request #303 from tuscanhobbit/master
IT: update to the strings
2014-02-07 18:06:32 +01:00
tuscanhobbit
917a939d46 IT: update to the strings 2014-02-07 18:02:20 +01:00
friendica
f9381ed746 notification bug - don't use $r, we already set it to something else that we need further on. 2014-02-06 13:32:29 -08:00
friendica
61f3ffc635 add chatrooms template 2014-02-05 19:16:41 -08:00
friendica
e525f045c1 Merge pull request #298 from cvogeley/master
Other not so elegant way of detecting touch screen devices
2014-02-06 06:44:41 +11:00
friendica
0844110f7b preserve system bit when editing menus 2014-02-05 03:44:46 -08:00
friendica
8a11c29413 make links in comments bookmark-able 2014-02-04 19:39:56 -08:00
friendica
9f439c3248 add icon translation for new icon 2014-02-04 17:14:22 -08:00
friendica
aede006970 bookmarks - mop up and go home 2014-02-04 17:12:13 -08:00
friendica
50a1ffd244 Merge https://github.com/friendica/red into zpull 2014-02-04 00:53:04 -08:00
friendica
d8f16442a1 bookmark permissions 2014-02-04 00:52:34 -08:00
Tobias Diekershoff
7ff2c018c5 DE: update to the strings 2014-02-04 07:50:32 +01:00
friendica
1572403e98 photo tagging somewhat working - but can't remove photo tags until we update tagrm 2014-02-03 20:44:42 -08:00
friendica
c4d0884596 accept new connection broke yesterday 2014-02-03 14:03:43 -08:00
friendica
5cc6efe21f changed order of the privacy macros so that the dangerous settings come last and the preferred settings come first 2014-02-02 20:14:57 -08:00
friendica
baf3b052f6 don't load any configs from DB if installing - especially in style.pcss 2014-02-02 18:18:22 -08:00
friendica
ee1580427e don't draw attention to advanced permissions and their corresponding complexity and clearly mark the simple permissions which people are encouraged to use. 2014-02-02 17:54:36 -08:00
Tazman DeVille
d2b55f5eea added Thomas' additional navbar colours from APW to redbasic 2014-02-03 02:06:07 +01:00
friendica
2768262f93 Add switch to allow menus to be used as bookmark collections 2014-02-02 16:49:09 -08:00
friendica
67899677db make chat honour the pause key (but we still need to ping the server to maintain the in_room status), also the recent change to pull css out of the template file used classes instead of ids so none of the styles were sticking 2014-02-02 15:50:07 -08:00
Thomas Willingham
96e423dcfc Merge pull request #297 from tazmandevil/master
link hover colour remains user set link_colour (w/o change default,Mike)
2014-02-02 08:33:26 -08:00
Thomas Willingham
5846dc105a Move CSS out of chat template 2014-02-02 16:28:58 +00:00
Tazman DeVille
16e818def7 link hover colour remains user set link_colour (w/o change default,
Mike)
2014-02-02 14:01:12 +01:00
Christian Vogeley
a2fa1a162d Other not so elegant way of detecting touch screen devices
But at least it seems to work
2014-02-02 13:59:20 +01:00
friendica
e83419b53e add links to change chat status and leave room 2014-02-02 03:43:52 -08:00
friendica
17436f060f fix default link color 2014-02-01 21:12:26 -08:00
friendica
34850289ff Merge https://github.com/friendica/red into zpull 2014-02-01 21:03:46 -08:00
friendica
61cc4de225 provide donation options on siteinfo page 2014-02-01 21:03:21 -08:00
friendica
a9ceeff988 Merge pull request #296 from tazmandevil/master
link color
2014-02-01 20:47:19 -08:00
friendica
8e8b49d18c Merge pull request #294 from git-marijus/master
comment out since it is not clear if this is not implemented yet or obsolete
2014-02-01 20:46:52 -08:00
Tazman DeVille
de412abe88 user configured link colour 2014-02-02 05:19:29 +01:00
Tazman DeVille
bd83783391 link colours 2014-02-02 04:32:43 +01:00
Tazman DeVille
a2761213e0 link colour options 2014-02-02 04:26:56 +01:00
Christian Vogeley
30aeb42bed Press return to post chat posts- SHIFT-RETURN creates line break
on mobile devices keep default behavior
2014-02-01 23:28:27 +01:00
friendica
94e59d4770 status indication 2014-02-01 01:00:26 -08:00
friendica
d14afc0ee4 provide the room name for the room you're in. 2014-02-01 00:54:20 -08:00
friendica
33f3cd3d4a chat formatting/style improvements 2014-01-31 20:48:26 -08:00
marijus
af75b77253 comment out since it is not clear if this is not implemented yet or obsolete 2014-01-31 18:31:14 +01:00
friendica
aaa3c62efa keep presence updated - typo was causing it to logout 2014-01-30 21:09:02 -08:00
friendica
f69bf5e598 more chat work - this time the ajax bits to actually show chats on the page 2014-01-30 18:57:46 -08:00
friendica
70de97fca1 Merge pull request #293 from MicMee/master
more progress in admin to maintain hubloc with ping
2014-01-30 14:21:32 -08:00
Michael Meer
da1e7cc211 Merge branch 'master' of https://github.com/friendica/red
.
2014-01-30 19:54:12 +01:00