Commit graph

10885 commits

Author SHA1 Message Date
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
friendica
e7d401f387 Merge branch 'master' of https://github.com/RedMatrixCanada/red into RedMatrixCanada-master 2014-07-24 18:57:34 -07:00
friendica
10641b5598 issues #542 #543 - mentions not linked on editing a post if they contained a forum indicator. 2014-07-24 16:48:58 -07:00
mycocham
936f596af4 French Translations 2014-07-24 19:23:03 -04:00
friendica
e331f9f6e7 Merge https://github.com/friendica/red into pending_merge 2014-07-24 15:57:04 -07:00
friendica
5a5190f2ff add an encoding type to formatted zot communication structures so that we can later add alternate encodings. 2014-07-24 15:55:01 -07:00
marijus
9001406346 update to bootstrap-3.2 and minor css adjustments 2014-07-24 13:51:06 +02:00
friendica
0f14dd30db allow jotnets to work with rpost 2014-07-23 21:17:40 -07: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
friendica
c54ff59a78 Merge https://github.com/friendica/red into pending_merge 2014-07-23 16:42:46 -07:00
friendica
cf2172f9ec rev update 2014-07-23 16:42:23 -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
9e500494ff standards compliance 2014-07-22 21:05:18 -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
friendica
1476812e90 add another important note 2014-07-22 17:21:13 -07:00
friendica
b29f087cdc provide ability to blacklist sites from "Discover". 2014-07-22 17:17:33 -07:00
friendica
c061cc0955 sql string unquoted 2014-07-22 04:37:51 -07:00
friendica
dd215607f3 paranoia tweaks 2014-07-21 21:28:45 -07:00
friendica
68b7dc48bb the "page 2 shows up on top of page 1 when you wake up in the morning" bug. See the comments. 2014-07-21 21:15:03 -07:00
friendica
27908d944d Merge https://github.com/friendica/red into pending_merge 2014-07-20 00:24:48 -07:00
friendica
f65890091e add more control to auth paranoia setting 2014-07-20 00:24:12 -07:00
friendica
67000917f4 doc updates 2014-07-20 00:23:35 -07:00
Paolo T
0e40d1cc5b Merge pull request #539 from tuscanhobbit/master
IT: updated strings
2014-07-19 11:50:35 +02:00
tuscanhobbit
7b8edeaead IT: updated strings 2014-07-19 11:47:48 +02:00
friendica
2721d58a1c correct the permissions on profile page 2014-07-17 22:07:23 -07:00
friendica
9e988afa1f ensure that we don't have permission settings issues due to version skew across sites. 2014-07-17 20:59:58 -07: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
0cb81714d8 better handling of interactive likes 2014-07-17 19:07:39 -07:00
friendica
39632f65b6 confirm that something was done. 2014-07-17 18:25:52 -07:00
friendica
bfe4bdc30b make mod_like interactive if requested 2014-07-17 18:20:12 -07:00
friendica
437b0cb16e collection sync issue 2014-07-17 15:53:07 -07:00
friendica
5d5dde174e tinmymce zombie - kill it. 2014-07-17 01:25:21 -07:00
friendica
de97073e13 don't subdue archived connections in viewconnections 2014-07-16 22:32:18 -07:00
friendica
98e85917bb subdue archived connections in group editor and don't show at all in contact_block() 2014-07-16 22:21:29 -07:00
friendica
feb23fc9bc collection sync 2014-07-16 21:18:28 -07:00
friendica
b0a4a48ceb Merge https://github.com/friendica/red into pending_merge 2014-07-16 17:40:24 -07:00
friendica
bd75b68a7c shield share meta info from markdown processing. 2014-07-16 17:39:40 -07:00
friendica
f11856f839 allow a site to run cron daily at a chosen hour 2014-07-16 16:21:01 -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
friendica
3a31ddea2b provide os_mkdir to workaround permission issues with php mkdir 2014-07-16 01:07:00 -07:00
friendica
0435a08f3b fix rename_system_url() for the case of somebody who has no local xchan_url (was cloned from elsewhere and is not primary) 2014-07-15 17:11:43 -07:00