Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-01 10:09:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
22298 commits 3 branches 64 tags 241 MiB
Commit graph

22298 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Vogel
eb592030eb Merge remote-tracking branch 'upstream/master' into 1409-diaspora-repeated-twitter-cleanup 2014-09-29 09:42:47 +02:00
fabrixxm
3a0b18fa36 Merge pull request #1168 from annando/1409-application-source-name 
API: Detecting the source name of the application
 2014-09-29 09:24:41 +02:00
fabrixxm
d60122e7a6 Merge pull request #1166 from annando/1409-issue-1158 
issue #1158 - and other stuff that I didn't wanted to merge (I hate GIT)
 2014-09-29 09:23:09 +02:00
Michael Vogel
335855a40b API: Fetching the application name of the client. 2014-09-28 17:23:01 +02:00
tobiasd
a6e3a2361f Merge pull request #1167 from tobiasd/20140928 
updating the translations from transifex
 2014-09-28 15:08:58 +02:00
Tobias Diekershoff
74be3ac543 updating core translations from transifex 2014-09-28 15:04:54 +02:00
Michael Vogel
2b26181509 Issue 1158: muting of threads now works with the API as well. 2014-09-28 00:42:27 +02:00
Michael Vogel
778ed772d2 Diaspora: Repeated items from twitter to Diaspora now only include a link, since Diaspora is showing the whole tweet. 2014-09-27 23:39:06 +02:00
Michael Vogel
21c09c0732 API: Set the application name to "api" (if not defined), "remote_self" has an application name as well. 2014-09-27 23:37:05 +02:00
fabrixxm
bd0b93e630 Merge pull request #1165 from annando/1409-issue-1157 
Issue 1157: Unused javascript function is removed.
 2014-09-27 19:03:20 +02:00
fabrixxm
c1e986e5c4 Merge pull request #1161 from annando/master 
Security issue: Encoding of GUID in itemcache to avoid directory bypassing with a malificious formatted GUID.
 2014-09-27 18:20:39 +02:00
Michael Vogel
2bbd7ab67f Issue 1157: Unused javascript function is removed. 2014-09-27 14:17:50 +02:00
Michael Vogel
459fc2fabd Security issue: Encoding of GUID in itemcache to avoid directory bypassing with a malificious formatted GUID. 2014-09-27 12:49:00 +02:00
fabrixxm
c965792c07 Merge pull request #1157 from tugelbend/master 
bug fix #1135, "show more" is usable again
 2014-09-22 17:12:34 +02:00
hauke
2743514791 bug fix #1135, show more is usable again 2014-09-22 13:53:16 +02:00
fabrixxm
4ec5974074 Merge pull request #1155 from fabrixxm/master 
fix #1151, fix #1150
 2014-09-20 12:18:48 +02:00
fabrixxm
f6cebf607f remove unneeded htconfig templates 2014-09-20 12:14:59 +02:00
fabrixxm
f6cfdf4af1 remove uneeded email templates 2014-09-20 12:10:24 +02:00
fabrixxm
b95e746259 allow mod/view in install mode to load pcss files. Fix unstiled install 2014-09-20 12:09:10 +02:00
fabrixxm
d2afb263ae Set internal PuSH server as default 2014-09-20 12:08:10 +02:00
fabrixxm
5d1c7b4e4f Cleanup mods folder and remove privacy_image_cache from docs. fix #1151 2014-09-20 11:41:44 +02:00
fabrixxm
0dd3aaf82b Merge pull request #1154 from fabrixxm/master 
fix residual curCSS, should fix #1153
 2014-09-20 11:26:44 +02:00
fabrixxm
6da5cf8037 fix residual curCSS, should fix #1153 2014-09-20 11:24:06 +02:00
fabrixxm
e85d7b9235 Merge pull request #1149 from fabrixxm/quattro_fixs 
Quattro fix and other
 2014-09-17 11:09:54 +02:00
Fabrixxm
133b5bca59 fix oembed video template 2014-09-17 11:02:58 +02:00
Fabrixxm
51e6c30188 add id to album name tag 
this should be in template
 2014-09-17 11:02:18 +02:00
Fabrixxm
f971f52482 remove messages link from notification tabs bar 2014-09-17 11:01:47 +02:00
Fabrixxm
fbe664cc44 fix settings page aside menu active item 
add aside menu to delegate page
 2014-09-17 11:00:34 +02:00
Fabrixxm
d1029e1fb2 tweak quattro theme 2014-09-17 10:59:19 +02:00
Fabrixxm
3031457c36 Merge branch 'Beanow-feature/collapse-menulink' into friendica/master 2014-09-17 08:59:01 +02:00
Fabrixxm
5bc69ccc70 remove dollar sign 2014-09-17 08:57:53 +02:00
Fabrixxm
c9a5038a7a Merge branch 'feature/collapse-menulink' of https://github.com/Beanow/friendica into Beanow-feature/collapse-menulink 2014-09-17 08:54:46 +02:00
fabrixxm
50a28a6c7b Merge pull request #1147 from tugelbend/master 
small js bug fix, vagrant works again
 2014-09-17 08:49:54 +02:00
Beanow
01b4f7d29a Menu links now collapse if clicked again. 2014-09-16 01:21:27 +02:00
hauke
f68df6a9b0 made vagrant partly work again 2014-09-15 19:48:47 +02:00
hauke
76535578ba bug fix: live function is deprecated 2014-09-15 19:48:17 +02:00
tobiasd
c78c88c266 Merge pull request #1144 from tobiasd/docs2014 
documentation
 2014-09-14 21:37:31 +02:00
Tobias Diekershoff
94640d32fd missing ? 2014-09-14 09:17:21 +02:00
Tobias Diekershoff
de103ff273 added list of clients to the FAQ 2014-09-14 09:06:47 +02:00
Tobias Diekershoff
d2512f5aa5 add API docs to home.md 2014-09-13 08:10:03 +02:00
tobiasd
9df7aeee55 Merge pull request #1143 from annando/master 
Bugfix: "nurl" wasn't set/"remoteconnect" was missing in several templates
 2014-09-12 06:58:41 +02:00
Michael Vogel
f9bec79a2c In the profiles the remote connect field was missing 2014-09-11 23:38:24 +02:00
Michael Vogel
c8482ae19e Bugfix: When repairing the url, the nurl wasn't set. 2014-09-11 23:37:55 +02:00
fabrixxm
dc4accf5be Merge pull request #1142 from fabrixxm/quattro_update 
fix quattro scroll and flash and vier flash on display page
 2014-09-11 19:01:20 +02:00
fabrixxm
fd97f3013d fix quattro scroll and flash and vier flash on display page 2014-09-11 18:56:33 +02:00
fabrixxm
81c2214f4f Merge pull request #1140 from fabrixxm/master 
Update IT strings
 2014-09-10 19:08:07 +02:00
fabrixxm
df1f9d5eb7 Update IT strings 2014-09-10 19:05:43 +02:00
fabrixxm
c05376a53e Merge pull request #1139 from fabrixxm/notifix 
Override 'enotify_no_content' system option if type is SYSTEM_EMAIL
 2014-09-10 18:33:01 +02:00
fabrixxm
8f2f7f8380 Override 'enotify_no_content' system option if type is SYSTEM_EMAIL 2014-09-10 18:30:30 +02:00
fabrixxm
c311db4420 Merge pull request #1138 from fabrixxm/notifix 
fix some emails
 2014-09-09 22:10:16 +02:00