Commit graph

8979 commits

Author SHA1 Message Date
friendica
9d9fc6e2dc mod_invite - don't generate errors for email addresses consisting of blank lines 2013-12-25 17:08:32 -08:00
friendica
b7686b2a50 missing end div 2013-12-25 16:58:59 -08:00
friendica
1430db5ea8 and add a border for delineation 2013-12-25 16:57:48 -08:00
friendica
eda7c24c4e improve the register text until the new register page is finished 2013-12-25 16:53:59 -08:00
friendica
c5c5e8b4e0 knock a couple of items off the to-do list. There may still be some associated issues and/or feature requests but we'll deal with those separately. 2013-12-25 14:22:42 -08:00
friendica
66600ed2f8 try again 2013-12-25 04:06:26 -08:00
friendica
6c0a3f31bb didn't work 2013-12-25 02:48:59 -08:00
friendica
4ec569d6e7 sslify http links in media elements if you're on an https server 2013-12-25 02:45:22 -08:00
friendica
c1875bcc37 cut/paste error 2013-12-25 02:04:52 -08:00
friendica
fe00e9b261 extend the directory profiles a bit more 2013-12-25 01:57:04 -08:00
friendica
48f882c34b Merge https://github.com/friendica/red into zpull 2013-12-25 01:24:14 -08:00
friendica
5dee22c94d db update for directory profiles - and fix broken database.sql from the sys_perms addition a couple days back 2013-12-25 01:22:51 -08:00
friendica
b1ade138ff use colorbox for single photo viewing (replacing prettyPhoto, which may have license incompatibilities). Also set maximum size of a directory popup and let it scroll after that in case somebody set their profile keywords to the content of Webster's dictionary. 2013-12-25 01:05:46 -08:00
Thomas Willingham
96d150bf2b Add cutsom/ to gitignore 2013-12-24 15:43:46 +00:00
friendica
71dde7c687 use case-insensitive array search for matching directory keywords with your own 2013-12-23 22:56:32 -08:00
friendica
80879369e7 get around size limit 2013-12-23 20:18:04 -08:00
friendica
1c5fe5a1ac set the height so colorbox can set its size correctly 2013-12-23 20:04:00 -08:00
friendica
4e3a2c5f28 make sure resize fires 2013-12-23 19:51:51 -08:00
friendica
8194ade886 improve the directory popup a bit 2013-12-23 19:44:23 -08:00
friendica
766454a607 first thing to make it less annoying is to only popup if you click. Will improve on it later - but this gives us something we can test to improve the popup contents. 2013-12-23 18:59:49 -08:00
friendica
b08d4cc1fe first cut at a directory popup. It's a bit annoying at the moment, so we'll have to make it less so. Also had second thoughts about the project homepage changes made yesterday. Just because a bunch of Reddit trolls can't get social networking out of their brain long enough to explore other technologies or even read the project page doesn't mean we should pander to them and explain how or why we either are or aren't a social network. 2013-12-23 17:24:25 -08:00
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
9daa647855 s/zrl/zid 2013-12-23 21:01:49 +00:00
friendica
4517bdcff1 Merge https://github.com/friendica/red into zpull 2013-12-23 12:01:53 -08:00
friendica
45a4c649ed oops 2013-12-23 12:01:38 -08:00
Thomas Willingham
ea31573e26 You'll probably be wanting the actual template too. 2013-12-23 18:58:48 +00:00
Thomas Willingham
50e39c330d Zidification of author links in webpages. 2013-12-23 18:41:41 +00:00
tobiasd
cefa82b645 Merge pull request #252 from tobiasd/DE20131223
DE: update to the strings
2013-12-23 04:35:32 -08:00
Tobias Diekershoff
79f002d943 DE: update to the strings 2013-12-23 13:33:31 +01:00
Thomas Willingham
3ac659e9c5 Reduce life of xref cookie per Opinion 04/2012 on Cookie Consent Exemption.
Otherwise, we need to annoy everyone with cookie warnings if they access
a hub in the EU.
2013-12-23 04:58:12 +00:00
friendica
ca05565fcc one step closer to merging register and pubsites pages 2013-12-22 20:07:18 -08:00
friendica
dcc58dec00 Provide Terms of Service placeholder page (includes doc/SiteTOS.md) 2013-12-22 19:56:22 -08:00
friendica
6fcc4beac5 still not entirely happy with the text. So I'm playing with it a bit. 2013-12-22 19:19:12 -08: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
eff38538ee more (somewhat minor) but important cleanup for mod_photos so visitors with the correct permissions to add photos can also remove them 2013-12-22 17:44:14 -08:00
friendica
a9e225b38a issue deleting photos (attached item remained undeleted and became visible, though the photo was gone) 2013-12-22 17:30:49 -08:00
friendica
38df3f6404 make xref work 2013-12-22 16:53:26 -08:00
friendica
7d484969dd more proof-reading 2013-12-22 16:47:14 -08:00
friendica
be19eb045c proof-read 2013-12-22 15:53:08 -08:00
friendica
6e5173f430 let's confront this "social network" elephant in the room head on rather than try to sweep it under the rug. 2013-12-22 15:51:02 -08:00
friendica
c1a85ccbec add ability to set created date/time from the api 2013-12-22 14:29:15 -08:00
friendica
97728543c1 clean up sys_channel creation so it will work 2013-12-22 14:08:38 -08:00
friendica
42361588e9 Merge https://github.com/friendica/red into zpull 2013-12-22 13:51:08 -08:00
friendica
77fdb4a1ee js functions behind quick permission links were lost in comanchification process - because the js didn't get relocated to the new connedit module 2013-12-22 13:49:32 -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
friendica
bb623fc464 Merge pull request #250 from beardy-unixer/master
Various bits
2013-12-22 13:44:00 -08:00
Thomas Willingham
0d5c5187f9 Style 2013-12-22 21:15:13 +00:00