jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
8598 commits 10 branches 58 tags 216 MiB
Commit graph

8598 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tobias Diekershoff
be41aa1c6c move READMEs to .md, added some notes about addon translations 2014-07-07 13:03:05 +02:00
tobiasd
0185f867bb Merge pull request #1035 from Beanow/hotfix/user-menu 
Minor bugfixes in nav.php
 2014-06-27 20:40:24 +02:00
tobiasd
0a92c2fe4e Merge pull request #1037 from Beanow/feature/expose-profile-data 
Exposes new profile data for templating.
 2014-06-27 20:39:36 +02:00
Beanow
a3895c8dee Exposes new profile data for templating. 
* Boolean value of whether multi_profiles is enabled.
* Array needed for yesno_field for the hide-friends option.
 2014-06-27 18:12:15 +02:00
Beanow
0225652a53 Minor bugfixes in nav.php: 
* Added videos to usermenu
* Fixed alt for personal notes
 2014-06-27 16:46:11 +02:00
tobiasd
3600ab1ffc Merge pull request #1033 from annando/master 
Temporary paths are now defined automatically
 2014-06-24 06:29:35 +02:00
Michael Vogel
79f7f609b3 dbstructure: the indexes for longer table fields are now shortened 2014-06-23 01:27:00 +02:00
Michael Vogel
14bacc1e8c markdown export for libertree now handles horizontal tulers correct. 2014-06-23 01:25:58 +02:00
Michael Vogel
5ed5773f57 The temporary paths (temp, lock, itemcache) are now detected automatically when used. 2014-06-23 01:24:39 +02:00
tobiasd
07fff2c3f5 Merge pull request #1030 from tobiasd/20140622 
renew master message.po
 2014-06-22 11:18:21 +02:00
Tobias Diekershoff
e52bc5989b redo util/message.po 2014-06-22 11:15:40 +02:00
tobiasd
9248c2c3c4 Merge pull request #1029 from tobiasd/fix1027 
don't add http:// if homepage is not set
 2014-06-22 09:47:53 +02:00
Tobias Diekershoff
b6e546d1e3 don't add http:// if homepage is not set 2014-06-22 09:44:59 +02:00
tobiasd
64946972b2 Merge pull request #1028 from tugelbend/master 
Vagrant configuration to instantiate development boxes easily
 2014-06-22 09:36:25 +02:00
hauke
b8b9675f59 remove NFS option for vagrant folder as this doesn't work on windows machines 2014-06-21 20:26:11 +02:00
Hauke Altmann
e89e8d2914 adjusted configuration due to problems with mailcatcher 2014-06-20 18:32:40 +02:00
Hauke Altmann
c23de3a64e added vagrant configuration for running a friendica development instance 2014-06-20 16:05:44 +02:00
Michael Vogel
38fb43702f Vier: Preview picture in admin settings is now smaller 2014-06-20 00:01:20 +02:00
Michael Vogel
7eea5fc212 Merge remote-tracking branch 'upstream/master' 2014-06-19 23:01:33 +02:00
tobiasd
7aaf22a2c1 Merge pull request #1023 from tobiasd/fixaddontrans 
make translation of addons work again
 2014-06-18 21:21:17 +02:00
Tobias Diekershoff
8bfd506051 make translation of addons work again 2014-06-18 21:18:50 +02:00
Michael Vogel
297d8a6cc6 The icon for the website is now changeable in the config 2014-06-17 20:11:35 +02:00
tobiasd
cf49259317 Merge pull request #1022 from AlfredSK/master 
Fixed two typos in strings.php and BBCode.md
 2014-06-17 17:16:30 +02:00
AlfredSK
75dd860292 Fixed two typos in strings.php and BBCode.md 2014-06-17 14:20:23 +02:00
Michael Vogel
e0219cf6af API: Support of privacy_image_cache for calls without entities added 2014-06-16 22:36:59 +02:00
Michael Vogel
a1dbfdee65 API: Support of privacy_image_cache - if enabled 2014-06-16 21:49:45 +02:00
tobiasd
83ac685deb Merge pull request #1018 from annando/master 
Solved install issues, support for predefined preview picture in page info function
 2014-06-16 09:00:07 +02:00
Michael Vogel
8bce8b0bd2 Vier: The setting for defining the default style is now working 2014-06-16 00:00:05 +02:00
Michael Vogel
a05ed41fb2 Only some code cleanup 2014-06-15 23:33:25 +02:00
Michael Vogel
52474847cb New function to fetch image information. (Will be used in the addons at a later time) 2014-06-15 23:32:14 +02:00
Michael Vogel
ac78989fc9 shortening message: Solved issue with non latin characters 2014-06-15 20:46:56 +02:00
Michael Vogel
2747c19bdd Vier: Border between side menu and content in "flat" style 2014-06-15 19:37:14 +02:00
Michael Vogel
dd685a4afc The network widget is now ordered by network name 2014-06-15 18:51:46 +02:00
Michael Vogel
e1c7c2b092 Merge remote-tracking branch 'upstream/master' 2014-06-15 18:26:59 +02:00
Michael Vogel
029633c16d Merge pull request #1020 from silke/vier-border-radius 
Vier border radius
 2014-06-15 18:26:23 +02:00
Silke Meyer
f70bdb984f A few more changes for breathe style in vier. 2014-06-15 18:16:02 +02:00
Silke Meyer
7fdcc15182 same drop-down menu for contact details as for user menu 2014-06-15 14:57:52 +02:00
Silke Meyer
321c711a3d top bar icons stay dark upon hover 2014-06-15 13:35:34 +02:00
Silke Meyer
dd1b28314e space between logo and sitename 2014-06-15 13:25:27 +02:00
Michael Vogel
e6328104ea dbstructure: New tables wasn't created due to some bugs 2014-06-15 10:47:20 +02:00
tobiasd
f23f6ca9c6 Merge pull request #1017 from silke/vier-border-radius 
Vier border radius
 2014-06-15 08:33:43 +02:00
Silke Meyer
d738395b0f active tab 2014-06-15 02:00:25 +02:00
Michael Vogel
82c4e3fe50 The page info function can now be called with a picture link, support for big and preview images for attachments in global.css 2014-06-15 01:59:19 +02:00
Silke Meyer
564ec8053a top nav bar colors 2014-06-15 01:58:18 +02:00
Michael Vogel
4c9a6ed2fb BBCode: Support for preview parameter in attachment, rearranged code for share 2014-06-15 01:57:31 +02:00
Michael Vogel
724a5192da Merge remote-tracking branch 'upstream/master' 2014-06-15 01:49:03 +02:00
Michael Vogel
83935d6797 API: Corrected wrong variable name 2014-06-15 01:48:35 +02:00
Silke Meyer
44dacd1d82 Just kept the differences for "breathe" style 2014-06-15 01:35:41 +02:00
Silke Meyer
f15dec16d1 bg color and selected tab brighter 2014-06-15 00:56:05 +02:00
Silke Meyer
cb1f52ad93 added style to theme.php 2014-06-15 00:26:49 +02:00