Commit Graph

3049 Commits

Author SHA1 Message Date
friendica
49d2ada4f8 Merge https://github.com/friendica/red into zpull 2013-12-23 15:15:56 -08:00
friendica
63a42480c7 add account_level, is_foreigner and is_member functions; convert all e2ee user input and prompts to hex to avoid javascipt's lame handling of quotes. !!This breaks all prior encrypted posts.!! 2013-12-23 15:13:09 -08:00
friendica
f3abd76e04 Merge pull request #253 from cvogeley/master
Show expire date in post tooltip
2013-12-23 14:10:51 -08:00
Christian Vogeley
84d8fab6f1 Show expire date in post tooltip 2013-12-23 22:29:35 +01:00
Thomas Willingham
50e39c330d Zidification of author links in webpages. 2013-12-23 18:41:41 +00:00
friendica
1a42580ad4 remove a couple of mysql reserved words from being used as table or row names. For this round we're getting 'group' and 'desc'. Warning: potentially destabilising as this touches a lot of code. 2013-12-22 18:37:39 -08:00
friendica
97728543c1 clean up sys_channel creation so it will work 2013-12-22 14:08:38 -08:00
friendica
30219b5bda Merge pull request #249 from cvogeley/master
New modal dialog for item expiry
2013-12-22 13:44:34 -08:00
Thomas Willingham
0d5c5187f9 Style 2013-12-22 21:15:13 +00:00
Thomas Willingham
2074bd0a3b Must have broken that in a merge - put it back 2013-12-22 21:13:24 +00:00
Thomas Willingham
c4b4f27796 Some sys chan stuff 2013-12-22 20:47:57 +00:00
Christian Vogeley
870df76463 Merge remote-tracking branch 'upstream/master' into bootstrap
Conflicts:
	view/php/theme_init.php
2013-12-22 14:31:27 +01:00
Christian Vogeley
25a533bd72 New modal dialog for item expiry 2013-12-22 14:21:57 +01:00
friendica
0366991b45 appears that I missed a few files for Comanchification. so here's mitem. 2013-12-22 02:04:55 -08:00
friendica
d32bbaf599 split private messages into two modules - "message" is just for message lists, "mail" is for reading and writing conversations. This is so we can Comanchify it cleanly. 2013-12-21 23:47:44 -08:00
friendica
aa312f72bf comanchify mod_directory. Two modules remaining. Actually three because message needs to be split. 2013-12-20 12:43:04 -08:00
friendica
2c0fbc508e comanchify connedit, group 2013-12-19 23:56:37 -08:00
friendica
cd78f9d13d sourced items which are then edited at the source weren't setting up the second delivery chain. 2013-12-19 20:23:19 -08:00
friendica
bccc20f38c default photo issue, and connections page showing deleted accounts. Also show last updated on connedit page 2013-12-19 19:16:46 -08:00
friendica
564f431551 comanchificate mod_photos 2013-12-19 17:36:31 -08:00
friendica
7c81889b33 make default profile photo configurable - should be functional but needs admin ui 2013-12-19 16:33:36 -08:00
friendica
f8042cc467 add 'src' parameter to api photo list 2013-12-19 15:23:36 -08:00
friendica
e6dc916915 if somebody tagged you in a private post, the tag email notification contained the obscured message. Clear it. 2013-12-19 13:52:23 -08:00
friendica
825492407e more comanche 2013-12-19 02:35:45 -08:00
friendica
b28a37c38e more comanche 2013-12-19 02:25:44 -08:00
friendica
125543aded more comanche migration 2013-12-19 02:16:14 -08:00
friendica
38fd8410eb split off mod_connections into mod_connections & mod_connedit - lots of links to fix 2013-12-18 01:00:08 -08:00
friendica
7b5a42568a Tricky little bug. Allowed somebody to bypass comment permissions. Hopefully the fix will have no undesired side effects. 2013-12-16 18:07:41 -08:00
friendica
065300f7c3 bloody hell - it isn't defined either. 2013-12-15 18:43:54 -08:00
friendica
817d146123 bloody hell... php version incompatibility with openssl - openssl no longer accepts a string as an algorithm. Earlier versions didn't recognise sha256. So we'll look to see if the algorithm constant for sha256 is defined and if so we'll use that instead of the string. 2013-12-15 18:30:10 -08:00
friendica
950bd72e02 use sitename for the banner if nothing else has been set 2013-12-14 21:37:37 -08:00
friendica
d14e2db6b4 make home.html fullpage mode - make directory search work for non-logged in, but leave off suggest and invite 2013-12-14 17:03:37 -08:00
friendica
c00f0d4b28 a couple more comanche conversions 2013-12-14 13:26:40 -08:00
friendica
0215043826 prepare for Comanchification of mod_photos 2013-12-13 13:30:33 -08:00
friendica
94975f8d30 categories should already be html encoded - ensure this is the case but don't double encode 2013-12-13 12:30:44 -08:00
friendica
65c0b84313 always load css and js sources using the same url as the page that is being visited so there is no http/https mismatch. 2013-12-12 18:13:52 -08:00
zottel
3a11980e49 htmspecialchars_decode only takes one argument. 2013-12-12 13:32:11 +01:00
friendica
303324cdff more htmlspecialchars sanitisation 2013-12-12 02:15:02 -08:00
friendica
b3fe221b7f issue #240 - we were using htmlentities instead of htmlspecialchars in several places, and this was a bit greedy in the set of characters which were converted from utf-8 to HTML entities. Also brought mail attachments up to date so they are rendered identically to item attachments. 2013-12-11 23:13:36 -08:00
friendica
18f0ab2605 cmax wasn't defaulting correctly 2013-12-11 19:56:57 -08:00
friendica
b4e1e8a4a4 The affinity tool is not a "traditional" widget. But it is nevertheless a widget. It just makes fewer page layout decisions which are hard-coded. If you want to shrink it down and put it on the sidebar in your theme, go for it. 2013-12-11 19:43:41 -08:00
friendica
2f46bacded head_remove_css, head_remove_js 2013-12-11 18:29:56 -08:00
friendica
c57b6745e8 Merge https://github.com/friendica/red into zpull
Conflicts:
	view/theme/redbasic/css/style.css
2013-12-11 15:32:25 -08:00
friendica
06c81e189f Merge pull request #239 from git-marijus/master
make empty notes saveable as well
2013-12-11 15:35:54 -08:00
friendica
40e2900326 comanchify all the simple cases - those that only load a profile. Rework permission checks for the profile sidebar so that it is all done internally. Remove crepair which we aren't using. 2013-12-11 14:54:36 -08:00
marijus
aea1e1af82 this makes quotes appear as quotes in notes once page is reloaded. i guess thats fine since we use escape_tags() in notes.php 2013-12-11 18:57:42 +01:00
Thomas Willingham
d93ba783f5 Don't let nobody set an xconfig in safe search. 2013-12-11 15:35:19 +00:00
marijus
1d8c15f2df make suggest channels a feature 2013-12-11 12:01:28 +01:00
friendica
652959678f cleanup and Comanchification of mod_profile 2013-12-10 23:27:17 -08:00
friendica
e5ea4a009b mod channel is now Comanchified 2013-12-10 20:36:11 -08:00