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

2516 Commits

Author SHA1 Message Date
Tobias Diekershoff d9ffb0578c quattro: display date info as "ago" with mouse over date stamp 2012-08-27 19:47:04 +02:00
Tobias Diekershoff cf91a7f79a quattro: mail_display has no ago information so don't display it 2012-08-27 19:39:31 +02:00
Tobias Diekershoff 036d5db0c0 quattro: use "ago" for date information and on mouse the date stamp 2012-08-27 19:32:23 +02:00
Tobias Diekershoff 37a0504f96 quattro: expanded the new prvmessage field a bit 2012-08-27 08:13:07 +02:00
Zach Prezkuta c681e69794 limit number of items on profile page too; add show more back to Frost mobile; some show more fixes 2012-08-26 15:21:26 -06:00
Zach Prezkuta a77081f659 remove show more/less from frost mobile--it is too great a load 2012-08-26 09:31:37 -06:00
Zach Prezkuta 0fe1727d74 remove show more/less animation on mobile 2012-08-26 09:22:49 -06:00
Zach Prezkuta 7c9c92e542 update version 2012-08-25 22:43:32 -06:00
Zach Prezkuta 193cc2c537 try to get rid of scrollbars in Frost 2012-08-25 22:42:12 -06:00
Zach Prezkuta f062ccbb66 add documentation; add to admin panel; some tweaks and interface stuff 2012-08-25 15:03:16 -06:00
fermionic 5cb618bcf1 Merge pull request #444 from fermionic/frost-notifications-sometimes-dont-show 
restore nav element to login pages, since system messages are sent in it
 2012-08-25 09:10:01 -07:00
Zach Prezkuta 3413cc1006 restore nav element to login pages, since system messages are sent in it 2012-08-25 10:08:25 -06:00
Zach Prezkuta 54d4fc73c4 fix image and file upload on frost moble; add support to frost for local post time 2012-08-24 21:25:39 -06:00
Domovoy 5dd3e8a990 One click comments on threaded items. 
comment-wwedit-wrapper and wall-item-outside-wrapper get the additional class "threaded" when applicable.
 2012-08-23 13:09:35 +02:00
Domovoy 3e5c711a72 Sync objects with upstream 2012-08-23 10:54:21 +02:00
friendica 386b6d081b moods 2012-08-22 21:36:55 -07:00
friendica 4f72e656ca Merge https://github.com/friendica/friendica into pull 2012-08-21 19:42:37 -07:00
friendica ff0e0782a5 restore old comment behaviour when threading turned off 2012-08-21 19:41:50 -07:00
Tobias Diekershoff 07a27d217c DE more updates to the strings 2012-08-21 08:23:47 +02:00
Tobias Diekershoff d470496ead Quattro: added localtime timestamp title to entries 2012-08-20 11:20:49 +02:00
Tobias Diekershoff 96e6be3c19 DE strings update 2012-08-20 11:12:40 +02:00
friendica bcec1bddc0 put the real post time into the post 2012-08-19 14:39:43 -07:00
Zach Prezkuta b4a4ccfb2b include login style when necessary 2012-08-18 14:47:59 -06:00
Zach Prezkuta 045f98cddd another javascript 2012-08-16 21:51:36 -06:00
Thomas Willingham ee998864e6 Make Vier threaded comments not broken. 
These should be inherited from Quattro really, but aren't.
 2012-08-16 18:21:33 +01:00
Zach Prezkuta 3531704d08 admin page selector for mobile theme 2012-08-15 08:54:30 -06:00
Tobias Diekershoff a09c200799 add selector for mobile theme to admin panel 2012-08-15 10:16:42 +02:00
Tobias Diekershoff 52908d5e80 lets mark mobile themes similar to experimental ones 2012-08-15 10:15:21 +02:00
Zach Prezkuta 77626cca74 missed something again 2012-08-14 19:54:22 -06:00
Zach Prezkuta 45b21c1d20 basic updates for Dispy and Diabook to try to make them at least not broken with threading updates 2012-08-14 19:42:07 -06:00
Tobias Diekershoff a763a064ff DE some updates to the translation 2012-08-14 12:37:32 +02:00
fermionic 8d89a915fc Merge pull request #434 from fermionic/frost-update-for-threaded-comments 
sigh I always miss something when copying over
 2012-08-11 19:53:08 -07:00
Zach Prezkuta 91aacdbb3d sigh I always miss something when copying over 2012-08-11 20:51:51 -06:00
friendica 6348634a1b Merge https://github.com/friendica/friendica into pull 
Conflicts:
	view/wall_thread.tpl
 2012-08-11 15:42:48 -07:00
friendica 1cd23860cb rev update 2012-08-11 15:39:45 -07:00
Zach Prezkuta 5890e3fa3a update frost mobile TODO 2012-08-11 14:43:13 -06:00
Zach Prezkuta 5e09fc31f5 Threading updates 
- Add rudimentary thread handling to Frost
- Fix possible CSS bug in several themes from threading update
- Add ability for themes to prevent threading
 2012-08-11 14:36:58 -06:00
friendica 20be1778db bring likes back - comment ordering is still a bit funky 2012-08-10 16:36:44 -07:00
Zach Prezkuta bcf214debb readability in TODO 2012-08-10 08:37:31 -06:00
Zach Prezkuta d9279da369 - Frost Mobile: redo CSS to adjust automatically to the screen width 
- Frost Mobile: various tweaks and fixes
- Allow themes to limit number of items on the Network page
 2012-08-10 08:34:00 -06:00
Fabrixxm ec3d8a80cd quattro: fix collapsed thread, fix comment box, style previev comment, add 'expand / collapse" thread 2012-08-10 06:27:01 -04:00
Fabrixxm 0f15c117ee quattro: move comment box for top-level item at the end of comments list 2012-08-10 04:53:39 -04:00
Fabrixxm c4bff3d393 quattro: add comment tools icons, fix hide/show comment tools 2012-08-10 04:29:22 -04:00
Fabrixxm 64a6e8693c quattro: remove unused parameter 'comment' from function cmtBbClose 2012-08-10 04:27:50 -04:00
Fabrixxm 2b7d08508d head.tpl: commentOpen() and commentClose() return true/false 
usefull to concatenate other actions: "commentClose(this, $id) && cmtBbClose($id)"
 2012-08-10 04:25:08 -04:00
