Commit Graph

10845 Commits

Author SHA1 Message Date
friendica 28c43395dc derivative themes not loading parent theme includes when visiting /cloud 2014-07-28 21:31:30 -07:00
friendica 3a108168c7 Merge https://github.com/friendica/red into pending_merge 2014-07-28 21:03:55 -07:00
friendica f0f6f1e080 Start of a comprehensive Privacy Policy document 2014-07-28 21:03:10 -07:00
Jeroen 2e6dd91599 14px>12pt as agreed on https://github.com/friendica/red/commit/075fc6727762d4e45ddcae5843eec0100ad3ab72 - 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 73a0d8b5a7 restrict categories list to items that aren't deleted 2014-07-27 13:44:12 -07:00
friendica 3d7d6ec21f honour sys channel permissions for who can view the sys owned content 2014-07-26 18:48:25 -07: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
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