Commit Graph

15020 Commits

Author SHA1 Message Date
redmatrix
a498fc8e72 looks like there may be issues with the datetime picker if the local timezone isn't the same as your settings. 2015-10-25 21:17:02 -07:00
redmatrix
7063b6cb6d Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-10-25 16:54:43 -07:00
redmatrix
917d0ced4a new feature: delayed posting 2015-10-25 16:54:18 -07:00
redmatrix
969418ce73 Merge pull request #99 from HaakonME/master
Hubzilla on OpenShift - now with plugins and extra themes
2015-10-26 09:40:54 +11:00
redmatrix
7f3df847a2 make use of http_host vs. server_name configurable in script_path() 2015-10-25 15:37:09 -07:00
redmatrix
e0424fe6cc Merge pull request #100 from StefanKrauth/master
Better handling for SSL reverse proxy
2015-10-26 09:32:03 +11:00
redmatrix
b67397861c Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-10-25 14:33:57 -07:00
redmatrix
de15a2ace1 version update 2015-10-25 14:32:02 -07:00
redmatrix
4369ee2ca7 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-10-25 14:26:35 -07:00
redmatrix
a1163b70a6 version and strings 2015-10-25 14:26:02 -07:00
Stefan Krauth
2030aea175 Better handling for SSL reverse proxy 2015-10-25 20:10:35 +01:00
Haakon Meland Eriksen
969b66b315 Hubzilla on OpenShift - now with plugins and extra themes 2015-10-25 18:18:49 +01:00
Mario Vavti
4442da306a hubzilla compatibility: improve photo item object - we now provide the infos for all available photo sizes 2015-10-25 18:02:45 +01:00
Mario Vavti
911fd6c654 improve photo item object - we now provide the infos for all available photo sizes 2015-10-25 18:01:44 +01:00
Haakon Meland Eriksen
9cee3dda1f Add DeadSuperHero Themes for Hubzilla to deploy 2015-10-25 17:56:32 +01:00
Haakon Meland Eriksen
cc0f026cec Adding Hubzilla addons to deploy script 2015-10-25 17:07:33 +01:00
Haakon Meland Eriksen
f1b5c333ff Adding Hubzilla addons to deploy script 2015-10-25 17:01:13 +01:00
Mario Vavti
123fe58c26 new line between photo and description 2015-10-24 22:16:08 +02:00
Mario Vavti
fd1e163bf4 Merge branch 'master' of https://github.com/redmatrix/hubzilla 2015-10-24 21:44:45 +02:00
Mario Vavti
ab8b4d5c36 another try to avoid dubble photo deletion. allow to set a photo caption and simple status body (if create status post is enabled) on upload 2015-10-24 21:44:25 +02:00
Wave
4a044351a9 Merge pull request #97 from wave72/master
Italian strings updated
2015-10-24 12:15:15 +02:00
wave72
e0a2268b0e Italian strings updated 2015-10-24 12:13:17 +02:00
redmatrix
3432771150 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-10-23 21:36:40 -07:00
redmatrix
768615f2f1 version and strings 2015-10-23 21:36:18 -07:00
Mario Vavti
9ae215291f fix app.tpl missing </div> tag if not authenticated 2015-10-23 10:20:01 +02:00
redmatrix
1cf206d764 update the to-do list 2015-10-22 17:27:20 -07:00
redmatrix
4c406ec9c0 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-10-22 17:20:52 -07:00
redmatrix
500b896d50 revision 2015-10-22 17:20:35 -07:00
git-marijus
18a239e808 Merge pull request #96 from mcnesium/master
fix placeholder font-family
2015-10-22 13:54:52 +02:00
mcnesium
5aa07bda7c Merge pull request #1 from mcnesium/placeholder-font
fix placeholder font-family
2015-10-22 13:45:34 +02:00
mcnesium
379fd33484 fix placeholder font-family
[Imgur](http://i.imgur.com/Cegabd5.png)
2015-10-22 13:44:33 +02:00
Mario Vavti
ed6629002f photo object fixes 2015-10-22 13:01:33 +02:00
Mario Vavti
bcb4ac7aae experiment: put the photo-item photo on top of the post 2015-10-22 12:58:11 +02:00
Mario Vavti
5395b173aa implement the new anchor target behaviour 2015-10-22 12:09:19 +02:00
Mario Vavti
735f9c7a45 define $photo 2015-10-22 11:37:34 +02:00
Mario Vavti
9cbca24f7a photo object compatibility revamped 2015-10-22 10:56:24 +02:00
Mario Vavti
6f8d29ad80 move photo object stuff from itemObject to prepare_body() so we can do more stuff with it 2015-10-22 10:52:10 +02:00
redmatrix
eb947acebe set link target window for many links that are included in posts, but not in rest of application 2015-10-21 18:34:09 -07:00
redmatrix
01e84edd0a Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-10-21 15:02:32 -07:00
redmatrix
b7538b6ada turn relative links in app_render() into absolute links, without affecting the install. 2015-10-21 15:00:41 -07:00
Mario Vavti
232742a5e6 warn if quota exceeds 90% of storage limit 2015-10-21 12:52:03 +02:00
Mario Vavti
a33ddf373b move file storage quota display to upload section. add a warning if remaining space is less than 100MB and fix % calculation 2015-10-21 12:40:09 +02:00
redmatrix
b57e735199 old merge conflict 2015-10-20 21:34:58 -07:00
redmatrix
38816d7e41 move quota display to where it's visible on a tablet 2015-10-20 18:48:14 -07:00
jeroenpraat
3a89bb0db2 fix image path 2015-10-20 17:25:44 +02:00
Mario Vavti
865c38995d some photos cant be deleted under certain circumstances - needs more investigation. revert this until a better fix is found. 2015-10-20 13:43:35 +02:00
Mario Vavti
beae28f2db add obj_type and object again 2015-10-20 13:19:05 +02:00
Mario Vavti
81b2c5ac68 fix jot photo upload 2015-10-20 13:03:28 +02:00
Mario Vavti
35b5f60f99 update large photo feature setting description 2015-10-20 09:58:48 +02:00
Mario Vavti
13d0db5f9a css cleanup 2015-10-20 09:47:30 +02:00