Domovoy 9c920fd7b9 Merge pull request #5 from fabrixxm/threaded_items 
Threaded items support for Quattro theme
 2012-08-09 02:14:22 -07:00
Domovoy afaa5f2038 Removed useless comment box (from old non-threaded template, to comment box where displayed) 2012-08-07 12:13:42 +02:00
Domovoy 5ca71d04b2 Wall to wall items should now be threaded too. 2012-08-07 12:08:36 +02:00
Domovoy c0024daff7 Added view/wallwall_thread.tpl 2012-08-07 12:02:06 +02:00
Domovoy f3b1391501 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-08-07 09:40:21 +02:00
friendica 3032d663f6 Merge pull request #427 from fermionic/frost-embedded-videos 
allow themes to change the size of embedded videos
 2012-08-06 15:58:17 -07:00
Simon L'nu 7ceb213859 add a 'manage' icon to clarify things 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-08-06 17:05:25 -04:00
Simon L'nu 76e1e07571 Merge remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  rev update
  Frost-mobile: media query in css for tablets
  expire issue
  rev update
 2012-08-06 13:18:00 -04:00
Zach Prezkuta d8a13d6e8d allow themes to change the size of embedded videos 2012-08-06 09:59:57 -06:00
Fabrixxm 4062312e9c quattro: collaps threaded items 2012-08-06 04:48:24 -04:00
Fabrixxm fd7ea5cc91 quattro: support threaded comments 2012-08-05 16:55:20 -04:00
Christian Vogeley e6067e6694 Frost-mobile: media query in css for tablets 
Use space more efficiently on tablets in frost-mobile theme. Tested with
iPad 1.
 2012-08-05 16:08:07 +02:00
Domovoy e247915f48 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 
Conflicts:
	include/conversation.php
 2012-08-05 13:43:53 +02:00
Simon L'nu 3d0fc813dc Merge remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  missed an instance of $mobileapp in switch to generic app label
  ImageMagick rotates CW while imagerotate() rotates CCW
  update main frost version
  update version and todo
  -- Allow themes to specify an "app" name for posted status updates and comments (via a generic and translateable $sourceapp parameter) -- More HTML cleanup in TPL files -- Various Frost bug fixes and tweaks
  put back notags
  fix angle char storage and transmission, rev update
  Darkzero/NS .contact-photo-menu
  rev update
 2012-08-04 23:41:51 -04:00
Zach Prezkuta ed9811762d missed an instance of $mobileapp in switch to generic app label 2012-08-04 21:05:25 -06:00
Zach Prezkuta 1f8182a453 update main frost version 2012-08-04 14:05:56 -06:00
Zach Prezkuta 849720f160 update version and todo 2012-08-04 14:04:18 -06:00
Zach Prezkuta 63628910b2 -- Allow themes to specify an "app" name for posted status updates and comments (via a generic and translateable $sourceapp parameter) 
-- More HTML cleanup in TPL files
-- Various Frost bug fixes and tweaks
 2012-08-04 14:02:39 -06:00
Domovoy 8742beb772 Flatten children when threads are disabled 2012-08-03 22:28:21 +02:00
Domovoy 75700a725e Comment box is inside the item 2012-08-03 19:18:56 +02:00
Domovoy 66848b0471 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 
Conflicts:
	update.php
 2012-08-03 18:57:37 +02:00
Thomas Willingham 208019ea9c Darkzero/NS .contact-photo-menu 2012-08-03 03:07:29 +01:00
Simon L'nu 9433d229ed Merge remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  parse_url: Fixed a problem in the detection if there was an image or not. Additionally removed some test content.
  rev update
  Changed markdown to enable diaspora postings with images that contain links
  bbcode: two new bbcode elements (style, class) for CSS
  Moving the index creation commands into a readme file due to the fact that creating of these indexes is really slow.
  network: Caching of images
  scale_external_images: Fix: Hadn't looked for pictures in the format [img=XxY]
  Further performance improvements
  Speed improvements in the database
 2012-08-02 12:46:36 -04:00
Michael Vogel b904a21134 Merge remote branch 'upstream/master' 2012-08-02 10:27:11 +02:00
Simon L'nu 31eff37693 Merge remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  ugly fix to make editplain work
  quattro: readd sparkle cursor
  quattro: style for "show more" addon
  tinymce linebreaks, I fix it, somebody breaks it, I fix it, somebody breaks it. Repeat.
  logic was reversed - should work now
  fix almost all errant divs in view/ and frost folders
  Provide backend ability to poke as a comment rather than top-level post
  rev update
 2012-08-01 22:59:54 -04:00
Zach Prezkuta 3e8e1ab830 ugly fix to make editplain work 2012-08-01 19:09:28 -06:00
Michael Vogel 04c31d194f Merge remote branch 'upstream/master' 
Conflicts:
	update.php
 2012-08-02 00:21:14 +02:00
Michael Vogel bed99674d2 bbcode: two new bbcode elements (style, class) for CSS 2012-08-02 00:13:37 +02:00
Fabrixxm fde3edaa21 quattro: readd sparkle cursor 2012-08-01 04:45:27 -04:00
Fabrixxm bf04fb450a quattro: style for "show more" addon 2012-08-01 04:41:21 -04:00
friendica 14282a40bb Merge pull request #419 from fermionic/more-div-problems 
fix almost all errant divs in view/ and frost folders
 2012-07-31 21:58:08 -07:00
