Commit graph

3873 commits

Author SHA1 Message Date
Alexandre Hannud Abdo
aa59010885 update pt-br translation 2014-09-22 15:42:59 -03:00
Klaus Weidenbach
d2268a412d Don't link unknown likes.
Likes/Dislikes of unknown channels have disabled links now.
Fixed intention a bit, romved a unused variable.
2014-09-21 17:51:01 +02:00
friendica
22e6e691ca Navbar notifications: don't show "nothing new here" unless we've checked and there's nothing. Until we know for sure, display "Loading...". 2014-09-20 16:34:48 -07:00
marijus
9feb619bea update jg to latest preview release and try once more to really justify the whole gallery 2014-09-20 15:40:40 +02:00
friendica
1c56442818 Repeat after me - we always refer to our clientelle as 'members'. If your software calls you a "user" - get rid of it. 2014-09-19 23:35:16 -07:00
friendica
302483790c Merge https://github.com/friendica/red into pending_merge 2014-09-19 16:51:05 -07:00
friendica
cb434818f8 closing tag 2014-09-19 16:50:43 -07:00
Jeroen
6923557ecb Bit tweaking 2014-09-19 21:23:41 +00:00
Jeroen
017726f069 Another piece that didn't fit well in the dark schema. Hopefully this is the last. 2014-09-19 21:16:55 +00:00
Jeroen
de45f42f9f update nl.2 2014-09-19 20:43:43 +00:00
Jeroen
eedc0e50c1 update nl 2014-09-19 15:54:19 +00:00
friendica
87a6f25769 try to sort out walltowall translation for diaspora recipients 2014-09-19 02:22:24 -07:00
friendica
45df73d456 add stylish_select to new_channel page - but comment out until we can theme it. It needs a bit of theming to even work correctly. 2014-09-18 17:06:15 -07:00
friendica
d4759a5883 repeated content collapse on update from display page under rare conditions (when the conversation hasn't changed) 2014-09-18 16:32:05 -07:00
friendica
0deb592cb5 typo 2014-09-17 22:55:27 -07:00
friendica
8eb21cceb3 use 24-hour clock for non-American dates 2014-09-17 22:53:38 -07:00
friendica
22aa5aca14 add a spinner or two to the new channel page so folks have a clue that we're doing something in the background - trying to complete the nick field for them (and then check it before they submit). 2014-09-17 21:27:02 -07:00
friendica
51d9f0d97a channel permission roles 2014-09-17 21:16:15 -07:00
friendica
4014093572 implement permission roles - the backend should be done except for maybe a couple of small tweaks. Now we just need to define the rest of the roles and create a chooser for them. Adam started on this some time back but I don't know where that has gone. 2014-09-17 17:59:46 -07:00
Alexandre Hannud Abdo
5bdfc2f647 Fix name attribute of button elements so jquery '.submit()' doesn't break
According to "Additional notes" in:

http://api.jquery.com/submit/

Not fixing buttons created with 'input' tags.
2014-09-16 19:00:53 -03:00
marijus
b5bb2230eb this still has less issues 2014-09-16 14:18:03 +02:00
Thomas Willingham
d2a4b34c98 Trivial typo - concatenated string that should be. Doesn't really
deserve it's own commit, but if I don't fix it now, nobody will notice for
another18 months.
2014-09-16 00:55:41 +01:00
Jeroen
eaf3bd3326 See comments on commit 5ab85b0. Also fixed some bb typo's in docu index. 2014-09-15 15:35:40 +00:00
marijus
5ab85b076b heading font-size should not be tied to font-size for posts and comments 2014-09-15 10:39:38 +02:00
marijus
58aad83e5c this is probably better in most cases 2014-09-15 09:56:30 +02:00
Thomas Willingham
b5241c610f Deprecate site channel. The sys channel should be doing this. Will fix
shortly.
2014-09-15 00:06:51 +01:00
marijus
72bce40a9f tryout - some more adjustments 2014-09-14 22:37:03 +02:00
Jeroen
254dc0ec98 Made link post titles to source optional in display settings. Hopefully I did a right. 2014-09-14 12:39:11 +00:00
marijus
2728f5a104 tryout - fetch larger thumbnail if image gets streched over its size 2014-09-14 11:57:01 +02:00
marijus
dfc8430c8a cleanup after recent changes in mod photos 2014-09-13 16:33:20 +02:00
RedMatrix
415be29261 Merge pull request #592 from jeroenpraat/master
Issue #590: Linked conversation titles to source.
2014-09-13 19:24:01 +10:00
marijus
61ce524a33 define justifiedGalleryActive in head.tpl to not break other pages autoload 2014-09-12 21:32:53 +02:00
jeroenpraat
d4e7a71d1e Issue #590: Linked conversation titles to source.
If a theme wants to have it different, it can always copy this .tpl file to ../theme/tpl/. I didn't commit this directly, because it's a little bit controversial. But I like it!
2014-09-12 21:21:16 +02:00
marijus
72c30ea444 Merge branch 'master' of https://github.com/friendica/red 2014-09-12 21:07:28 +02:00
marijus
bd2139d16a do not load next page if justifiedGallery() is not ready yet 2014-09-12 21:04:43 +02:00
Jeroen
11d3ef6176 This is even better. Adapts better to Red user settings. 2014-09-12 18:55:53 +00:00
Jeroen
59c537b06d H1-H6 simplified (less font sizes), rem 2014-09-12 18:41:35 +00:00
tuscanhobbit
2e8feaa919 IT localization updated 2014-09-12 14:26:05 +02:00
friendica
1b3196862d issue #588 can't add feeds to collections using connedit page group sidebar widget 2014-09-11 02:19:21 -07:00
marijus
3caee72aee another day another concept - hope this works better 2014-09-11 10:41:11 +02:00
marijus
8835f646ae Revert "Revert "Merge pull request #583 from git-marijus/master""
This reverts commit 08638f3ec8.
2014-09-11 10:35:19 +02:00
friendica
5b774e26ca make sure we add the file 2014-09-10 23:09:54 -07:00
friendica
4c8036f530 endless scroll on connections page 2014-09-10 23:08:24 -07:00
friendica
6ab21b3d4f make verify_email the default for new installs (at least English installs), and provide a setting on the admin page for it. 2014-09-10 17:42:13 -07:00
friendica
08638f3ec8 Revert "Merge pull request #583 from git-marijus/master"
autoload broken - even after clearing cache and retrying.

This reverts commit 13e7a8f123, reversing
changes made to 4712b78e52.
2014-09-10 16:09:01 -07:00
friendica
eae146d85d Revert "Revert "update nl - attempt 2""
This reverts commit 8e179aa734.
2014-09-10 16:04:12 -07:00
friendica
8e179aa734 Revert "update nl - attempt 2"
This reverts commit 4712b78e52.
2014-09-10 16:02:25 -07:00
RedMatrix
13e7a8f123 Merge pull request #583 from git-marijus/master
photo justification
2014-09-11 08:46:58 +10:00
marijus
d825adf423 without this check we kill the directory autoload 2014-09-10 17:40:50 +02:00
marijus
c1c2214b47 photo justification 2014-09-10 17:10:39 +02:00
Jeroen
4712b78e52 update nl - attempt 2 2014-09-10 14:10:20 +00:00
Jeroen
81ae6f83f3 update nl 2014-09-10 14:05:12 +00:00
friendica
b1254a71bc wrap photo albums (albums and top level) in a div id=photo-album-contents 2014-09-08 16:28:02 -07:00
friendica
ed847a91f6 add categories to events 2014-09-07 22:14:28 -07:00
friendica
3c024ee446 Merge https://github.com/friendica/red into pending_merge 2014-09-07 17:19:32 -07:00
friendica
4faeebddb2 Diaspora actually puts the account full name into the "nickname" field of the vcard. They don't put the nickname into the vcard at all. One wonders why even have a nickname field since the fullname is already presented in the next line. This hasn't caused us a problem with Friendica because I'm guessing nobody actually uses this line, though the number of class tags on it makes it seem somewhat important. 2014-09-07 17:13:44 -07:00
Jeroen
11b5ec7ec8 Added abook-changed background colour to dark schema 2014-09-07 21:46:20 +00:00
friendica
b6d1ff3d8f hook photos scroll to page down 2014-09-06 05:22:30 -07:00
friendica
28b75b028d ajax work 2014-09-06 00:37:15 -07:00
friendica
dd7d0c4156 more work on the event edit form 2014-09-05 01:58:27 -07:00
friendica
92e4448993 put a date and time picker on events 2014-09-04 22:30:12 -07:00
friendica
d71e304b15 this improves the photos even more 2014-09-04 21:18:47 -07:00
friendica
50c137d152 constrain photos to a fixed block regardless of aspect ratio 2014-09-04 17:51:24 -07:00
friendica
75d0f6329c outbound feed issue 2014-09-03 01:09:28 -07:00
Thomas Willingham
6d7897a955 Don't forget the ifs. Now we just need to write some blurb, find some
images, add a link, and decide what to do with non-earned badges...basically
all of it.
2014-09-02 02:37:23 +01:00
Thomas Willingham
ab031664fa Move achievements on, but just a tad. 2014-09-02 02:34:04 +01:00
Paolo T
d98bf1d33b Merge pull request #577 from tuscanhobbit/master
Italian strings updated
2014-09-01 16:06:56 +02:00
Paolo Tacconi
a1f85cda3e Italian strings updated 2014-09-01 16:03:30 +02:00
Paolo Tacconi
f2d959e1aa Italian strings updated 2014-09-01 14:47:38 +02:00
Jeroen
3e8f9e8b62 update nl + Friendica>RedMatrix in two text files 2014-08-30 14:07:38 +00:00
marijus
9945cc7129 minor css fixes and cleanup 2014-08-28 23:05:47 +02:00
friendica
5e5c6c9000 consistency: the diaspora post plugin uses "diaspora_enable". The protocol driver uses "diaspora_enabled" with a 'd'. They got mixed up in a couple of places. 2014-08-28 03:33:19 -07:00
friendica
2d210db1b8 ability to create/edit/delete custom profile field definitions - read the source. Currently the created entries aren't added to the allowed fields arrays, but this can be done by hand until that bit is made available. Only choice for input type at the moment is 'text' or a text input, not a textarea. Multiple choice will be added later. 2014-08-27 22:01:02 -07:00
friendica
bbcf0be16a Admin setting for Diaspora Protocol enable. We may want to have this also at a channel level since there are privacy issues and quirks and trade-offs. 2014-08-27 18:19:56 -07:00
RedMatrix
45e8419bce Merge pull request #574 from tuscanhobbit/master
Notifications links load on the same window(tab)
2014-08-27 18:15:42 +10:00
tuscanhobbit
c4a2409778 notifications open in the same window(tab) 2014-08-27 09:35:17 +02:00
marijus
2df4c44de5 make vcard and contact block widget look-alike 2014-08-27 00:59:07 +02:00
marijus
c703d83350 add background color to widgets 2014-08-26 22:35:00 +02:00
friendica
c99d89e441 get rid of template "auto generated" warnings 2014-08-25 22:58:30 -07:00
friendica
6e99848043 more diaspora stuff - most of the basic bits are there except queueing and physical delivery (I'm keeping delivery turned off until some of the bugs are fixed so we don't cause inifinite loops or network meltdowns) - now it's just a matter of going through and methodically finding all the bugs 2014-08-25 22:43:44 -07:00
friendica
df634f9853 notifications/system not marking all notifications seen 2014-08-25 20:55:37 -07:00
Jeroen
b11e9fe03c fix nl 2014-08-23 20:13:23 +00:00
Jeroen
ceabf2d488 Minor adjustment photo view + update nl (at 100\%\!) 2014-08-23 17:01:19 +00:00
Jeroen
a328fc4865 fix nl 2014-08-22 21:42:33 +00:00
friendica
72a766432d missing template file 2014-08-21 20:45:15 -07:00
friendica
e524835463 the rest of the diaspora local discovery stuff 2014-08-21 20:31:55 -07:00
friendica
921799b045 make the old personal xrd interface (old webfinger) work again 2014-08-21 17:42:19 -07:00
friendica
831714f0f0 profile edit - missing visibility and drop link on non-default profiles, re-arrange order of replacing red#matrix smilie so it works correctly, accept a post with body content of '0' which was interpreted by x() as nothing (was treated as integer). 2014-08-21 16:46:24 -07:00
friendica
a59a6fbd90 abook-edit-me class lost during some edit - we need this to reset the permission fields 2014-08-21 01:41:15 -07:00
friendica
b4aed12129 extensible profiles - add the input form elements. Still needs styling and we're not yet storing the results. And right now we're ignoring the type and only doing type=string. Oh yeah - and I split off starting the second delivery chain into its own function in tag_deliver since it was largely duplicate code. 2014-08-20 23:01:25 -07:00
friendica
a6829f7dcb move Friendica photo migrator to addons, bring back a few XML scraping functions that we're going to require (unfortunately) 2014-08-20 17:15:13 -07:00
friendica
f7895d322e provide admin option for allowing rss/atom feed connections. Need to do this now before the feature is complete so that public sites don't get borked. We also will need a service class for this. 2014-08-20 16:10:57 -07:00
Jeroen
341892a7af fix nl 2014-08-19 21:48:49 +00:00
Jeroen
9f400229a7 Update nl 2014-08-19 20:22:15 +00:00
friendica
b3d450626e provide an overt indication that a post/comment was edited. 2014-08-18 22:44:03 -07:00
friendica
b522ab13cb nav channel selection 2014-08-18 20:03:48 -07:00
friendica
de1198ccfe Merge https://github.com/friendica/red into pending_merge 2014-08-17 17:49:25 -07:00
friendica
82eb265a20 add collections widget to connections page - and some more work on realms 2014-08-17 17:48:41 -07:00
Paolo T
1ddbd44fb0 Merge pull request #567 from tuscanhobbit/master
IT: strings updated
2014-08-17 19:35:16 +02:00
tuscanhobbit
3b979dd2a9 IT: strings updated 2014-08-17 19:32:44 +02:00
RedMatrixCanada
8c366154c3 French Transalations - UPDATED 2014-08-16 20:52:59 -04:00
RedMatrix
e4620179ac Merge pull request #564 from cvogeley/master
Add account deletion to the UI
2014-08-17 08:33:13 +10:00
Christian Vogeley
54fe09f466 Add account deletion to the UI 2014-08-16 16:28:07 +02:00
jeroenpraat
b88e1e9862 .btn.xs > 0.75rem (let's keep that as the min. scalable font size) 2014-08-15 14:00:51 +02:00
jeroenpraat
c96b18359f .btn-xs 0.65 > 0.7rem 2014-08-15 13:17:38 +02:00
RedMatrix
f4229dbc3f Merge pull request #561 from cvogeley/master
Some work on account deletion
2014-08-15 09:58:43 +10:00
Jeroen
c1b89b413a Added some missing translation strings. Fixed to scalable for a few font sizes. 2014-08-14 20:02:05 +00:00
Christian Vogeley
fc94a638cd Some work on account deletion 2014-08-14 20:17:57 +02:00
Jeroen
1badf53229 update nl 2014-08-14 14:59:02 +00:00
friendica
1d6f494936 some work on extended profile fields 2014-08-13 22:22:52 -07:00
marijus
4a938db398 this is better cross-browser support 2014-08-13 17:37:41 +02:00
marijus
92e5f31428 tweak .comment-edit-text-empty to correlate with the new default app font-size 2014-08-13 16:56:31 +02:00
marijus
bc85f7d6e3 provide an expert option to opt out from user zoom on mobile devices 2014-08-13 15:32:15 +02:00
friendica
50da5bd389 Friendica photo import tool. This will bring in all your photos from the chosen Friendica account and import them into Red. Note that profile photos will also be imported, but will not be scaled for profiles, nor will they be attached to any profiles. They will appear however in your Profile Photos album. Photos that had any access restrictions in Friendica will be made private to only you. Comments and likes, captions, and tags are not transferred, only the actual photos. You will only be able to do this once. If something goes wrong but any photos were imported, a pconfig called frphotos.complete will be set and you'll have to remove it to start over. If you should remove this to start over, we also check each photo and will not over-write a photo you already brought over. 2014-08-12 18:08:31 -07:00
zottel
948b76232f update to German translations 2014-08-11 11:48:02 +02:00
Jeroen
bec565cdc3 Some more buttons. Not ready yet. Changed in private message -submit- to -send-. Confusing in other language(s). 2014-08-09 01:18:31 +00:00
zottel
d91eee759f update to German translations 2014-08-08 16:46:29 +02:00
friendica
a7d95108d0 cleanup some text where we said "public" or "visible to anybody on the internet" when that isn't necessarily true. 2014-08-07 18:22:50 -07:00
friendica
f475317dba extra room for long names on mod_manage - stylise the forbidden sign a wee bit 2014-08-06 22:47:52 -07:00
Jeroen
1fcb4d88a4 max-width for small screens 2014-08-06 23:03:14 +00:00
Jeroen
d2a7b5babe Reworked the options on the profile edit page. In one words: buttons. Hope you liked it. Revert or fix if not. Also reworked the channels manage page a bit, because channel names where not readable with larger fonts. Not perfect yet, but now readable and I think better aligned. Also revert/fix if not good. 2014-08-06 21:49:30 +00:00
Jeroen
47d496eee3 update nl 2014-08-06 14:15:55 +00:00
friendica
b6c4dcb1be try to link this to page down as well 2014-08-05 22:20:22 -07:00
friendica
0b30f08fae minor stuff 2014-08-05 22:08:12 -07:00
friendica
9a0a613307 that went badly 2014-08-05 22:01:47 -07:00
friendica
74377bd4b4 a bit of cleanup on directory autoscroll 2014-08-05 21:57:46 -07:00
friendica
dc98e6c0e9 scrolling directory 2014-08-05 21:48:13 -07:00
friendica
1f415d9830 add en-gb and en-au ('en-us' aka 'en' is the default language now so watch out for words like colour and centralise and please use the US variants in translatable strings) 2014-08-05 20:09:01 -07:00
friendica
004eaacc73 channel manage page - notification indicators 2014-08-04 17:24:26 -07:00
friendica
00fc23bf4e issue #551 provide import/export of profiles (if this feature is enabled) 2014-08-04 16:48:40 -07:00
friendica
e0d338f102 always provide 'name' on profile edit page (and profile name), regardless of any other allowed fields. 2014-08-03 17:29:23 -07:00
friendica
464b2b6570 allow the PageDown key to trigger auto scroll - so if you use this key to page through the content you'll never reach the end (until you run out of content). 2014-08-03 16:32:30 -07:00
friendica
44ee18b810 Let site admin choose what profile fields to support. 2014-08-02 23:28:51 -07:00
friendica
ae82df4399 Merge https://github.com/friendica/red into pending_merge 2014-08-02 14:57:13 -07:00
friendica
85032a1fa3 db tables for extensible profile fields 2014-08-02 14:56:17 -07:00
Jeroen
32f09b5fc2 Update nl. Added a link from the edit profile page to the edit visibility page. 2014-08-01 17:45:18 +00:00
Paolo T
f40e315cb9 Merge pull request #550 from tuscanhobbit/master
IT: updated strings
2014-08-01 12:27:24 +02:00
Paolo Tacconi
e2ff843a80 IT: updated strings 2014-08-01 12:19:42 +02:00
friendica
6dd3a170a7 Merge https://github.com/friendica/red into pending_merge 2014-08-01 01:25:25 -07:00
friendica
ff8351437e make the profile minimal by default. Use features to enable the advanced form. 2014-08-01 01:24:03 -07:00
Jeroen
d126d02c65 Merge branch 'master' of https://github.com/friendica/red 2014-07-31 12:51:09 +00:00
Jeroen
c4e82772c0 Font sizes (temporary?) scaled down a bit. See 994b6b5258 2014-07-31 12:46:43 +00:00
friendica
56bbf58338 Merge https://github.com/friendica/red into pending_merge 2014-07-31 02:35:16 -07:00
friendica
0e57b6cc8c convert application strings to en-US 2014-07-31 02:33:34 -07:00
Jeroen
28e0e64643 nl: better translation hometown 2014-07-30 23:40:40 +00:00
Jeroen
316ee2febe update/upgrade nl 2014-07-30 22:41:37 +00:00
friendica
60e7837f00 implement the new friend activity post which has been missing for some time now 2014-07-29 19:26:17 -07:00
Jeroen
ca5992fade Stupid Bluefish 2014-07-29 19:14:01 +00:00
Jeroen
994b6b5258 As talked about earlier: set body font size to 0.8rem and post/comment font size to 1.0rem. This respects the user's browser font settings. Please comment if this changes the font sizes to much. There are some other font sizes that need to be changed to a scalable size (like btn-xs), but they don't have a priority. First see if this works. - Also made it possible for users to zoom on smart devices. - Small update to Redable. Aside is now disabled on almost all tablets in portrait mode. 2014-07-29 19:09:07 +00:00
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