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

3618 commits

Author SHA1 Message Date
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
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
marijus
3bdbdbab53 dont show an empty link to profile creation if multi_profile is not enabled 2014-01-30 19:44:50 +01:00
friendica
48bc9b546c typo and clear chattext after submission 2014-01-30 03:51:25 -08:00
Michael Meer
0a2b2a1390 attempt with fix URL for testing works 2014-01-30 10:39:09 +01:00
friendica
6c6a9b963a a bit more ajax work on chat and chatsvc and some fiddling with layouts 2014-01-30 01:00:46 -08:00
friendica
080928f214 chatroom management front-end stuff 2014-01-29 21:29:48 -08:00
friendica
7b60978262 back-end for changing online status and keeping presence refreshed 2014-01-29 20:40:37 -08:00
friendica
9fdee53c9a start on the ajax bits 2014-01-29 20:14:18 -08:00
friendica
b8fb6a4373 more chat infrastructure 2014-01-29 17:09:20 -08:00
friendica
677f5f641e more testing of chatroom interfaces, also corrected a function call that should have been a class instantiation in reddav 2014-01-29 16:02:02 -08:00
marijus
fe2b6f3dfb add image floating to bbcode 2014-01-30 00:01:19 +01:00
Paolo T
286dca84a1 Merge pull request #288 from tuscanhobbit/master 
Updated Italian translation
 2014-01-29 07:48:50 -08:00
Paolo Tacconi
25acd60f63 Updated Italian translation 2014-01-29 16:44:17 +01:00
friendica
6a9d43bcbe debug chatroom_list widget 2014-01-29 03:16:07 -08:00
friendica
f84ba95e87 add template for chatroomlist widget 2014-01-29 01:53:15 -08:00
friendica
d970c69f91 online indication to the directory popup 2014-01-28 19:49:56 -08:00
friendica
cc11535e34 online indication on profile sidebar 2014-01-28 17:07:25 -08:00
friendica
8efac0cfd6 fix sql query and provide setting to hide online status 2014-01-28 16:16:55 -08:00
friendica
3100b5d93e photo tagging still broken - but at least don't create a new linked item every time a photo is edited. 2014-01-27 18:06:09 -08:00
friendica
9551f6b404 Merge https://github.com/friendica/red into zpull 2014-01-27 14:47:58 -08:00
friendica
d6a9497e4a cleanup include/menu in preparation for the next phase of bookmarking 2014-01-27 14:46:39 -08:00
Michael Meer
a3bf272753 Merge branch 'master' of https://github.com/MicMee/red 
to be in sync
 2014-01-27 10:37:15 +01:00
friendica
d67fdd1299 add davguest param to cut/paste link for directories in mod/filestorage 2014-01-26 14:41:43 -08:00
friendica
f3fd9535a4 Merge https://github.com/friendica/red into zpull 2014-01-25 02:55:17 -08:00
friendica
4b66a399e4 get rid of bootstrap's blockqote margin css which is just bloody wrong and can't easily be over-ridden 2014-01-25 02:53:31 -08:00
Tobias Diekershoff
88f25191e0 DE: update to the strings 2014-01-25 07:28:30 +01:00
Thomas Willingham
d3a0d37b0d Add admin info to admin panel and site info. 
Since we can have multiple admins, this is freeform bbcode.
 2014-01-24 23:58:41 +00:00
friendica
3869b16298 prettyphoto (js|css) not found 2014-01-24 14:35:32 -08:00
Michael Meer
ffabb4cc86 reorg formula data for hubloc checks 2014-01-22 11:29:49 +01:00
friendica
05951a9877 add primary webbie to directory popup 2014-01-21 18:45:40 -08:00
friendica
60416d6f33 fix the admin interface to pending registrations 2014-01-21 14:56:42 -08:00
Michael Meer
86e2237555 no need to have a doule hublocid 2014-01-20 13:03:24 +01:00
Michael Meer
a13593590b added buttons to perform later hubloc actions 2014-01-20 12:12:40 +01:00
Thomas Willingham
a59b7c97f4 Missed these from git add...a year ago 2014-01-17 23:30:33 +00:00
Thomas Willingham
6920c203d1 Remove deprecated CSS - there is a dark schema now, and shadows and stuff are cofigurable. 2014-01-16 04:18:19 +00:00
Thomas Willingham
cd72fd3f01 Tweak "typical" perms macro 2014-01-16 02:53:05 +00:00
friendica
ec6b8e5cda Merge branch 'master' of https://github.com/pixelroot/red into pixelroot-master 
Conflicts:
	view/ru/strings.php
 2014-01-15 16:14:43 -08:00
cvogeley
d0e657f0f0 Merge pull request #271 from cvogeley/master 
Confirm box: fall back to standard js confirm dialog if bootstrap isn't ...
 2014-01-13 14:14:53 -08:00
Christian Vogeley
d9d894cbb3 Confirm box: fall back to standard js confirm dialog if bootstrap isn't available 2014-01-13 22:32:13 +01:00
pixelroot
4fdd9c39c5 modified: view/ru/messages.po 
modified:   view/ru/strings.php
 2014-01-13 18:29:37 +01:00
pixelroot
ecb125a47d modified: view/ru/messages.po 2014-01-13 16:10:58 +01:00
Tobias Diekershoff
87b99be785 DE: update to the strings 2014-01-13 07:28:16 +01:00
cvogeley
df9e628495 Merge pull request #268 from cvogeley/master 
delete confirmation popup for blocks and layouts
 2014-01-11 17:34:37 -08:00
Christian Vogeley
325c5e4e76 delete confirmation popup for blocks and layouts 2014-01-12 02:29:03 +01:00
Paolo T
c30d637b08 Merge pull request #264 from tuscanhobbit/master 
Italian translation of reddav
 2014-01-11 10:59:30 -08:00
tuscanhobbit
59a396ac75 Italian translation of reddav 2014-01-11 19:57:28 +01:00
Thomas Willingham
865f7aef1c Prevent whitespace breaking copy-paste of reset passwords. 2014-01-10 20:37:25 +00:00
friendica
ee2bea37e9 mod_filestorage: provide a URL for linking to webpages and other websites 2014-01-09 21:01:53 -08:00