Zach Prezkuta fc22c356ff fix almost all errant divs in view/ and frost folders 2012-07-31 22:43:18 -06:00
friendica 764ee653ba Provide backend ability to poke as a comment rather than top-level post 2012-07-31 20:59:51 -07:00
Simon L'nu 0e7f6d1417 Merge remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  fix /display bug; oembed audio bug; other tweaks
  Frost: reduce DOM elements by about 20%; other tweaks and fixes
  rev update
  errant div in events_reminder.tpl
  pass deleted flag to display
  rev update
  fix filer bug; some interface tweaks
  Update view/theme/frost/nav.tpl
  Update view/theme/frost-mobile/nav.tpl
  don't show birthday/event details on mobile devices
  rev update
  remove server-specific change
  update version of frost and frost-mobile
  Modify Javascript to improve page loading times
  rev update
  Friendicaland got bigger.
 2012-07-31 23:16:56 -04:00
Zach Prezkuta 885bb50f0d fix /display bug; oembed audio bug; other tweaks 2012-07-31 18:53:18 -06:00
Zach Prezkuta b522ffeea5 Frost: reduce DOM elements by about 20%; other tweaks and fixes 2012-07-31 08:00:50 -06:00
Zach Prezkuta 72df6ff664 errant div in events_reminder.tpl 2012-07-30 07:59:08 -06:00
Domovoy 07f87848b4 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-07-30 13:36:33 +02:00
Zach Prezkuta 067865db9e fix filer bug; some interface tweaks 2012-07-29 14:49:12 -06:00
Domovoy 30d7db5e42 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-07-29 22:43:49 +02:00
fermionic 4f13618b18 Merge pull request #414 from 23n/patch-1 
Update view/theme/frost-mobile/nav.tpl
 2012-07-29 12:36:22 -07:00
Domovoy 2fc0fcdc18 Unlimited level threading is now a site option. 2012-07-29 19:53:04 +02:00
Domovoy 25015d3ab9 Update now handles threaded items. 2012-07-29 18:39:38 +02:00
Domovoy 8ea3087342 Collapsing is back for threaded comments. 
Comment box is displayed at the end of the thread.
Comments on comments are all collapsed
 2012-07-29 17:13:21 +02:00
23n 5b5e4b6cb7 Update view/theme/frost/nav.tpl 
moved identity/page management-link to system-menu
 2012-07-29 15:28:59 +03:00
23n 0f1b33a278 Update view/theme/frost-mobile/nav.tpl 
move identity management link to menu
 2012-07-29 15:07:52 +03:00
Domovoy 10eb873f7c Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-07-29 10:03:17 +02:00
Zach Prezkuta 38d4df77c6 remove server-specific change 2012-07-28 10:14:28 -06:00
Zach Prezkuta 231b37217b update version of frost and frost-mobile 2012-07-28 10:03:56 -06:00
Zach Prezkuta 1f09e7ad23 Modify Javascript to improve page loading times 
1. Add template category 'end' that places content right before final </body> tag
	2. Move most Javascript from tpl files into one cacheable file, theme.js
	3. Load scripts at end of the HTML document instead of in the header
	4. Minify several Javascript files

Note that the second and third things were only done for Frost and Frost Mobile. Doing it for every theme means going through every .tpl for every theme and rearranging the Javascript, which is tedious.
 2012-07-28 09:57:16 -06:00
Domovoy eaf0d04bfb Comment box is now inside the item. Makes it easier to know what we are commenting on. 2012-07-27 22:58:51 +02:00
Domovoy d558d25540 CommentBox is now hidden by default, this can be toggled with a fake link 2012-07-27 22:47:18 +02:00
Domovoy 8ecf8167db Threaded comments are starting to work. 
For now, only on normal view, and not during update
 2012-07-27 22:08:57 +02:00
Simon L'nu c5603cf756 fixed head.tpl before the last pull. hadn't pushed and merged with upstream yet. 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-07-25 22:35:50 -04:00
Simon L'nu 794ae669ce fixes to cursor 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-07-25 22:28:09 -04:00
Fabrixxm 727c93cb8c quattro: add id to items container div 
needed to make commit 4c6a4321 work
 2012-07-25 08:12:21 -04:00
Zach Prezkuta 2e080f594e update head.tpl for dispy 2012-07-24 18:29:23 -06:00
friendica 57a75d240b Merge pull request #406 from fermionic/frost-theme 
Introducing Frost
 2012-07-24 15:28:16 -07:00
Zach Prezkuta 9378bc1375 disable tos and privacy links 2012-07-24 09:27:27 -06:00
Zach Prezkuta 178329b6dc disable tos and privacy links 2012-07-24 09:26:12 -06:00
Zach Prezkuta f9809102a2 Introducing Frost Mobile 2012-07-24 09:16:51 -06:00
Zach Prezkuta 8126e8ea47 Introducing Frost 2012-07-24 09:15:57 -06:00
friendica aa5e60248a Merge pull request #405 from fermionic/support-for-mobile-themes 
changes to support a mobile theme
 2012-07-23 20:18:23 -07:00
Zach Prezkuta 5cb979f5e4 changes to support a mobile theme 2012-07-23 20:37:00 -06:00
friendica b20a80bf39 rev update 2012-07-23 15:27:25 -07:00
friendica 0ff93edeee poke privacy 2012-07-20 04:03:32 -07:00
friendica d1243c9ad7 allow to prefill - url/poke?f=&c=nn - nn is contact id 2012-07-19 20:54:23 -07:00
friendica a54278649f poke notifications 2012-07-19 20:13:40 -07:00
friendica b78bd8cc94 duplicate input names 2012-07-19 19:48:33 -07:00
friendica d442bbc482 have fun... 2012-07-19 18:17:16 -07:00
Martin Schmitt eae6e665c0 Esperanto -> 100% 2012-07-16 22:33:23 +02:00
Simon L'nu 021f0829e6 re-add the sparkle stuff 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-07-15 12:03:53 -04:00
friendica 15cae001d9 move plink sparkles to the right html element in dispy 2012-07-13 04:22:42 -07:00
Simon L'nu 10ce535cac add doctitle thingy, and update cursor 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-07-13 04:35:16 -04:00
Simon L'nu d08a97bb9f add some sparkle ;) 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-07-13 02:37:45 -04:00
Thomas Willingham bd08a6b565 Add sparkle cursor to Quattro/Vier/TestBubble 2012-07-12 19:21:21 +01:00
friendica 085b589468 add some sparkle to plinks 2012-07-11 21:04:08 -07:00
tomtom84 f475850739 diabook: add notification in website-title, whenever new notifications arrive 2012-07-08 21:50:17 +02:00
Vasudev Kamath ba4db236ec Merge branch 'master' of git://github.com/friendica/friendica 2012-07-06 22:47:27 +05:30
friendica 8b19168999 a bit more colour 2012-07-05 22:20:27 -07:00
friendica f40b056e3b some initial code and benchmarking for "red" content rendering engine 2012-07-04 20:37:15 -07:00
friendica fd626022ec add smarty engine, remove some obsolete zot1 stuff 2012-07-03 22:23:08 -07:00
Thomas Willingham badaa68340 Diabook directory wide variants. 2012-07-04 01:08:50 +01:00
Zvi ben Yaakov (a.k.a rdc) 424797138f Limiting .directory-photo-wrapper styles to <section> so as not to 
interfere with .directory-photo-wrapper in <aside>
 2012-07-03 21:49:02 +03:00
