clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
9,279 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

3251 Commits

Author SHA1 Message Date
Michael Vogel 70ba1667e1 It is now possible to define the hostname from the admin page. This should definetely end the problem that the hostname couldn't be detected unter certain conditions. 2014-11-08 00:07:21 +01:00
Carsten Pfeiffer 00c16b387a Make TinyMCE editors resizable 2014-11-01 22:18:42 +01:00
Michael Vogel 691aa17025 fetch further information: it is now possible to define a blacklist for keywords for "fetch further information" 2014-10-30 00:24:23 +01:00
Michael Vogel 2b5372aebe Forcing all non-SSL requests to SSL requests is now an option. 2014-10-26 22:15:12 +01:00
Michael Vogel c77a63fb27 remote self: There is now an option if the keyswords should be used as tags or not. 2014-10-24 01:37:33 +02:00
Fabrixxm 295b4d7f61 Update develop from 'master' 2014-10-16 10:47:40 +02:00
Tobias Diekershoff 56cd536652 use noscrape by default, add opt-out option to disable it 2014-10-13 19:19:54 +02:00
fabrixxm 6f92dd00d3 Merge pull request #1182 from tobiasd/20141009 
RO: update to the strings
 2014-10-13 15:01:42 +02:00
Tobias Diekershoff 5c316fa541 RO: update to the strings 2014-10-09 17:59:27 +02:00
Tobias Diekershoff 75f6f3d68b PT-BR: updating the strings 2014-10-07 18:34:43 +02:00
Fabrixxm e2dc4f922c Friendica 'Ginger' 3.3 2014-10-06 08:56:55 +02:00
Tobias Diekershoff 74be3ac543 updating core translations from transifex 2014-09-28 15:04:54 +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
Michael Vogel 2bbd7ab67f Issue 1157: Unused javascript function is removed. 2014-09-27 14:17:50 +02:00
hauke 2743514791 bug fix #1135, show more is usable again 2014-09-22 13:53:16 +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 d2afb263ae Set internal PuSH server as default 2014-09-20 12:08:10 +02:00
fabrixxm 6da5cf8037 fix residual curCSS, should fix #1153 2014-09-20 11:24:06 +02:00
Fabrixxm 133b5bca59 fix oembed video template 2014-09-17 11:02:58 +02:00
Fabrixxm d1029e1fb2 tweak quattro theme 2014-09-17 10:59:19 +02:00
hauke 76535578ba bug fix: live function is deprecated 2014-09-15 19:48:17 +02:00
Michael Vogel f9bec79a2c In the profiles the remote connect field was missing 2014-09-11 23:38:24 +02:00
fabrixxm fd97f3013d fix quattro scroll and flash and vier flash on display page 2014-09-11 18:56:33 +02:00
fabrixxm df1f9d5eb7 Update IT strings 2014-09-10 19:05:43 +02:00
Tobias Diekershoff 2234f257b6 missed the settings template for duepunto 2014-09-07 18:02:58 +02:00
Beanow 948c52f13e Added styling to show settings headers can be clicked. 2014-09-07 16:24:40 +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
hauke baabb5ba8b removed fancybox as it is not used anywhere 2014-09-07 14:54:10 +02:00
Tobias Diekershoff 6415cc1a2c remove screenshot for greenzero 2014-09-07 14:31:46 +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
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
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 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 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
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
Silke Meyer a9b69b063c Marked several old themes as unsupported 2014-09-07 08:17:22 +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 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
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
tobiasd 0e9c8f6f1a Merge pull request #1108 from tugelbend/master 
jquery update to version 1.11
 2014-09-06 16:35:24 +02:00
hauke 87fa2ee2af updated jquery to version 1.11, updated themes frost and diabook where necessary 2014-09-06 16:21:03 +02:00
fabrixxm 83df1f4583 fix italian smarty3 email templates 2014-09-06 16:12:05 +02:00
tobiasd 267927d2dd Merge pull request #1106 from silke/frost-mobile-modifications 
Frost mobile modifications
 2014-09-06 14:52:12 +02:00
