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

21032 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Tobias Diekershoff
2c8ca3ec36 deleted some editicon.png copies 2014-09-07 14:23:24 +02:00
fabrixxm
a8c90155f8 db update mail via notification() 
remove last template
 2014-09-07 14:23:03 +02:00
Tobias Diekershoff
a9782251e5 updating config files for duepuntozero 2014-09-07 14:00:09 +02:00
Tobias Diekershoff
c72d850113 added slackr to duepuntoderivates 2014-09-07 13:57:51 +02:00
fabrixxm
5861bdd6e9 registration request as system notification 
kill the template
send email to all admins
 2014-09-07 13:55:02 +02:00
Tobias Diekershoff
0989ad335f added purplezero to duepunto as variation 2014-09-07 13:41:02 +02:00
hauke
0e1f8f6486 reverting tinymce changes, updating smarty to 3.1.19 2014-09-07 13:38:28 +02:00
Tobias Diekershoff
22d0190041 revive easterbunny from the dead 2014-09-07 13:29:56 +02:00
Tobias Diekershoff
bbf22938ae added Comix as a colorset of duepuntozero 2014-09-07 13:09:02 +02:00
Tobias Diekershoff
2802402e57 added darkzero as colorset of duepuntozero 2014-09-07 13:01:23 +02:00
hauke
5633e88aad Merge branch 'master' of https://github.com/friendica/friendica 2014-09-07 12:51:39 +02:00
hauke
386eadde3a updated tinymce to 3.5.11 2014-09-07 12:51:05 +02:00
Tobias Diekershoff
f0aaafa7aa added Greenzero as colorset of duepuntozero 2014-09-07 12:48:23 +02:00
fabrixxm
735e6bbcb4 Merge pull request #1121 from Beanow/hotfix/bug-1105 
Fix illegal offset error for vier and quattro.
 2014-09-07 12:48:13 +02:00
fabrixxm
a5df9b8b5d Somebody stop me! (not really..) 2014-09-07 12:35:08 +02:00
fabrixxm
5997fb19ee More template gore! 2014-09-07 12:29:13 +02:00
fabrixxm
803854738b another massacre of templates 2014-09-07 11:48:23 +02:00
Beanow
8345ac7313 Fix illegal offset error for vier and quattro. 
Fixes #1105
 2014-09-07 11:47:08 +02:00
fabrixxm
cab46e2772 Merge pull request #1120 from silke/deprecated-themes 
Deprecated themes
 2014-09-07 11:42:04 +02:00
fabrixxm
36a67158d2 Merge pull request #1119 from annando/1409-issue-881 
The useragent string doesn't contains of the words "Mozilla" anymore
 2014-09-07 11:41:51 +02:00
fabrixxm
a58e990cfc Merge pull request #1118 from tugelbend/master 
bug fix #1115: settings were hidden on "social network" and "plugin" page
 2014-09-07 11:37:55 +02:00
fabrixxm
89f8341ce8 Merge pull request #1117 from annando/1409-suppress-unsported-themes 
Unsupported themes aren't displayed anymore
 2014-09-07 11:37:25 +02:00
fabrixxm
fe02619114 fix indentation 2014-09-07 11:31:42 +02:00
fabrixxm
9368c7e510 html mail template add img tag only if source_photo is defined 2014-09-07 11:20:56 +02:00
fabrixxm
9a0c37eb47 new password mail via notification() 
new include/text.php::deindent() function
remove unused templates
 2014-09-07 11:20:06 +02:00
Silke Meyer
12012be79d marked four more themes as unsupported 2014-09-07 11:00:58 +02:00
Michael Vogel
7af5c3c560 The useragent string doesn't contains of the words "Mozilla" anymore - but the name "Friendica" and the base url 2014-09-07 10:47:37 +02:00
fabrixxm
d85bdd8fb0 lost password verification mail via notification() 2014-09-07 10:27:39 +02:00
Silke Meyer
d001ee5c65 Marked several themes from the zero theme as deprecated (all but 
duepunto).
 2014-09-07 10:26:45 +02:00
hauke
a162ea7251 bug fix #1115 2014-09-07 10:26:38 +02:00
Michael Vogel
871b425c6e Unsupported themes aren't displayed anymore 2014-09-07 10:06:57 +02:00
fabrixxm
212903a728 Merge pull request #1116 from silke/unsupported-themes 
Marked several old themes as unsupported
 2014-09-07 09:02:51 +02:00
Silke Meyer
a9b69b063c Marked several old themes as unsupported 2014-09-07 08:17:22 +02:00
fabrixxm
e41005ce6e Merge pull request #1114 from annando/1409-api-search-users 
API: The command "users/search" is now supported.
 2014-09-07 07:40:44 +02:00
Michael Vogel
a333036f00 API: The command "users/search" is now supported. 2014-09-07 07:32:09 +02:00