friendica f7144e671c fix diabook directory pages (only the normal style - any volunteers for the wide?) 2012-07-02 16:56:37 -07:00
Thomas Willingham 74a819980f Various theme stuff. 
Profile group list for testbubble
Screenshot for facepark
Various niggles in darkzero/NS
 2012-07-02 03:40:12 +01:00
friendica 696d78d658 Merge pull request #369 from rdc/master 
Added more profile data and CSS styling to the /directory page
 2012-07-01 16:44:21 -07:00
Martin Schmitt 85c078f862 Esperanto -> 100% 2012-07-01 19:13:24 +02:00
Zvi ben Yaakov (a.k.a rdc) 2214cd74e5 Added more profile data and CSS styling to the /directory page 2012-07-01 14:46:03 +03:00
friendica 31718968c6 advanced profile theming 2012-06-30 01:29:29 -07:00
Fabrixxm a03e6b96ea quattro: fix Forum widget, hide edit profile link 2012-06-29 05:47:53 -04:00
Fabrixxm 8b18ee49ff quattro: some updates 
- add makefile to rebuild both css with single command
- fix icons in Forums widget
- style photos pages
 2012-06-29 05:29:58 -04:00
friendica be658788de maintain page position when hovering on pop-outs 2012-06-28 22:19:12 -07:00
Simon L'nu ecf9ad9a08 fix item-delete-selected* css 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-06-28 12:15:32 -04:00
friendica eb3bbd9081 insidious little parsing bug 2012-06-26 22:32:07 -07:00
friendica f995a11641 have no idea why the if/endif macro block was getting printed and not processed. 2012-06-26 21:35:03 -07:00
friendica fa2a8fa9bd highlight js events-reminder on birthday events 2012-06-27 13:49:35 +10:00
friendica 359a98cd22 change event behaviour so that title is required but description is not 2012-06-25 21:20:08 -07:00
friendica fbaca4b742 event summary/title 2012-06-25 20:55:27 -07:00
Simon L'nu eb6bf7e7fa fix margin of wall-item-body 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-06-25 18:42:18 -04:00
Simon d944ff7833 Merge pull request #361 from simonlnu/master 
cleaned up the css a bit
 2012-06-25 14:25:33 -07:00
Simon L'nu 2ed3af55a8 fix delete thingy, and minor clean up 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-06-25 17:17:06 -04:00
Zvi ben Yaakov (a.k.a rdc) 51ef8fb7ff Added App::get_cached_avatar_image usage for displaying "Last users" 
avatar thumbs in right sidebar
 2012-06-25 14:01:16 +03:00
friendica 35a098e0dc service limits for photo uploads 2012-06-25 01:37:44 -07:00
friendica ad6c82bdea implement "follow" service limits 2012-06-24 22:23:17 -07:00
friendica c464bc494c add like/dislike to profiles 2012-06-24 21:16:55 -07:00
Simon L'nu 3b1d9d9695 update jquery to 1.7.2; fix some dispy templates to be more in sync with view/ 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-06-23 13:33:58 -04:00
friendica 7614d35cad liking comments backend 2012-06-23 04:44:48 -07:00
Vasudev Kamath 6e4760dd9c Merge branch 'master' of git://github.com/friendica/friendica 2012-06-23 08:11:35 +05:30
Simon L'nu 5cfa7dd041 minor tweaks to some tpl files 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-06-22 13:07:42 -04:00
Zach Prezkuta 54c76ca822 allow rotation either CW or CCW 2012-06-20 20:51:03 -06:00
Thomas Willingham 75e82dc077 Darkzero-NS fix weeks old BBIcon error 2012-06-21 03:14:41 +01:00
Thomas Willingham c4df339b92 Darkzero/NS - make the archives font the same colour as the other widgets. 2012-06-21 02:42:38 +01:00
Simon L'nu 0be715d271 icon change; tweak button in toolbar; move site-location 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-06-20 05:04:04 -04:00
tobiasd 79357ec60d Merge pull request #342 from fabrixxm/master 
quattro: auto scroll and flash comment in display page
 2012-06-19 10:12:09 -07:00