Silke Meyer 6369399b9f Shrink user icons in timeline to 48x48 2014-09-06 14:38:43 +02:00
Silke Meyer b9b490057a different minor modifications 2014-09-06 14:25:36 +02:00
hauke ec68e33c6b make items on settings pages fold/unfold on click 2014-09-06 13:53:23 +02:00
Silke Meyer 3290f6b360 Reduced height of navbar 2014-09-06 12:20:55 +02:00
tobiasd 4aa2ae488b Merge pull request #1102 from tobiasd/newstrings20140906a 
updating message.po and string.php
 2014-09-06 12:20:42 +02:00
Tobias Diekershoff 97a8a7b362 ZH-CN: update to the strings 2014-09-06 12:13:04 +02:00
Tobias Diekershoff d0b1f0f5ba RO: update to the strings 2014-09-06 12:12:38 +02:00
Tobias Diekershoff dd65b06ecf PT-BR: update to the strings 2014-09-06 12:12:19 +02:00
Tobias Diekershoff 4571670e4f PL: update to the strings 2014-09-06 12:11:59 +02:00
Tobias Diekershoff b948dca729 NL: update to the strings 2014-09-06 12:11:44 +02:00
Tobias Diekershoff c0e9e1849a NB-NO: update to the strings 2014-09-06 12:11:00 +02:00
Tobias Diekershoff 70031d8d3e IT: update to the strings 2014-09-06 12:10:36 +02:00
Tobias Diekershoff 414451cdad IS: update to the strings 2014-09-06 12:09:08 +02:00
Tobias Diekershoff 57f3ccc967 RU: update to the strings 2014-09-06 12:08:48 +02:00
Tobias Diekershoff cb0a2b3d35 FR: update to the strings 2014-09-06 12:08:20 +02:00
Tobias Diekershoff ebbaedb97d ES: update to the strings 2014-09-06 12:08:02 +02:00
Tobias Diekershoff d283ed4f51 EO: update to the strings 2014-09-06 12:07:45 +02:00
Tobias Diekershoff 6ddfaaae82 DE: update to the strings 2014-09-06 12:07:13 +02:00
Tobias Diekershoff e982697e17 CA: update to the strings 2014-09-06 12:05:44 +02:00
Tobias Diekershoff 582b90613b CS: update to the strings 2014-09-06 12:05:25 +02:00
Tobias Diekershoff fe8a5a93b4 BG: update to the strings 2014-09-06 12:04:23 +02:00
hauke 9a8d106414 fixed contact action button bar, typo correction 2014-09-06 11:49:31 +02:00
hauke 191595766d removed old comment that is no longer true 2014-09-06 00:14:25 +02:00
Michael Vogel e21bcb82d2 Enhance the database structure checks when they failed. 2014-09-04 09:26:56 +02:00
Michael Vogel 0e2376b457 Updated font awesome to new version 2014-09-04 01:01:39 +02:00
Michael Vogel 7eeb320085 It is now possible to ignore threads. 2014-09-04 00:58:52 +02:00
Michael Vogel 73904bfa03 Added an alternate link to the profile in the atom feeds (feature request #925) 2014-09-03 09:52:31 +02:00
Michael Vogel e35c55dd3b Remote-self: It is now possible to chose between two different modes of mirroring. 2014-09-01 14:00:21 +02:00
Michael Vogel ea0f75a315 Bugfix: It was impossible to add groups. 2014-08-30 02:08:33 +02:00
Michael Vogel 4d3e3eb4d1 Bugfix: connecting with other users now works again. 2014-08-28 01:15:40 +02:00
Michael Vogel 316f0a75cd Showing the network name on the display page. 2014-08-25 16:17:49 +02:00
Michael Vogel dd511ac70a The "display" page now shows the current author profile with a "connect" link (if there is no current connection) 2014-08-25 14:09:56 +02:00
Michael Vogel c5cc99c716 BBCode: Depending upon the image size of the preview picture for a link, the image is displayed differently 2014-08-25 14:08:26 +02:00