keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
8915 commits 4 branches 0 tags 179 MiB
Commit graph

8915 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
fabrixxm
7687342849 fix email for 
- registration request
- registration approval
- account created by admin

add a reditect after registration approval or deny
 2014-09-09 22:07:47 +02:00
Tobias Diekershoff
9c1ee29911 current API documentation from the github wiki 2014-09-09 08:41:58 +02:00
Tobias Diekershoff
67bfb30f71 copy of the Home.md so github has an index file to show 2014-09-09 08:41:35 +02:00
tobiasd
bec92bf22e Merge pull request #1136 from tobiasd/33rc 
RC for 3.3
 2014-09-07 20:43:29 +02:00
Tobias Diekershoff
81949173c6 RC for 3.3 2014-09-07 20:41:33 +02:00
tobiasd
d1b1d45cc0 Merge pull request #1133 from tugelbend/master 
added cc license to default avatar
 2014-09-07 18:08:02 +02:00
tobiasd
216ad4c9fe Merge pull request #1132 from tobiasd/20140907b 
missing template file
 2014-09-07 18:04:49 +02:00
hauke
d784e0d8a6 added cc license to default avatar 2014-09-07 18:04:35 +02:00
Tobias Diekershoff
2234f257b6 missed the settings template for duepunto 2014-09-07 18:02:58 +02:00
tobiasd
e767e2d750 Merge pull request #1131 from fabrixxm/master 
Bug fixes!
 2014-09-07 17:52:52 +02:00
fabrixxm
3ac5e4508b fix email to new registerd users. 
fix notification in case of error sending email.
 2014-09-07 17:46:31 +02:00
fabrixxm
6db73c0b6d fix update routine to support update from 3.2 
disable PDO support
 2014-09-07 17:28:38 +02:00
tobiasd
c07e40e6e7 Merge pull request #1128 from Beanow/hotfix/settings-styling 
Added styling to show settings headers can be clicked.
 2014-09-07 17:15:30 +02:00
tobiasd
d568f2db68 Merge pull request #1130 from tugelbend/master 
new default avatar by Andi Stadler
 2014-09-07 17:13:47 +02:00
hauke
db2e20eb2e Merge branch 'master' of https://github.com/friendica/friendica 2014-09-07 17:07:14 +02:00
hauke
447d358565 new default icon by Andi Stadler 2014-09-07 17:06:21 +02:00
tobiasd
ea914f4698 Merge pull request #1129 from tobiasd/20140907a 
typo in dbstructure.php
 2014-09-07 17:01:13 +02:00
Tobias Diekershoff
2eb74a9b42 fixing a typo 2014-09-07 16:59:01 +02:00
Beanow
948c52f13e Added styling to show settings headers can be clicked. 2014-09-07 16:24:40 +02:00
tobiasd
59e2b3610d Merge pull request #1127 from Beanow/hotfix/whitespace-issue 
Fixed whitespace issue causing trueish results in templates.
 2014-09-07 16:22:37 +02:00
Beanow
2fe79c564b Fixed whitespace issue causing trueish results in templates. 
For example: profiles would show labels with no content.
 2014-09-07 15:48:44 +02:00
tobiasd
5c0feb22db Merge pull request #1126 from tobiasd/1754 
revup after the Hackathon in Berlin
 2014-09-07 15:38:43 +02:00
Tobias Diekershoff
04da5ed3bb revup after the Hackathon in Berlin 2014-09-07 15:36:23 +02:00
fabrixxm
a7302daf96 Merge pull request #1123 from fabrixxm/mail_notification_cleanup 
Mail notification cleanup
 2014-09-07 15:05:06 +02:00
fabrixxm
b7bd29c347 Merge pull request #1124 from tobiasd/duepuntoderivs 
added variations of duepuntozero to the theme as options to be selected
 2014-09-07 15:04:26 +02:00
fabrixxm
181ecc2197 Merge pull request #1122 from tugelbend/master 
Updated smarty template to 3.1.19
 2014-09-07 14:56:55 +02:00
hauke
baabb5ba8b removed fancybox as it is not used anywhere 2014-09-07 14:54:10 +02:00
fabrixxm
ec1d321e33 update messages.po 2014-09-07 14:32:41 +02:00
Tobias Diekershoff
6415cc1a2c remove screenshot for greenzero 2014-09-07 14:31:46 +02:00
hauke
bc8df42dcc update of fullcalender to v1.6.4 2014-09-07 14:31:01 +02:00
fabrixxm
21b1e09fad Merge remote-tracking branch 'friendica/master' into mail_notification_cleanup 2014-09-07 14:28:03 +02:00