friendica 8b502bb486 position tweak 2012-06-19 03:34:31 -07:00
Tobias Diekershoff c2842efd3f [DE] strings 2012-06-19 08:44:11 +02:00
Fabio Comuni 4c6a432130 quattro: in post display page, scroll to and flash selected comment 2012-06-19 06:54:41 +02:00
friendica d614089582 make subdued elements jump out at you on hover 2012-06-17 22:50:02 -07:00
friendica 40e6d87d08 highlight the lost contact message 2012-06-14 17:41:24 -07:00
friendica 8c94fa23bf Merge https://github.com/friendica/friendica into pull 2012-06-14 17:39:17 -07:00
friendica be090cc851 better handling of dead contacts 2012-06-14 16:56:46 -07:00
fabrixxm 2f5e891cd1 quattro theme: show uncollapsed comments on display page 2012-06-14 09:25:18 -04:00
friendica 4229debff8 ajax append placeholder, fix some html warnings 2012-06-13 21:40:02 -07:00
friendica 920ea2e1c7 archive widget 2012-06-12 20:46:30 -07:00
Vasudev Kamath 11974b4d94 Merge branch 'master' of git://github.com/friendica/friendica 2012-06-11 20:47:11 +05:30
Simon L'nu 1605bcd901 minor template update 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-06-09 18:07:19 -04:00
friendica 52d90674ea better events-reminder theming 2012-06-07 18:08:15 -07:00
fabrixxm 1d832618a4 fix a random profile error message 2012-06-07 08:49:33 -04:00
friendica d2e86bdabc Merge https://github.com/friendica/friendica into pull 2012-06-06 22:29:35 -07:00
friendica 3b49035636 admin page untranslated strings, remove empty list element for update 2012-06-06 22:28:30 -07:00
zottel 6a95d483c7 A few corrections in German translations. 2012-06-07 01:43:32 +02:00
friendica dd001e32f4 rev update 2012-06-06 16:02:10 -07:00
friendica ae08d2c49b Merge https://github.com/friendica/friendica into pull 2012-06-05 17:59:49 -07:00
Tobias Diekershoff c7b1b4b752 DE: update for the strings 2012-06-05 11:42:57 +02:00
Vasudev Kamath 079fdecff1 Merge branch 'master' of git://github.com/friendica/friendica 2012-06-04 19:59:23 +05:30
friendica fe1dc1bf98 named anchors on display page 2012-06-04 04:28:20 -07:00
Tobias Diekershoff b13c6ea9ad quattro: added editor buttons to comments 2012-06-04 11:49:16 +02:00
Vasudev Kamath 12474e3c2e Merge branch 'master' of git://github.com/friendica/friendica 2012-06-04 12:04:17 +05:30
Tobias Diekershoff ca105f1c66 quattro: cleanup the less file 2012-06-04 07:17:23 +02:00
Simon L'nu 34f210bc2d fix mini photo-menu bug 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-06-03 18:10:04 -04:00
Zach Prezkuta 77962aa79d Fix bugs in the retraction code 
Currently, the following seems to be the functional status:
	For a Diaspora top-level post:
		Friendica comments show up AND delete
		Diaspora comments show up AND delete for top-level owner
		Diaspora comments show up for non-owner
		Diaspora comments sometimes don't delete for non-owner
			-> Appears to be Diaspora's fault, as a "not a valid object" error shows up in the log

		Friendica likes show up, but can't unlike (Friendica doesn't even message Diaspora)
		Diaspora likes show up
		Diaspora non-owner can't unlike
			-> Same as comments, seems to be Diaspora's fault

	For a Friendica top-level post:
		Friendica comments show up AND delete
		Diaspora comments show up AND delete

		Friendica likes don't show up in Diaspora sometimes
		Friendica doesn't even message Diaspora for unlikes (sometimes?)
		Diaspora likes and unlikes work
 2012-06-03 14:53:30 -06:00
Zach Prezkuta c0af6dbb1a Implement relaying of relayable_retractions 
Also: some whitespace cleanup, fix Diaspora parent DB query
 2012-06-03 14:53:29 -06:00
Tobias Diekershoff 959b264c44 quattro: admin panel styling and 1st buttons for addon/theme overview 2012-06-03 22:32:42 +02:00
Tobias Diekershoff 2741ce67f8 privacy settings: make submit button translateable 2012-06-03 17:38:05 +02:00
Tobias Diekershoff 283524d990 DE: update to the strings 2012-06-03 17:33:28 +02:00
Tobias Diekershoff 6fbeafc843 prv messages: make submit translateable 2012-06-03 17:16:29 +02:00
friendica d27c6de84e add hometown to profiles 2012-06-02 20:58:20 -07:00
friendica 608d424b0b "howlong" added to marital status. 2012-06-02 02:30:26 -07:00
friendica 1180919c89 some zero theming on settings page 2012-05-30 16:30:51 -07:00
friendica bdcb8d27dd transition to beta for private forums 2012-05-30 15:52:17 -07:00
friendica 88a0d6a1d5 private group tests, cont. 2012-05-29 22:57:15 -07:00
friendica b6fe837a64 hide private group if desired 2012-05-29 18:43:56 -07:00
Simon 43c185ce04 Merge pull request #316 from annando/master 
Speed improvements
 2012-05-29 13:13:10 -07:00
Simon L'nu dd666e93d8 fix toolbar. more size dynamicism 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-29 16:09:02 -04:00
Michael Vogel 68757f2504 Merge remote branch 'upstream/master' 2012-05-29 16:09:26 +02:00
friendica 2eafa9a475 ability to only expire contacts, not self 2012-05-29 01:14:53 -07:00
friendica 2dc7e53435 more theme cleanup 2012-05-28 19:17:06 -07:00
Simon L'nu cb259098dd fixed font-size/line-height stuffs 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-28 19:25:10 -04:00
friendica 6962989e52 slackr - tone down the shadows a smidgin 2012-05-27 23:02:25 -07:00
Michael Vogel a71e3134bf Merge remote branch 'upstream/master' 2012-05-25 16:19:10 +02:00
friendica d1345e5054 Merge https://github.com/friendica/friendica into pull 2012-05-25 00:43:09 -07:00
friendica abb9fecf09 rev update 2012-05-25 00:42:38 -07:00
Tobias Diekershoff 07535692dc DE update to strings and templates 2012-05-25 06:04:33 +02:00
Simon 5bc0cfa067 Merge pull request #313 from fabrixxm/master 
install wizard: fix php executable path
 2012-05-24 16:30:22 -07:00
Simon L'nu 2a32917e3a update dark a bit. i messed up some buttons 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-24 19:28:12 -04:00
root 60df67b9e3 fix small js error when user not logged in 2012-05-24 04:29:33 -04:00
root a5b8339a75 install wizard: fix php executable path 
- php executable not required
- "check again" button submit form instead of reload page via js
- checks form submit to install module without redirect
 2012-05-24 04:21:33 -04:00
