friendica/dir
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Commit graph

  • 3ce41a78b4 Merge pull request #676 from fermionic/20130511-loading-home-page-for-image fermionic 2013-05-11 09:04:45 -07:00
  • 5d30008ab3 don't set img src in notifications to blank Zach Prezkuta 2013-05-11 09:43:21 -06:00
  • 3a13aba62e Merge pull request #674 from fermionic/20130503-basic-video-support fermionic 2013-05-11 08:33:36 -07:00
  • 06ab3eb44f DE: update to the strings Tobias Diekershoff 2013-05-09 19:07:20 +02:00
  • 218be8a3c0 DE: Update to the strings Tobias Diekershoff 2013-05-09 18:40:11 +02:00
  • ba6b2718cf DE: update to the strings Tobias Diekershoff 2013-05-09 18:38:57 +02:00
  • ef4ebd8546 remove stub code friendica 2013-05-09 01:17:11 -07:00
  • 3339f55310 Merge https://github.com/friendica/friendica into pull friendica 2013-05-09 01:15:40 -07:00
  • 2c8d33a6e2 rev update friendica 2013-05-09 01:15:22 -07:00
  • b06dab97ba modified: view/theme/smoothly/default.php modified: view/theme/smoothly/style.css new file: view/theme/smoothly/templates/tools.tpl modified: view/theme/smoothly/theme.php pixelroot 2013-05-08 14:46:42 +02:00
  • a2102e1ca0 Merge remote branch 'upstream/master' pixelroot 2013-05-08 11:09:39 +02:00
  • e90c89f3fc new file: view/theme/smoothly/images/power.png new file: view/theme/smoothly/images/up.png pixelroot 2013-05-08 11:09:08 +02:00
  • 523548ff22 modified: view/theme/smoothly/default.php modified: view/theme/smoothly/images/down.png modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php view/theme/smoothly/images/power.png view/theme/smoothly/images/up.png pixelroot 2013-05-08 11:08:21 +02:00
  • 2da4f8268e fix smarty3 folder not writable message fabrixxm 2013-05-08 11:34:30 +03:00
  • 1e3455d71a Merge pull request #675 from fabrixxm/templateengine fabrixxm 2013-05-08 00:29:02 -07:00
  • 4bf41b8e5d check if view/smarty3 folder is writable by webserver Fabrixxm 2013-05-08 03:26:20 -04:00
  • bc57d7f64e bug in main.js for VideoJS on initial page load Zach Prezkuta 2013-05-07 22:06:40 -06:00
  • 258604f036 modified: view/theme/smoothly/css/typography.css pixelroot 2013-05-07 14:30:04 +02:00
  • 8c8d3913cc modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php pixelroot 2013-05-07 14:01:54 +02:00
  • 5ac6e82e7d modified: view/theme/smoothly/default.php modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php pixelroot 2013-05-07 09:39:14 +02:00
  • bd20f6ed9a add some styling for the video player Zach Prezkuta 2013-05-03 19:09:12 -06:00
  • fec4581f34 basic video playback support using VideoJS Zach Prezkuta 2013-05-03 18:17:56 -06:00
  • 04681618da spelling friendica 2013-05-02 22:21:06 -07:00
  • 886c3d1472 bad checkin friendica 2013-05-02 22:19:16 -07:00
  • ed5768c4a3 optimise cachefile logic - still not sure why the cachefile profiling was getting triggered on a site with no cachefile configured friendica 2013-05-02 21:59:20 -07:00
  • 2a3288b01e Merge https://github.com/friendica/friendica into pull friendica 2013-05-02 21:42:54 -07:00
  • 185d29c41e undefined element friendica 2013-05-02 21:42:34 -07:00
  • cc8a4fbf16 Merge pull request #672 from cpfeiffer/email-notification-sitename-fix friendica 2013-04-29 22:41:32 -07:00
  • dc0376402d Merge pull request #673 from cpfeiffer/pgettext_missing_dba friendica 2013-04-29 22:41:07 -07:00
  • 5ee19401c4 pgettext needs dba.php for q() Carsten Pfeiffer 2013-04-29 22:44:21 +02:00
  • b66d4b8cbd Merge pull request #670 from fabrixxm/help tobiasd 2013-04-29 00:36:26 -07:00
  • c08e791e43 Merge https://github.com/friendica/friendica into pull friendica 2013-04-28 21:03:21 -07:00
  • 1d358fe6de system support for complete blocking friendica 2013-04-28 21:02:53 -07:00
  • 0bbd0939e4 ZH-CN: update to the strings Tobias Diekershoff 2013-04-28 15:35:34 +02:00
  • 2883c8bbc4 Merge https://github.com/friendica/friendica into pull friendica 2013-04-28 04:31:11 -07:00
  • 61a0f9c196 bug #540 and hush up a couple of log messages that are way too verbose friendica 2013-04-28 04:30:20 -07:00
  • dd52acebba Merge pull request #671 from cpfeiffer/OAuthException friendica 2013-04-27 14:32:57 -07:00
  • 7f6a7af2b3 fix reading sitename config Carsten Pfeiffer 2013-04-27 21:40:40 +02:00
  • 7e5ec9fceb Wrap class OAuthException with !class_exists Carsten Pfeiffer 2013-04-27 21:08:45 +02:00
  • f84c57e7f2 DE: update to the strings Tobias Diekershoff 2013-04-27 10:57:06 +02:00
  • 1ed6a2bd3d rev update friendica 2013-04-25 02:36:52 -07:00
  • f41c5dd1e5 modified: view/theme/smoothly/css/typography.css modified: view/theme/smoothly/default.php modified: view/theme/smoothly/style.css modified: view/theme/smoothly/templates/nav.tpl modified: view/theme/smoothly/theme.php pixelroot 2013-04-24 14:09:24 +02:00
  • 92c7ec6c8b doc update add BBCode reference update 'Creating posts', change screenshot (use duepuntozero theme) update 'Install', add point on create view/smarty3 folder update 'Plugins', add section on templates Fabrixxm 2013-04-24 07:59:06 -04:00
  • 36f2930e52 http status for disallowed feeds friendica 2013-04-23 20:12:49 -07:00
  • 115c8a53bf issue546 via Tobias friendica 2013-04-23 18:58:52 -07:00
  • f090564f0f Merge https://github.com/friendica/friendica into pull friendica 2013-04-23 18:51:50 -07:00
  • f4b3cf980d rev update friendica 2013-04-23 18:51:35 -07:00
  • eef66da145 Merge pull request #669 from fabrixxm/templateengine friendica 2013-04-23 04:56:39 -07:00
  • 4dc72742ae remove unneeded files Fabrixxm 2013-04-23 07:50:32 -04:00
  • 379c761c3f missing "templates" folders Fabrixxm 2013-04-23 07:47:57 -04:00
  • d36292c532 template: set smarty3 as default template engine in theme info array. remove commented code from get_markup_template. add check for $root/$filename in get_template_file. Fabrixxm 2013-03-28 09:07:51 +01:00
  • 6fddd1cbbf template: remove old 'internal' template files, move smarty3 templates into 'templates' subdir Fabrixxm 2013-03-27 10:41:23 -04:00
  • ddf1caf0fd template engine rework - use smarty3 as default engine - new pluggable template engine system Fabrixxm 2013-03-27 10:37:59 -04:00
  • a34b1ceb3a Merge https://github.com/friendica/friendica into pull friendica 2013-04-21 16:07:26 -07:00
  • bc68892cf9 rev update friendica 2013-04-21 16:07:02 -07:00
  • ce23f9cd7b Merge pull request #667 from fabrixxm/bug557 fabrixxm 2013-04-20 00:45:44 -07:00
  • dd02b7bd00 drop items to group pages if no mentions in it. should fix bug 557 Fabrixxm 2013-04-19 09:55:07 -04:00
  • 65e0cbd730 Merge https://github.com/friendica/friendica into pull friendica 2013-04-19 04:52:20 -07:00
  • a13e7b8a38 rev update friendica 2013-04-19 04:51:43 -07:00
  • d861225d40 Merge pull request #666 from fermionic/20130418-frost-mobile-password-check fermionic 2013-04-18 18:48:38 -07:00
  • 78e747016f update mobile theme settings pages Zach Prezkuta 2013-04-18 19:47:27 -06:00
  • 44f4b9a29f Merge pull request #665 from tobiasd/foreach_arg fermionic 2013-04-18 18:37:39 -07:00
  • 7b342d7297 Merge pull request #664 from tobiasd/issue_554 fermionic 2013-04-18 18:37:11 -07:00
  • 960d1d99b2 invalid arguments for a foreach loop found Tobias Diekershoff 2013-04-17 17:32:31 +02:00
  • b6d1a1f125 tabwidth Tobias Diekershoff 2013-04-14 18:19:01 +02:00
  • 4dd406055c check password when changing users email Tobias Diekershoff 2013-04-14 17:58:16 +02:00
  • 7be1040a63 DE: update to the strings Tobias Diekershoff 2013-04-14 17:26:23 +02:00
  • 5827db0ea3 check current password before changing the password Tobias Diekershoff 2013-04-14 17:22:42 +02:00
  • d905f0a3e3 Merge pull request #663 from fabrixxm/moveme fabrixxm 2013-04-08 06:17:51 -07:00
  • 659d0cc1b8 uimport remove db scheme version check Fabrixxm 2013-04-08 09:03:31 -04:00
  • 8b4fa33c5e Merge pull request #662 from fermionic/20130407-display-own-post friendica 2013-04-07 16:05:10 -07:00
  • 2cc73dbef3 allow visiting other people's display/ links if I have a copy of the post Zach Prezkuta 2013-04-07 11:38:37 -06:00
  • 17ca6290f5 DE: update to the strings Tobias Diekershoff 2013-04-06 08:25:33 +02:00
  • dddb0570c5 Merge pull request #661 from fermionic/20130404-update-frost-decaf fermionic 2013-04-04 15:43:47 -07:00
  • 2316e0d731 update admin options for frost, frost mobile, and decaf mobile Zach Prezkuta 2013-04-04 16:42:39 -06:00
  • 61bff09ecd Merge https://github.com/friendica/friendica into pull friendica 2013-04-04 15:13:06 -07:00
  • 9660117c70 sync username when changed in either the default profile or the settings page friendica 2013-04-04 15:10:14 -07:00
  • bee80004db DE: update to the strings Tobias Diekershoff 2013-04-04 17:27:49 +02:00
  • 1e54f0022f Merge pull request #660 from fabrixxm/moveme friendica 2013-04-03 17:36:40 -07:00
  • 8b51ffefc0 Merge https://github.com/friendica/friendica into pull friendica 2013-04-03 16:29:13 -07:00
  • db0bb50e37 rev update friendica 2013-04-03 16:28:49 -07:00
  • e77521c42f PL: update to the strings Tobias Diekershoff 2013-04-03 09:28:37 +02:00
  • 1442fecd14 uimport: fix file formatting Fabrixxm 2013-04-02 09:44:19 -04:00
  • 13e315e004 uimport: check table columns before import Fabrixxm 2013-04-02 09:16:24 -04:00
  • dbc4371391 Merge pull request #659 from mexon/fetch_url_content_type tobiasd 2013-04-02 00:17:28 -07:00
  • ee07251d38 modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php pixelroot 2013-04-01 19:36:22 +02:00
  • 5b158dbcfb Make the content type available after calling fetch_url Matthew Exon 2013-04-01 12:26:11 +08:00
  • cda327a368 Merge pull request #658 from annando/master tobiasd 2013-03-30 01:46:13 -07:00
  • f7fbac2e2b Merge remote-tracking branch 'upstream/master' Michael Vogel 2013-03-29 11:22:10 +01:00
  • eabefb2f04 vier: The background color of the right area is now white. Michael Vogel 2013-03-29 11:18:20 +01:00
  • ad48ab2928 DE: update to the strings Tobias Diekershoff 2013-03-28 07:49:58 +01:00
  • 74954e6c68 Merge pull request #656 from fabrixxm/master friendica 2013-03-27 19:44:24 -07:00
  • 1eb56116e8 Merge pull request #657 from mexon/cron_lock friendica 2013-03-27 19:41:59 -07:00
  • c3621407d1 Remove debug line added by mistake Matthew Exon 2013-03-28 10:29:27 +08:00
  • 10b68ef837 Add separate lock file for cronhooks, which might also take a long time and shouldn't be allowed to interfere with itself Matthew Exon 2013-03-12 14:41:41 +01:00
  • d685181101 modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php pixelroot 2013-03-27 20:08:06 +01:00
  • 1a8bdf8ae8 more phpdocs Fabrixxm 2013-03-27 10:28:56 +01:00
  • a161b86d1f add phpdoc Fabrixxm 2013-03-27 05:11:40 -04:00
  • e7c705c9a1 Merge pull request #654 from mexon/filter_var tobiasd 2013-03-26 11:31:11 -07:00
  • 2b7dd2f72b modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php pixelroot 2013-03-26 17:10:58 +01:00