Commit Graph

  • 2abbd1dc19 permissions selector showing up for guests, testbubble and smoothly friendica 2012-09-15 20:21:17 -07:00
  • ee5ed6b963 Merge https://github.com/friendica/friendica into pull friendica 2012-09-15 15:24:28 -07:00
  • 669d2b890e rev update - add cancel markup to editor friendica 2012-09-15 15:23:15 -07:00
  • 21d685b21c DE: update to the strings Tobias Diekershoff 2012-09-15 10:38:08 +02:00
  • e581c34760 Merge pull request #470 from CyberDomovoy/html5-treebuilder-namespace-error friendica 2012-09-14 20:21:29 -07:00
  • 75b92b52d8 Merge pull request #477 from fermionic/private-image-failure friendica 2012-09-14 20:21:05 -07:00
  • 8a4dcc28c1 make size search less greedy Zach Prezkuta 2012-09-14 18:33:07 -06:00
  • f445ed47df fix permissions for uploaded images with size specified Zach Prezkuta 2012-09-14 18:22:56 -06:00
  • 7ae1e4620d Merge pull request #476 from pixelroot/master Alex 2012-09-14 10:07:17 -07:00
  • 816680ca85 new file: view/theme/smoothly/bottom.tpl new file: view/theme/smoothly/js/jquery.autogrow.textarea.js new file: view/theme/smoothly/js/modernizr.custom.2.5.3.js new file: view/theme/smoothly/js/modernizr.custom.2.5.3.min.js pixelroot 2012-09-14 19:08:39 +02:00
  • 3c846547f7 modified: view/theme/smoothly/style.css pixelroot 2012-09-14 19:08:21 +02:00
  • 5d22b13242 Merge pull request #475 from pixelroot/master Alex 2012-09-14 08:53:27 -07:00
  • 6537a94b1a new file: view/theme/smoothly/down.png pixelroot 2012-09-14 17:55:27 +02:00
  • a300973084 modified: view/theme/smoothly/style.css pixelroot 2012-09-14 17:55:17 +02:00
  • cb1c9de069 quattro: lilac color schema Tobias Diekershoff 2012-09-14 17:01:26 +02:00
  • 6c44125fb5 DE: update to the strings Tobias Diekershoff 2012-09-14 15:46:14 +02:00
  • c8d0293e9e Merge branch 'master' of https://github.com/friendica/friendica Tobias Diekershoff 2012-09-14 15:36:15 +02:00
  • 882f437149 quattro: mail link to profile page Tobias Diekershoff 2012-09-14 15:35:40 +02:00
  • 8497c6782e Merge https://github.com/friendica/friendica into pull friendica 2012-09-14 06:05:22 -07:00
  • 39b296a87d ostatus disabled typo friendica 2012-09-14 06:04:25 -07:00
  • 98540b630e Merge pull request #474 from pixelroot/master Alex 2012-09-14 03:43:48 -07:00
  • 252e112ad5 modified: view/theme/smoothly/style.css pixelroot 2012-09-14 12:46:32 +02:00
  • 9c7d5d42e1 Merge pull request #473 from pixelroot/master Alex 2012-09-14 02:54:30 -07:00
  • e78b86f534 modified: view/theme/smoothly/style.css pixelroot 2012-09-14 11:57:13 +02:00
  • ac0ad8fecf Merge pull request #472 from pixelroot/master Alex 2012-09-14 01:14:48 -07:00
  • bdc5a3ab29 deleted: view/theme/smoothly/group_edit.tpl pixelroot 2012-09-14 10:16:35 +02:00
  • 2a404ae6dd Merge pull request #471 from pixelroot/master Alex 2012-09-14 00:54:54 -07:00
  • d002573543 deleted: view/theme/smoothly/default.php modified: view/theme/smoothly/nav.tpl pixelroot 2012-09-14 09:55:54 +02:00
  • 1c4bea295f new file: view/theme/smoothly/default.php pixelroot 2012-09-14 09:33:47 +02:00
  • d1984c4c64 modified: view/theme/smoothly/nav.tpl modified: view/theme/smoothly/style.css pixelroot 2012-09-14 09:33:21 +02:00
  • bff9c3d460 modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php pixelroot 2012-09-14 08:50:10 +02:00
  • 20938d07cd typo on previous checkin - set max number of images for an inserted link, default 2. friendica 2012-09-13 23:01:10 -07:00
  • a31c779a15 Transform prefixed elements to classic ones Domovoy 2012-09-14 07:59:54 +02:00
  • 09413a0f0a Better integration with the existing code Domovoy 2012-09-14 05:50:35 +02:00
  • f9a9b70123 Detect the namespace uri from token name Domovoy 2012-09-14 05:30:21 +02:00
  • 32d4a359f1 reverse the default newuser privacy setting to public. Sites can over-ride. friendica 2012-09-13 19:11:07 -07:00
  • 269bb75a14 Merge https://github.com/friendica/friendica into pull friendica 2012-09-13 17:00:47 -07:00
  • d19a3b8324 provide separate hashtag and mentions for themes in addition to composite tags friendica 2012-09-13 16:59:25 -07:00
  • aa37b0cb0f rev update friendica 2012-09-13 16:58:06 -07:00
  • 1957aa8f0d Merge branch 'master' of https://github.com/friendica/friendica Thomas Willingham 2012-09-13 20:52:06 +01:00
  • 4b8f3a4194 Friendicaland Thomas Willingham 2012-09-13 20:51:34 +01:00
  • 290da6c845 Merge pull request #469 from pixelroot/master Thomas Willingham 2012-09-13 07:59:16 -07:00
  • 0cc661dd9c modified: view/theme/smoothly/style.css pixelroot 2012-09-13 16:50:55 +02:00
  • 664680cdd8 modified: view/theme/smoothly/style.css pixelroot 2012-09-13 16:30:12 +02:00
  • d3699498ac Merge pull request #468 from pixelroot/master friendica 2012-09-13 03:50:55 -07:00
  • a1ed9c72c2 modified: view/theme/smoothly/star.png modified: view/theme/smoothly/theme.php pixelroot 2012-09-13 11:41:14 +02:00
  • 2b9c2b2d1d modified: view/theme/smoothly/style.css pixelroot 2012-09-13 09:54:27 +02:00
  • 931e1c6c66 modified: view/theme/smoothly/style.css pixelroot 2012-09-13 09:48:02 +02:00
  • 16e35d1787 new file: view/theme/smoothly/message_side.tpl pixelroot 2012-09-13 09:35:12 +02:00
  • 4ba7ce0308 modified: view/theme/smoothly/peoplefind.tpl modified: view/theme/smoothly/style.css pixelroot 2012-09-13 09:34:50 +02:00
  • b7592fd584 Merge pull request #467 from fermionic/frost-mobile-toggle-mobile fermionic 2012-09-12 20:38:10 -07:00
  • e8acdb31bc add mobile toggle to frost mobile Zach Prezkuta 2012-09-12 21:35:51 -06:00
  • 3ea5001bb0 allow events to be ignored friendica 2012-09-12 19:35:28 -07:00
  • f4e3f335ef don't allow followers to get a post through unless it's a tag deliver friendica 2012-09-12 18:53:20 -07:00
  • 3d6c49d5b3 Merge https://github.com/friendica/friendica into pull friendica 2012-09-12 17:20:52 -07:00
  • db09724aec use local photo for tag notifications if available friendica 2012-09-12 17:19:26 -07:00
  • 3b8eb5d66b rev update friendica 2012-09-12 17:18:10 -07:00
  • ae0b830b7c Couple of spare smiley images removed. Thomas Willingham 2012-09-12 22:12:08 +01:00
  • 864e2c03d9 modified: view/theme/smoothly/style.css pixelroot 2012-09-12 17:25:44 +02:00
  • e3d20b51c8 modified: view/theme/smoothly/style.css pixelroot 2012-09-12 16:27:31 +02:00
  • a3add1d851 modified: view/theme/smoothly/profile_vcard.tpl modified: view/theme/smoothly/style.css pixelroot 2012-09-12 16:20:44 +02:00
  • 250c615058 Merge pull request #466 from pixelroot/master tobiasd 2012-09-12 07:02:40 -07:00
  • 77aee41280 modified: view/theme/smoothly/style.css pixelroot 2012-09-12 15:49:18 +02:00
  • a283d6844c modified: view/theme/smoothly/theme.php pixelroot 2012-09-12 14:44:42 +02:00
  • 207451d82d modified: view/theme/smoothly/style.css pixelroot 2012-09-12 14:42:10 +02:00
  • 039129418d Merge pull request #465 from CyberDomovoy/Imagick Domovoy 2012-09-12 03:00:29 -07:00
  • 67563d5c82 Fallback to gd if Imagick can't load the data Domovoy 2012-09-12 11:55:09 +02:00
  • ec1abfda46 Merge https://github.com/friendica/friendica into pull friendica 2012-09-11 18:57:40 -07:00
  • a8d12061ca rev update + multiple profile photos friendica 2012-09-11 18:51:17 -07:00
  • 984274659d Merge pull request #464 from pixelroot/master fermionic 2012-09-11 07:27:19 -07:00
  • 5ae445b1ff new file: view/theme/smoothly/generic_links_widget.tpl modified: view/theme/smoothly/style.css pixelroot 2012-09-11 15:23:49 +02:00
  • 4cc4404752 new file: view/theme/smoothly/arrow.png new file: view/theme/smoothly/categories_widget.tpl modified: view/theme/smoothly/style.css pixelroot 2012-09-11 14:02:36 +02:00
  • 30a9db78f5 modified: view/theme/smoothly/style.css pixelroot 2012-09-11 11:25:01 +02:00
  • 5f7f1fb7b1 modified: view/theme/smoothly/nav.tpl modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php new file: view/theme/smoothly/totop.png pixelroot 2012-09-11 11:06:55 +02:00
  • 36bd5286f2 DE: update to the strings Tobias Diekershoff 2012-09-11 09:19:11 +02:00
  • fa65db9aa1 bring back comment edit buttons friendica 2012-09-10 18:06:18 -07:00
  • 23770896c1 Merge https://github.com/friendica/friendica into pull friendica 2012-09-10 16:20:35 -07:00
  • ad872845cd rev update friendica 2012-09-10 16:19:34 -07:00
  • 4b7c6329e9 Merge pull request #462 from CyberDomovoy/threaded_items friendica 2012-09-10 16:19:13 -07:00
  • 5cfb068c25 Merge remote branch 'upstream/master' Michael Vogel 2012-09-10 23:28:07 +02:00
  • 9e9765a89f Merge pull request #463 from pixelroot/master fermionic 2012-09-10 08:08:24 -07:00
  • 9685ba3fbc modified: view/theme/smoothly/style.css pixelroot 2012-09-10 16:31:36 +02:00
  • ee20708f75 modified: view/theme/smoothly/style.css pixelroot 2012-09-10 16:21:54 +02:00
  • b5dee575a8 modified: style.css pixelroot 2012-09-10 15:38:44 +02:00
  • e51440ec98 modified: view/theme/smoothly/style.css pixelroot 2012-09-10 15:19:43 +02:00
  • 264f32db80 modified: view/theme/smoothly/style.css pixelroot 2012-09-10 14:58:57 +02:00
  • aef0824cc8 modified: view/theme/smoothly/style.css pixelroot 2012-09-10 14:52:47 +02:00
  • c059f92b5a modified: view/theme/smoothly/style.css pixelroot 2012-09-10 14:36:51 +02:00
  • 7603e2de75 deleted: view/theme/smoothly/comment_item.tpl deleted: view/theme/smoothly/moderated_comment.tpl modified: view/theme/smoothly/style.css pixelroot 2012-09-10 14:18:24 +02:00
  • e492664325 new file: view/theme/smoothly/follow.tpl new file: view/theme/smoothly/peoplefind.tpl modified: view/theme/smoothly/style.css pixelroot 2012-09-10 12:30:34 +02:00
  • f96b91c254 modified: view/theme/smoothly/style.css pixelroot 2012-09-10 11:01:43 +02:00
  • 16eec24a21 Tabs trouble? What happened? I sure aven't changed anything to my editor... Domovoy 2012-09-10 10:36:30 +02:00
  • 51bcd862d7 Port friendica/friendica#1478229abc6c5adc265559b5489cc2eb23358994 Domovoy 2012-09-10 10:14:30 +02:00
  • 7bef3023a8 Port friendica/friendica#4cd8233f61647d805383f5786052ef034cebf4e1 Domovoy 2012-09-10 09:57:34 +02:00
  • 1b82df60db Port friendica/friendica#79012bf8882baa6843726bcffbcafe959028c1bd Domovoy 2012-09-10 09:50:30 +02:00
  • bb68461c6d Merge branch 'master' of https://github.com/friendica/friendica into threaded_items Domovoy 2012-09-10 09:19:08 +02:00
  • 0d9ffd07c2 remove mobile file friendica 2012-09-10 00:15:01 -07:00
  • ee9ba384b1 Merge https://github.com/friendica/friendica into pull friendica 2012-09-09 15:36:49 -07:00
  • 0790af15fa rev update + bug 477 'Romania' misspelled friendica 2012-09-09 15:35:33 -07:00
  • 656604a5ff DE: getting the strings back to 100% Tobias Diekershoff 2012-09-09 18:31:15 +02:00