friendica f0ddcb979b slackr: improve interactivity 2012-05-23 23:29:45 -07:00
friendica 6c78d42050 slackr: hide calendar when posting 2012-05-23 18:20:24 -07:00
friendica 5d06e0060d Merge https://github.com/friendica/friendica into pull 2012-05-23 16:58:58 -07:00
friendica 60723702f1 more theme stuff 2012-05-23 16:58:31 -07:00
Simon L'nu 16f9d7fd35 clean up and more fixing 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-23 19:22:07 -04:00
friendica 19bf0aa283 slackr - better highlighting of current selections 2012-05-23 16:16:59 -07:00
friendica 5b7865f8f9 slackr - knock the sharp edges off the events calendar 2012-05-23 15:55:09 -07:00
Simon 5acd0a1c32 Merge pull request #309 from fabrixxm/master 
Update install wizard
 2012-05-23 15:10:24 -07:00
Simon L'nu 5198260e3a clean up and make nice the dispy photo edit stuff 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-23 18:06:49 -04:00
Simon L'nu 789063da39 add a placeholder attribute on search-text; dispy fixes 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-23 15:58:22 -04:00
root 325343a492 Update install wizard 
- writable .htconfig.php not required
- add test for working .htaccess/mod_rewrite configuration
- fix last pass: create tables, eventually show config text and print a "What next" section
 2012-05-23 07:38:31 -04:00
friendica 61dba985c1 photo rotation 2012-05-23 01:01:04 -07:00
friendica 8ffb65ceef event calendar theming 2012-05-22 22:34:35 -07:00
friendica 86a38cca24 import quattro event reminder 2012-05-22 22:06:52 -07:00
friendica af495879af mark bubbles unsupported 2012-05-22 21:54:19 -07:00
friendica 3ac7c4e859 keep FB out of private notes 2012-05-22 21:20:31 -07:00
friendica 0da20ec9ef Merge https://github.com/friendica/friendica into pull 2012-05-22 18:06:34 -07:00
friendica e70573f34c if identity (uid) changes - reload any other open browser windows on next ping. 2012-05-22 16:01:07 -07:00
Thomas Willingham b962559570 Oops - but lets commit the right revision, sorry. There's a spare line in the last one. 2012-05-22 19:19:36 +01:00
Thomas Willingham 18983bb932 Fix darkzero/ns BB icon background colours. 2012-05-22 19:14:58 +01:00
friendica f29f861d25 add queue totals to admin summary page 2012-05-22 03:44:03 -07:00
Tobias Diekershoff be64437b14 DE: update to the strings and some mail templates 2012-05-22 12:17:01 +02:00
Simon L'nu d466c9ab08 fix (min-)search-text text 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-21 21:38:53 -04:00
Simon L'nu bd3c0edf34 updates to dispy family; fix typo in INSTALL.txt 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-21 21:29:18 -04:00
friendica 9ca3ac6e61 Merge https://github.com/friendica/friendica into pull 2012-05-21 16:43:07 -07:00
friendica 54e2c1ca81 rev update, bug 428, 429, and ability to block globaldir submissions from demo sites 2012-05-21 16:40:11 -07:00
Simon L'nu 627367e1ee more light fixes 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-21 06:48:08 -04:00
Simon L'nu cb2702249f fix dumb mistake in light 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-21 02:47:43 -04:00
Simon L'nu 2ac55c9f21 fix dispy light 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-20 14:37:20 -04:00
Thomas Willingham c6104fb856 Darkzero-NS + 'Friendicaland' countries. 2012-05-20 01:44:07 +01:00
Michael Vogel 8c80fe0bf5 Performance tests 2012-05-20 00:11:32 +02:00
Thomas Willingham 4484bd0e97 Darkzero, another missing part of "everything" 2012-05-19 17:30:55 +01:00
Thomas Willingham b1c58511ad Diabook-dark - some more cleaning up 2012-05-19 17:20:27 +01:00
Thomas Willingham a1b96d11a7 Okay, so maybe not *everything* 2012-05-19 15:17:35 +01:00
Thomas Willingham d6ca4a1b42 Give Darkzero some loving. 
Everything that used to be hidden with light text on light backgrounds is legible now.
 2012-05-19 14:51:10 +01:00
Simon L'nu 4a35a51724 fix -desc again 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-19 03:15:35 -04:00
friendica 3821744450 apply max-width to images in posts, duepuntozero 2012-05-18 01:46:02 -07:00
friendica 34b79b4f2b theming for default group selector 2012-05-18 01:38:11 -07:00
friendica 7b0ded3f14 more private forums, default privacy group for new contacts 2012-05-17 22:44:52 -07:00
Simon L'nu 331013f281 fix admin links... 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-16 13:33:20 -04:00
Simon L'nu a8a3732f05 *sigh*. fix dark *again* 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-16 05:51:29 -04:00
Simon L'nu 7eb73bc600 get rid of the monstrosity for .button. need to find alternate solution 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-16 05:32:08 -04:00
Simon L'nu fca09c9d4c slight re-design of wall stuff and css/font cleaning 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-16 01:58:55 -04:00
Tobias Diekershoff 68dc7c3568 DE strings 2012-05-15 10:44:01 +02:00
friendica 0faa0c2ab1 slackr drop shadows extended 2012-05-14 21:45:37 -07:00
Simon L'nu db5fe14241 finish dipsy light colour fixes 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-14 00:30:25 -04:00
tommy tomson 303856ce01 diabook-theme: small fixes 2012-05-13 20:51:39 +02:00
friendica eaf028c9fb Merge https://github.com/friendica/friendica into pull 2012-05-12 22:20:03 -07:00
friendica e7813f22af slackr drop shadows 2012-05-12 22:19:29 -07:00
Simon L'nu 93dc96e2cf css fixes; new screenshots 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-12 18:53:01 -04:00
friendica 72d8e0459d Merge pull request #294 from mschmitt/master 
Esperanto at 100% again
 2012-05-12 15:01:05 -07:00
