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
21017 commits 3 branches 64 tags 241 MiB
Commit graph

21017 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
tobiasd
f0b928176a Merge pull request #1112 from tugelbend/master 
bug fix: library shouldn't be included remotely
 2014-09-06 23:26:10 +02:00
hauke
2947be66b6 bug fix, wrong js lib included 2014-09-06 19:14:58 +02:00
fabrixxm
0e628f840f send ostatus follow/share notifications via notification() 
remove unused templates
 2014-09-06 18:15:18 +02:00
hauke
d061e1f8f2 Merge branch 'master' of https://github.com/friendica/friendica 2014-09-06 17:51:00 +02:00
tobiasd
a2ab431c4b Merge pull request #1111 from tugelbend/master 
minified js files were out of date and inconsistently used.
 2014-09-06 17:50:44 +02:00
hauke
56dfa7bf84 Merge branch 'master' of https://github.com/friendica/friendica 2014-09-06 17:50:32 +02:00
tobiasd
1c8885351b Merge pull request #1110 from annando/1409-issue-1094 
Issue 1094: "remote self" is not working on twitter contacts but can be activated. It is now disabled to enable it.
 2014-09-06 17:48:56 +02:00
tobiasd
2338419999 Merge pull request #1109 from tugelbend/master 
Sections on setting pages fold/unfold on click
 2014-09-06 17:48:02 +02:00
hauke
392b53dbf9 minified js files where out of date and inconsistently used. Removed until decision on minifying strategy 2014-09-06 17:46:31 +02:00
fabrixxm
1bdddebd44 connection confirm notification mail via notification() 
remove unused email templates
add a check for unexpected reponse from server
 2014-09-06 17:28:46 +02:00
Michael Vogel
3b6c6d0cd9 Issue 1094: "remote self" is not working on twitter contacts but can be activated. It is now disabled to enable it. 2014-09-06 17:22:59 +02:00
hauke
e02b77c845 Merge tag 'ui-improvements' into develop 
setting page section fold/unfold
 2014-09-06 17:02:47 +02:00
hauke
5205756898 Merge branch 'release/ui-improvements' 2014-09-06 17:02:25 +02:00
hauke
7dcf37f053 changed cursor style on settings page globally 2014-09-06 17:01:05 +02:00
hauke
25d7087d9e Merge branch 'feature/2014-09-hackathon-ui-improvements' into develop 2014-09-06 16:55:07 +02:00