Commit graph

2958 commits

Author SHA1 Message Date
friendica
196b3022bd Merge branch 'master' into movejs
Conflicts:
	version.inc
2014-01-06 02:37:06 -08:00
friendica
24450fe8ef likes to comments getting indented an extra 50px 2014-01-05 16:44:58 -08:00
friendica
daa7ee1275 make plink href visible 2014-01-04 15:42:51 -08:00
friendica
0c85c97480 move js files from core 2014-01-04 03:58:21 -08:00
Paolo T
5d14d85210 Merge pull request #255 from tuscanhobbit/master
Updated Italian translation
2014-01-04 02:23:06 -08:00
tuscanhobbit
6054da5157 Updated Italian translation 2014-01-04 11:21:33 +01:00
cvogeley
24850a4ea4 Merge pull request #254 from cvogeley/master
Webpage fixes for the moment without the fix for page not found after editing a webpage
2014-01-03 12:28:34 -08:00
Christian Vogeley
aafc40069b Confirm webpage deletion prompt 2014-01-01 16:18:39 +01:00
friendica
4c541bb680 expose profile things in the UI 2013-12-30 15:41:42 -08:00
friendica
0dd7d93674 basic edit and delete for things 2013-12-30 04:25:55 -08:00
friendica
f36be066af display_thing: it ain't much, but it's implemented. 2013-12-29 00:51:27 -08:00
friendica
22f614feba a bit more backend work on things 2013-12-28 17:04:23 -08:00
friendica
c59688553c remove prettyphoto from core - this will affect the enhanced photo albums feature on the short term which has been disabled until we figure out how to make the setting per-theme instead of a core option. The library is still available in core (library/prettyphoto) currently but needs to be moved to theme js and loaded/accessed from there [for themes which use it]. Then the library will be removed. It appears that other lightboxes commonly use rel= to group photo albums. So we may provide a generic rel= tag in photo album templates so that the choice of lightbox or album viewer is not only a theme option but could also be accomplished with plugins. 2013-12-26 13:08:16 -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
66600ed2f8 try again 2013-12-25 04:06:26 -08:00
friendica
fe00e9b261 extend the directory profiles a bit more 2013-12-25 01:57:04 -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
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
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
Thomas Willingham
ea31573e26 You'll probably be wanting the actual template too. 2013-12-23 18:58:48 +00:00
Tobias Diekershoff
79f002d943 DE: update to the strings 2013-12-23 13:33:31 +01:00
friendica
c1a85ccbec add ability to set created date/time from the api 2013-12-22 14:29:15 -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
Christian Vogeley
6480e14a91 Use the red matrix icons 2013-12-22 20:01:18 +01:00
Christian Vogeley
0f4b6ba371 Merge correction 2013-12-22 15:05:56 +01:00
Christian Vogeley
1a72239af0 Correction 2013-12-22 14:58:27 +01:00
Christian Vogeley
242bae5acd Merge 2013-12-22 14:55:28 +01: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
7e7b5bfa49 last remaining files to be Comanchified with the exception of mod_admin. Though I should probably take a third look to see if anything else uses widgets.
In fact - it appears that the flattrwidget does.
2013-12-22 02:16:45 -08: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
a084a3fa47 comanchify mod_search - we've got three modules left to Comanchify: admin, directory and message - each of which introduces "interesting challenges" 2013-12-20 01:39:42 -08:00
friendica
2c0fbc508e comanchify connedit, group 2013-12-19 23:56:37 -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
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