Martin Schmitt ae300bceb9 Ĝisdatigis la esperantlingvan tradukaĵon al 100%. 2012-05-12 16:56:31 +02:00
Vasudev Kamath 3a45d4f9e0 Merge branch 'master' of git://github.com/friendica/friendica 2012-05-12 20:20:26 +05:30
tommy tomson 9699d9cd01 diabook-theme: fix in earthlayers 2012-05-12 16:11:46 +02:00
tommy tomson 2882012e1b diabook-theme: some fixes 2012-05-12 13:50:22 +02:00
Simon L'nu c6897d0dc4 finished migrating dispy light - maybe 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-12 07:29:36 -04:00
Vasudev Kamath 10db2f00f9 Merge branch 'master' of git://github.com/friendica/friendica 2012-05-12 12:10:09 +05:30
Thomas Willingham 2454028ef6 Darkzero - fixed notifications bar. 2012-05-12 00:32:47 +01:00
tommy tomson 48c48d644f diabook-theme: update mapquery and small fix 2012-05-11 16:41:16 +02:00
tommy tomson 74e79a06a8 diabook-theme: add "population density 2010"-layer to EarthLayers-box 2012-05-11 14:56:59 +02:00
friendica 49cd3f615d Merge https://github.com/friendica/friendica into pull 2012-05-11 04:05:25 -07:00
tommy tomson f9d5e602ac diabook-theme:small fix 2012-05-11 13:04:25 +02:00
friendica 7600b9b1ee Merge https://github.com/friendica/friendica into pull 2012-05-11 03:42:05 -07:00
friendica 496782e468 moderated comment templates 2012-05-11 03:41:29 -07:00
tommy tomson e13e5070a7 diabook-theme: small fix 2012-05-11 09:01:58 +02:00
tommy tomson a81faead6e diabook-theme: include prv_message autocomplete 2012-05-11 08:39:39 +02:00
friendica 8a5dcf64d8 fix PM replies after autocomplete changes 2012-05-10 20:01:13 -07:00
tommy tomson b2bd25a470 Merge remote-tracking branch 'origin/master' 2012-05-11 02:40:09 +02:00
tommy tomson ccc825ccbc diabook-theme: small fix 2012-05-11 02:39:54 +02:00
Thomas Willingham e7b8e839ae Diabook-dark. More touchups. 2012-05-10 17:14:27 +01:00
friendica c5f6755bdd specified background image does not exist 2012-05-10 05:49:48 -07:00
tommy tomson 3ac5d19b92 diabook-theme: some fixes 2012-05-10 12:19:51 +02:00
friendica c9bb888611 priv mail autocomplete, improved contrast for darkzero, etc. 2012-05-10 02:01:08 -07:00
friendica 93ae6ee97b Merge https://github.com/friendica/friendica into pull 2012-05-10 01:46:29 -07:00
friendica 774c51cc19 email autocomplete 2012-05-10 01:45:51 -07:00
tommy tomson 7b41c0a555 Merge remote-tracking branch 'origin/master' 2012-05-10 09:54:47 +02:00
tommy tomson 69b43582d0 diabook-theme: some css/bug-fixes 2012-05-10 09:54:16 +02:00
Simon L'nu a077e63fa5 don't make -desc so obnoxious looking 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-10 02:27:48 -04:00
Thomas Willingham 89d3ce7b5d Diabook-dark - do things the right way instead of the stupid way. 2012-05-09 04:54:17 +01:00
Thomas Willingham d2bbd92889 Fix TinyMCE, but needs adding to theme.php 2012-05-09 03:42:09 +01:00
Thomas Willingham 8a1f8515ca Fix jquery.fancybox, but still needs adding to theme.php 2012-05-09 03:31:56 +01:00
Thomas Willingham a0293ae442 Diabook-dark cleaned up a bit. 2012-05-09 03:21:26 +01:00
friendica a048fd806a don't provide 'show more' on remote friends in common unless there are actually more 2012-05-08 17:40:56 -07:00
Tobias Diekershoff d2c2063084 DE update for the strings 2012-05-08 09:56:05 +02:00
tommy tomson 88443ed3fb diabook-themes: state of the boxes at right_aside are now stored in db, instead of cookie. 2012-05-08 03:29:25 +02:00
friendica e8b9b8a403 separate poll_interval from delivery_interval - default is the same. 2012-05-07 04:21:54 -07:00
Simon L'nu e554530430 more css tweaks. nothing major 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-07 01:20:32 -04:00
tommy tomson e417f083b5 diabook-theme: small fix 2012-05-07 02:49:44 +02:00
tommy tomson 3d0a0b6abf diabook-theme: add "Earth Layers"-box at right_side 2012-05-07 02:24:43 +02:00
tommy tomson 66b9b60792 diabook-theme: twitterbox-bugfix 2012-05-06 23:26:44 +02:00
tommy tomson f09b3cfbf8 diabook: small fix 2012-05-06 12:25:09 +02:00
tommy tomson 8bdbfdc853 Merge remote-tracking branch 'origin/master' 2012-05-06 12:09:22 +02:00
tommy tomson abbb4c2f36 diabook-theme: bugfix 2012-05-06 12:08:46 +02:00
Simon L'nu f32c3d74a4 fixing widths to be more dynamic where possible. font size fixes. add README.md 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-06 06:05:31 -04:00
tommy tomson e1ab3a93cc diabook-theme: small fix 2012-05-06 00:36:46 +02:00
tommy tomson c421f35da7 diabook-theme: twitter-box-update at right_aside 2012-05-06 00:10:35 +02:00
tommy tomson f297751437 diabook-theme: can now set the twitter search term in theme-settings & small fixes 2012-05-05 20:01:38 +02:00
Vasudev Kamath b5e857c0e7 Merge branch 'master' of git://github.com/friendica/friendica 2012-05-05 20:48:16 +05:30
friendica 8f26e698e6 Merge pull request #289 from cvogeley/master 
Option to set theme width added. Minor layout changes
 2012-05-05 05:04:05 -07:00
Tobias Diekershoff f9f62ee7ec DE: new email templates translated 2012-05-05 09:11:25 +02:00
Christian Vogeley 7f061c255c Option to set theme width added. Minor layout changes 2012-05-05 00:45:35 +02:00
Simon L'nu 20ea1b7d4b fix lightbox; finished dark, now on to light 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-04 17:06:17 -04:00
Martin Schmitt 52f4563f30 Esperanto 100% 2012-05-04 12:02:05 +02:00
friendica 9ecd128e5e "show more" friends in common 2012-05-04 01:46:36 -07:00
Tobias Diekershoff 22c8fe46a5 DE strings 2012-05-04 07:30:49 +02:00
friendica 421acee65b implement max load average before queuing/deferring delivery and poller processes 2012-05-03 21:50:48 -07:00
Ludovic Grossard 1f86205ee8 proofreading the mail templates in fr 
fixed typo, grammar, spelling…
 2012-05-03 22:35:59 +02:00
Simon L'nu bb081e4bf5 forgot to move modernizr up. modernizr needs to be in <head>, like html5shiv (which it includes) 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-03 14:35:21 -04:00
Simon L'nu 1a13c56fef major reworking of dispy dark. light to follow 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-03 14:25:18 -04:00
tommy tomson d72db2e1aa diabook-theme: small fix 2012-05-03 07:57:40 +02:00
tommy tomson ff2ddc319d diabook-theme: small fix 2012-05-03 06:25:23 +02:00
tommy tomson 3521e22333 diabook-theme: made boxes at right_aside sortable 2012-05-03 06:05:55 +02:00
Max Weller f0c11cac4a Moved Meta Viewport from global head.tpl to diabook's header 
I mistakenly added this <meta> tag to the global header, but it
causes problems for other themes, as they have other optimal widths.

I also added a style to diabook which makes the jGrowl messages
appear below the header bar, so you can still click the menu items
without having to close messages first.
 2012-05-02 16:59:58 +02:00
tommy tomson 6875f54647 diabook-themes: more improvements in theme.php, add titles to bbcode under coment-box 2012-05-02 16:27:01 +02:00
tommy tomson 67471bb534 diabook-theme: tryied to improve performance a bit 2012-05-02 14:33:04 +02:00
tommy tomson 6a9cd8cd4b diabook-theme: fix footer/impressum 2012-05-02 12:40:51 +02:00
friendica 1fab28c413 fix size 2012-05-01 20:38:06 -07:00
friendica 066d69b21c add template 2012-05-01 20:22:59 -07:00
friendica 8bd6e1aef9 first try common friends for visitors 2012-05-01 19:16:18 -07:00
Thomas Willingham 671a10f5d4 More Diabook-dark touch-ups. Should *really* be useable this time...with editplain anyway. 2012-05-01 21:37:49 +01:00
tommy tomson ab556857f0 diabook-themes: small fix at "community pages"-box 2012-05-01 16:46:08 +02:00
Simon L'nu 6d3ba2825b lighten bg and darken font on dispy light 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-01 04:02:56 -04:00
Simon L'nu e245ecddf2 sub-minor change to head.tpl 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-01 01:56:21 -04:00
Simon L'nu 46558e98a8 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  diabook-themes: add "community profiles"-box to right_column
  change api.php in function api_item_get_user to check if $usercache is NULL before checking an element in it
  make 'aaa joined group bbb' work from the initiating end, new privacy pref to control it also hidewall wasn't properly checked before sending 'xxx is friends with yyy' messages
  diabook-themes: add "last tweets"-box to right_aside, that searches for #friendica on twitter
  rev update
  start adding tooltips to tab menus
  fix join group notifications

* master:
 2012-05-01 00:49:42 -04:00
tommy tomson 2c577ed90f diabook-themes: add "community profiles"-box to right_column 2012-05-01 06:21:40 +02:00
friendica a3a55897e5 Merge https://github.com/friendica/friendica into pull 2012-04-30 19:04:28 -07:00
friendica 3c0cf72716 make 'aaa joined group bbb' work from the initiating end, new privacy pref to control it 
also hidewall wasn't properly checked before sending 'xxx is friends with yyy' messages
 2012-04-30 19:01:41 -07:00
tommy tomson f35ffa9b60 diabook-themes: add "last tweets"-box to right_aside, that searches for #friendica on twitter 2012-05-01 02:33:55 +02:00
Simon L'nu 9b7dac6ce1 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  provide "xxx joined yyy" notifications
  adding META viewport tag for better look on tablets
  Update Esperanto to 100%
  DE update to the strings
  activitystreams schema constants for "join group"
  missed a db field
  typo in profile_selectors, fix remote tagging
  not all profile selector choices have unique or direct translations
  log db error strings in all cases
  admin page to manage failed updates
  improved db error logging
  close one menu (like the notifications menu) when another one is opened (like it is done when clicking somewhere else) (thx to ^mw)

* master:
 2012-04-30 06:02:38 -04:00
friendica 9f18c9d664 Merge pull request #277 from mschmitt/master 
Update Esperanto to 100%
 2012-04-30 01:29:50 -07:00
Max Weller 9d8a0553ac adding META viewport tag for better look on tablets 2012-04-30 09:48:21 +02:00
Martin Schmitt 5b9f01c3ab Update Esperanto to 100% 2012-04-30 09:00:03 +02:00
Tobias Diekershoff f08dc392df DE update to the strings 2012-04-30 08:39:12 +02:00
friendica 0153d86b7f admin page to manage failed updates 2012-04-29 19:10:07 -07:00
Simon L'nu 34eb843fb4 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  the heart should really be red.
  fix location change notification
  enhanced profile reporting for single values
  add db field for removed account, which will also be the first test of update error checking
  toggle to archive unfriends, though render them useless
  indicate successful updates
  diabook-themes: small fix
  diabook-themes: bug/css-fixes
  some constants for the db update failure possibilities
  bring back the email and logging of update failures, but without the transactions

* master:
 2012-04-29 22:06:16 -04:00
tommy tomson 920d40acf4 diabook-themes: small fix 2012-04-29 05:58:23 +02:00
tommy tomson 3d054341ef diabook-themes: bug/css-fixes 2012-04-29 04:12:04 +02:00