Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,389 Commits 28 Branches 95 Tags 527 MiB
d7178e96d7
Commit Graph

8957 Commits

Author SHA1 Message Date
Doug Blank
726da689c6 Revised undo/redo for different versions of gtk 
svn: r15762
 2010-08-17 14:18:04 +00:00
Jérôme Rapinat
5ae9f75ded Slovenian Date et Relationships handlers (by Bernard Banko) 
svn: r15761
 2010-08-17 08:16:24 +00:00
Rob G. Healey
500c0d6bf1 updateaddons: fixed typo to remove the the Gramps website to just the Gramps... 
svn: r15760
 2010-08-17 07:00:28 +00:00
Doug Blank
d86759b5a7 Added UndoableBuffer to text gramplets; fixed an issue in recognizing keypresses accurately; rewrote keypress handler 
svn: r15759
 2010-08-17 06:39:10 +00:00
Doug Blank
3154f970ac Typos in code 
svn: r15758
 2010-08-17 05:45:26 +00:00
Doug Blank
d441154d3a 4177: Needed usability improvements to addon update window 
svn: r15757
 2010-08-17 05:09:01 +00:00
Doug Blank
fa09584578 4178: undo on note editor goes back to no text; added a reset method to styled text buffer and editor 
svn: r15756
 2010-08-16 23:25:07 +00:00
Rob G. Healey
21651501ca Final piece of moving Mapstraction stylesheet into src/plugins/webstuff/css . 
svn: r15755
 2010-08-16 22:18:09 +00:00
Doug Blank
2789f19366 Hook up undoable inserts 
svn: r15754
 2010-08-16 16:27:42 +00:00
Jérôme Rapinat
94f0d17c8b update Slovenian files 
svn: r15752
 2010-08-16 12:23:56 +00:00
Doug Blank
6a26f7b873 Added UndoableBuffer for notes that allows undo (control+z) and redo (control+shift+z) 
svn: r15751
 2010-08-16 11:44:26 +00:00
Doug Blank
14a5f9a1b8 New MultiTreeView to allow left-click to drag a multi-selected group 
svn: r15750
 2010-08-16 11:20:45 +00:00
Doug Blank
41931ba9c0 Allow lang_SUBTYPE formats; fixed an error when no network 
svn: r15749
 2010-08-16 04:30:17 +00:00
Doug Blank
918b052ebb Needed a DATABASE_ROUTERS default 
svn: r15748
 2010-08-16 03:31:40 +00:00
Rob G. Healey
ddf488c8b0 Moved src/data/Mapstraction.css over to sex/plugins/webstuff/css with the other ones. Updated src/data/Makefile.am to reflect the move. 
svn: r15747
 2010-08-16 03:01:36 +00:00
Doug Blank
838ba4cf05 Moved data/*.css to plugins/webstuff/css/ 
svn: r15746
 2010-08-16 01:31:34 +00:00
Doug Blank
280e904d80 Remove duplicate css files 
svn: r15745
 2010-08-16 01:28:48 +00:00
Doug Blank
6224028253 Select all/none for addon updates 
svn: r15744
 2010-08-16 01:27:14 +00:00
Doug Blank
04d60b30ff Fixes to work under Django 1.2 
svn: r15743
 2010-08-16 00:16:16 +00:00
Rob G. Healey
9492b706b6 NarrativeWeb: Fixed problem on DownloadPage. Style sheets: Removed elements from DownloadPage. Download page and files now share the same copyright license as the remaining of the pages. 
svn: r15742
 2010-08-15 23:43:08 +00:00
Doug Blank
00aaa7197a Fixed bug preventing control+shift+b key presses from working in styled text editor 
svn: r15741
 2010-08-15 20:20:39 +00:00
Doug Blank
5f7d9daaef Fixed bug preventing control+b etc. key presses from working in styled text editor 
svn: r15740
 2010-08-15 13:30:14 +00:00
Benny Malengier
02c68684d6 4166: Export Assistant crashes when closing or cancelling using the mouse 
svn: r15738
 2010-08-15 11:59:23 +00:00
Doug Blank
bc6b0e6fdf Control+c, Control+v are now handled properly by nav views and otherwise 
svn: r15736
 2010-08-14 19:06:47 +00:00
Doug Blank
4617fa8f50 Defaults to check once a week, everything, enable logging 
svn: r15735
 2010-08-14 18:16:10 +00:00
Doug Blank
7109925ffb Have update select default to True 
svn: r15734
 2010-08-14 15:43:50 +00:00
Doug Blank
5ea17d75bc Allow multiple objects to be copied 
svn: r15732
 2010-08-14 09:20:20 +00:00
Doug Blank
64a532d38d minor tweak in position 
svn: r15731
 2010-08-14 09:18:41 +00:00
Doug Blank
be131c368d added updateaddons.glade to system files 
svn: r15730
 2010-08-14 00:41:13 +00:00
Doug Blank
5ad0aa48dc Now can download selections 
svn: r15729
 2010-08-14 00:20:12 +00:00
Doug Blank
40820ea6ea Fixed three errors in ListModel 
svn: r15728
 2010-08-13 23:35:53 +00:00
Doug Blank
3551fe851a Added option of what addons to check (new, updated, or both) 
svn: r15727
 2010-08-13 21:44:21 +00:00
Serge Noiraud
f3c614add6 GeoView : Resizing not done the first time we load a page. 
Centering not always correct.


svn: r15726
 2010-08-13 17:57:40 +00:00
Doug Blank
6a781138fe Bring dialog box, if updates available (doesn't update them yet) 
svn: r15725
 2010-08-13 14:32:09 +00:00
Doug Blank
f3fb0b9d2e Checks for open network connection; get listing file in proper language 
svn: r15724
 2010-08-13 13:31:00 +00:00
Peter Landgren
e7c741a2a7 Issue 4164, correction. 
svn: r15723
 2010-08-13 11:23:33 +00:00
Doug Blank
7c6cba4fae New check for updated addons 
svn: r15721
 2010-08-13 06:42:14 +00:00
Doug Blank
f9af188191 Perference for checking (and currently updates) addons 
svn: r15720
 2010-08-13 06:18:11 +00:00
Doug Blank
506f9dc643 Refactor to move load_addon_file out of gui code 
svn: r15719
 2010-08-13 04:19:16 +00:00
Doug Blank
99101d2166 Force an addon translation to be in a given language(s) 
svn: r15718
 2010-08-13 03:55:54 +00:00
Peter Landgren
534fac7b93 Issue 4164, Graphviz version=2.26.3 
svn: r15717
 2010-08-12 18:27:46 +00:00
Peter Landgren
418d7dd39f Fixed a typo. 
svn: r15715
 2010-08-12 07:10:42 +00:00
Peter Landgren
f378a193e0 Date part of issue 4160. Use of option Use full dates instead of full year works again. 
svn: r15713
 2010-08-12 06:02:16 +00:00
Peter Landgren
b3e313d5ce Date part of issue 4160. Use of option Use full dates instead of full year works again. 
svn: r15712
 2010-08-12 05:59:17 +00:00
Doug Blank
2fc5096d23 CSS and web resources are now a plugin 
svn: r15711
 2010-08-12 05:26:45 +00:00
Rob G. Healey
113b2a0214 Stylesheet: Removed the light blue background on the tables cells. 
svn: r15709
 2010-08-12 02:28:15 +00:00
Rob G. Healey
264d6145be NarrativeWeb: changed the name of the navigation menus stylesheet to match other stylesheet naming. 
svn: r15708
 2010-08-12 02:26:26 +00:00
Doug Blank
961c1e4ca9 Forgot to include navigation web pages 
svn: r15707
 2010-08-11 21:33:12 +00:00
Serge Noiraud
5870e0a686 GeoView : remove completely mapstraction v1. 
svn: r15706
 2010-08-11 18:21:26 +00:00
Serge Noiraud
b2886e3dad GeoView : Some cleaning. Some corrections with googlev3 crosshair. 
Resizing now ok with a new crosshair implementation for googlev3.


svn: r15705
 2010-08-11 18:00:18 +00:00
Doug Blank
864c79e446 First step in breaking up NarrativeWeb into plugins; please test 
svn: r15704
 2010-08-11 14:11:35 +00:00
Peter Landgren
919f632993 Issue 4162, correction of box width. 
svn: r15702
 2010-08-11 07:00:14 +00:00
Doug Blank
0199cd7da5 Enhanced GENERAL plugins for flexible API: added data and process to GENERAL plugindata, more details at http://www.gramps-project.org/wiki/index.php?title=Addons_development#General_Plugins 
svn: r15701
 2010-08-11 05:42:46 +00:00
Doug Blank
abd7b09450 Added _%s_ for surrounding name parts, such as _Call_ 
svn: r15700
 2010-08-10 15:37:12 +00:00
Doug Blank
f55cd42926 Allow GENERAL plugins to have category, and more flexibility 
svn: r15699
 2010-08-10 13:14:09 +00:00
Doug Blank
aca9b9cb5c Moved all behavior from clipboard gramplet to clipboard, which they now share 
svn: r15698
 2010-08-09 21:36:21 +00:00
Doug Blank
e3cd87484c Added copy and paste to all views; gramplet view needs work 
svn: r15697
 2010-08-09 20:51:54 +00:00
Doug Blank
981cda7c19 Refector: moved some class methods to module functions 
svn: r15696
 2010-08-09 20:04:48 +00:00
Peter Landgren
634453708f Issue 4124. See also Wiki for substitution keywords. 
svn: r15694
 2010-08-09 17:44:37 +00:00
Doug Blank
315d7621c1 4159: New Backup option creates invalid file when media is included 
svn: r15693
 2010-08-09 13:51:32 +00:00
Doug Blank
77fa72cc35 Name Format strings can have XML in them; now escaped- prevented valid XML from being written 
svn: r15691
 2010-08-09 13:02:06 +00:00
Rob G. Healey
b0060b7542 NarrayiveWeb: More tweaking of _create_family_map(). 
svn: r15690
 2010-08-09 06:56:47 +00:00
Doug Blank
791ab064f8 Renamed GrampsCursor to BsddbBaseCursor 
svn: r15689
 2010-08-08 22:06:54 +00:00
Nick Hall
c0944d5df0 Tidy up warnings and change error to warning in flat model 
svn: r15688
 2010-08-08 18:59:09 +00:00
Nick Hall
0fb8ef6da4 Sort by "surname" instead of "group as" in flat person view 
svn: r15687
 2010-08-08 18:33:44 +00:00
Doug Blank
8455278a83 Update gramps-connect to use new reg_plugin params 
svn: r15685
 2010-08-08 13:16:23 +00:00
Doug Blank
c15fdb15c4 No need to crash, just warn, on dup nodes 
svn: r15684
 2010-08-08 13:15:36 +00:00
Doug Blank
691a52295f Fixed issue in showing database repair message 
svn: r15683
 2010-08-08 13:14:45 +00:00
Rob G. Healey
b64439c263 Adjusted PlaceListPage elements to make it fit correctly. 
svn: r15682
 2010-08-05 18:04:53 +00:00
Doug Blank
db09dcc6bf Added a new method to work around gramps' use of show_all: hidden_widgets 
svn: r15681
 2010-08-03 00:57:50 +00:00
Nick Hall
27ab4c5484 Raise error if duplicate handle added to model 
svn: r15680
 2010-08-02 14:12:12 +00:00
Doug Blank
e0df78182c Solved the gramplet popup menu not working 
svn: r15679
 2010-08-02 05:23:35 +00:00
Nick Hall
2bece278c0 Fix error handling when merging people 
svn: r15675
 2010-08-01 18:18:29 +00:00
Doug Blank
12e174b7f3 3366: Assistant for new users 
svn: r15674
 2010-07-31 17:19:37 +00:00
Doug Blank
dc0d9511a3 Only use iter_items if you are sure it is used just once; fixed issue duplicating places 
svn: r15673
 2010-07-31 15:55:56 +00:00
Doug Blank
7ea1f71083 Removed debugging trace 
svn: r15672
 2010-07-31 15:42:42 +00:00
Doug Blank
59dca4e3ea 3502: Extend CSV import to include additional fields; added source title to export 
svn: r15671
 2010-07-31 15:18:41 +00:00
Doug Blank
e4bb905303 Added is_type('Name'), is_burial(), and is_baptism() 
svn: r15670
 2010-07-31 15:17:23 +00:00
Doug Blank
9ddb7990f5 Added family type drag objects 
svn: r15669
 2010-07-31 02:11:47 +00:00
Nick Hall
e1f34d3ebe Add new merge functionality to tree views (see r15645) 
svn: r15668
 2010-07-30 18:13:06 +00:00
Rob G. Healey
0c6b7405c2 Complete my issue with the zoom level of the maps. 
svn: r15667
 2010-07-30 05:35:17 +00:00
Doug Blank
6175654510 Fixed right-click with no selection issue 
svn: r15666
 2010-07-30 05:13:32 +00:00
Doug Blank
77e5629012 Added ability for multiple selections from Simple Tables of Quick Views to be dropped on Clipboards 
svn: r15665
 2010-07-30 01:18:49 +00:00
Doug Blank
2cabdbf0a3 Update detached window title when changing the gramplet title 
svn: r15664
 2010-07-29 18:37:37 +00:00
Doug Blank
bedb543d4c Removed TreeTips: didn't work right, and didn't use actual tooltips 
svn: r15663
 2010-07-29 16:57:25 +00:00
Jérôme Rapinat
548533d472 4089: 5 caracters for short months 
svn: r15662
 2010-07-29 08:51:24 +00:00
Doug Blank
ca5c080b03 Added icons for each row; fixed multi object select, drag, and drop; many refinements 
svn: r15658
 2010-07-29 08:01:24 +00:00
Doug Blank
fc4240dcfe Fixed a couple of misspelled methods 
svn: r15657
 2010-07-29 07:59:54 +00:00
Doug Blank
aa5cefd789 Refactored listviews to be able to select multiple items for dnd 
svn: r15656
 2010-07-29 07:59:07 +00:00
Doug Blank
d791f1654b Added a new raw_list dnd type 
svn: r15655
 2010-07-29 07:57:43 +00:00
Doug Blank
9bc3a5d603 Cleanup and refactor of some of Scratchpad, especially to make easier to use for Clipboard Gramplet 
svn: r15654
 2010-07-28 15:04:45 +00:00
Doug Blank
0f310e78a4 Show errors on invalid plugin load 
svn: r15653
 2010-07-28 15:03:37 +00:00
Rob G. Healey
621869d911 Mapstraction.css: Fixed a problem where it was not allowing PlacePage Place Maps to not be shown. NarrativeWeb: More tweaks to FamilyMap and PlacePage Maps. 
svn: r15652
 2010-07-27 08:33:06 +00:00
Doug Blank
a5d38c55d6 Allow Gramplet frame titles to be edited in place 
svn: r15651
 2010-07-25 17:22:52 +00:00
Rob G. Healey
e020d6a443 NarrativeWeb: Continuing work on getting FamilyMap and Place Page Map to look and work as I want it too. StyleSheet: Changing elements to match current modifications. 
svn: r15650
 2010-07-24 08:43:43 +00:00
Peter Landgren
2cd2b3c84d Changed gramps to Gramps. 
svn: r15649
 2010-07-23 07:27:32 +00:00
Rob G. Healey
46ee43539f NarrativeWeb: Refinements in creating family maps. Changes in style sheets to match work. 
svn: r15647
 2010-07-23 06:30:23 +00:00
Rob G. Healey
fe1d68c475 Removed gramps-merge.png from these files so that compilation would complete itself. 
svn: r15646
 2010-07-23 06:26:36 +00:00
Doug Blank
3e28ee67ec 2059: need a way to compare and merge all objects, by MD Nauta 
svn: r15645
 2010-07-22 02:16:32 +00:00
Doug Blank
59403835fe 3142: To allow backups into GRAMPS XML format without Proxy or Living filters; added two config settings for quick-backup dir and filename pattern; added dbstate.db_name 
svn: r15644
 2010-07-22 01:50:00 +00:00
Serge Noiraud
ed3bd66d0d mapstraction : cannot generate Makefile 
svn: r15643
 2010-07-21 07:31:09 +00:00
Serge Noiraud
593f7de5e6 GeoView : new mapstraction V2. added crosshair implementation for googlev3 and openlayers. 
resize is now fully integrated with crosshair.
          possibility to select the html toolkit when webkit and gecko are available.
          javascript simplification in the html page.
          add LOG functionality for debugging.


svn: r15642
 2010-07-20 21:41:13 +00:00
Serge Noiraud
35875a30c6 GeoView : new mapstraction V2. added crosshair implementation for googlev3 and openlayers. 
resize is now fully integrated with crosshair even with filters.
          possibility to select the html toolkit when webkit and gecko are available.
          javascript simplification inside the html page.
          add LOG functionality for debugging.


svn: r15641
 2010-07-20 21:39:57 +00:00
Rob G. Healey
9e4fda990f Print StyleSheet: Updated to fix some issues. 
svn: r15639
 2010-07-16 03:17:08 +00:00
Rob G. Healey
0fdd49ad87 NarrativeWeb: Re-verted dump_place() with alternate_locations returned back to original setup. 
svn: r15638
 2010-07-15 23:25:12 +00:00
Rob G. Healey
3567664f4c NarrativeWeb: Fixed place and dump_ordinance(). 
svn: r15637
 2010-07-15 08:56:01 +00:00
Rob G. Healey
d2d5be6919 NarrativeWeb: Fixed crash error introduced in last commit regarding place.get_alternate_locations(). 
svn: r15636
 2010-07-14 22:08:07 +00:00
Rob G. Healey
e88ee37158 NarrativeWeb: Changed the way that place.alternate_locations are displayed. 
svn: r15635
 2010-07-14 21:21:31 +00:00
Rob G. Healey
a58d664660 NarrativeWeb: Furthering the use of _individuallist variable. For checking whether a person is in the database or not? 
svn: r15634
 2010-07-13 18:47:37 +00:00
Rob G. Healey
c9f6fbd0eb NarrativeWeb: Changed how center and zoom are set. Changed _place_exists() to _append_to_lat_long(). Using some of the code that Serge Noiraud is using in GeoView. 
svn: r15633
 2010-07-11 05:55:19 +00:00
Rob G. Healey
afe4627783 Added dashed underline to div#SurnameDetail table.surnames . 
svn: r15632
 2010-07-10 02:56:22 +00:00
Peter Landgren
0ea8c9dfef Fix of typo. 
svn: r15631
 2010-07-09 16:29:07 +00:00
Peter Landgren
10d188df2f Fix of typo. 
svn: r15630
 2010-07-09 16:26:42 +00:00
Nick Hall
7a9e22083d Ensure signals are connected when a view is created 
svn: r15629
 2010-07-09 15:13:06 +00:00
Rob G. Healey
3415a1918e NarrativeWeb: Bug fix for #4095. Thank you Peter for the heads up on this one. 
svn: r15627
 2010-07-08 22:36:46 +00:00
Rob G. Healey
2638f7641d Fixed a crash issue that I created in the last commit. 
svn: r15626
 2010-07-08 07:49:24 +00:00
Rob G. Healey
0193bbb459 NarrativeWeb: Re-aligned the javascript code output to match how Google displays theirs. 
svn: r15625
 2010-07-08 07:22:34 +00:00
Rob G. Healey
c31bd0bfa5 NarrativeWeb: Removed the addition of listing the active person in its siblings. Fixed typo error. 
svn: r15624
 2010-07-08 01:46:35 +00:00
Nick Hall
897fbabaa5 Add a history sidebar plugin 
svn: r15623
 2010-07-06 14:47:53 +00:00
Nick Hall
6648bc9ed7 Fix bug where edit buttons are missing in person view 
svn: r15622
 2010-07-06 14:38:08 +00:00
Nick Hall
7f83fc7fcb Tidy up navigation sidebar code 
svn: r15621
 2010-07-06 14:30:38 +00:00
Rob G. Healey
16f95e157c NarrativeWeb: Fixed inline usage in dump_attribute(). 
svn: r15620
 2010-07-05 09:26:08 +00:00
Rob G. Healey
0e06a98523 NarrativeWeb: Removed extra hyperlink in display_ind_sources(). Re-claimed valuable and expensive vertical real estatetoo. Web_Basic-Blue: added element to remove underline in display_ind_sources(). 
svn: r15619
 2010-07-05 09:11:24 +00:00
Rob G. Healey
76d7588339 Added underlines under children and siblings. 
svn: r15618
 2010-07-05 07:26:23 +00:00
Rob G. Healey
fc219d57af NarrativeWeb: Fixed attributes section display on Individual Pages. Moved sources to the end instead of middle. 
svn: r15617
 2010-07-05 07:21:17 +00:00
Rob G. Healey
7ef7715f1c Refactoring of Place Page and Family Map Pages is should now be completed. Adjusted elements in Mapstraction style sheet. 
svn: r15616
 2010-07-05 06:26:23 +00:00
Nick Hall
24403802ac Fix tooltips in list views (currently disabled) 
svn: r15615
 2010-07-04 16:59:05 +00:00
Nick Hall
5ab9ca2e5a Fix marker colours in Family and Note views 
svn: r15613
 2010-07-03 15:04:36 +00:00
Jérôme Rapinat
adda80f8fe 4089: Capital letter and short months for russian 
svn: r15612
 2010-06-30 08:03:42 +00:00
Jérôme Rapinat
36d657b272 4089: try to use cyrillic alphabet for russian long months 
svn: r15611
 2010-06-30 07:53:56 +00:00
Jérôme Rapinat
d351fe147f 4089: translate month names (Finnish, Lithuanian, Russian) 
svn: r15610
 2010-06-30 07:42:42 +00:00
Peter Landgren
bb170241dd Some unnecessary unicode conversion cleanup after fix of issue 4078. 
svn: r15606
 2010-06-30 07:14:37 +00:00
Peter Landgren
9127018ca9 Some unnecessary unicode conversion cleanup after fix of issue 4078. 
svn: r15605
 2010-06-30 07:13:02 +00:00
Peter Landgren
7168001163 Some unnecessary unicode conversion cleanup after fix of issue 4078. 
svn: r15604
 2010-06-30 07:11:13 +00:00
Peter Landgren
57006ccfbe Some unnecessary unicode conversion cleanup after fix of issue 4078. 
svn: r15603
 2010-06-30 07:10:12 +00:00
Rob G. Healey
71b6877928 Added parents and partner to list of people and places for family place map. 
svn: r15602
 2010-06-29 19:07:19 +00:00
Rob G. Healey
f32dbb3eaa Fixed a border dashed style for Attributes list. 
svn: r15601
 2010-06-29 00:05:33 +00:00
Rob G. Healey
c0d86a8993 Added references section to Family Map Page. Adjusted the zoom level, and modified style sheet elements. 
svn: r15600
 2010-06-28 21:55:56 +00:00
Peter Landgren
8900ce7f6d Fix of issue 4078, note.get() unicode now. 
svn: r15599
 2010-06-28 07:45:05 +00:00
Peter Landgren
88c1389251 Fix of issue 4078, note.get() unicode now. 
svn: r15598
 2010-06-28 07:44:17 +00:00
Peter Landgren
e2d3fca8d8 Fix of issue 4078, note.get() unicode now. 
svn: r15597
 2010-06-28 07:43:41 +00:00
Jérôme Rapinat
c9cf3a990f 4087: name for a polish language (by Yenidai_2nd) 
svn: r15594
 2010-06-26 08:39:34 +00:00
Rob G. Healey
39fd0bc26d Added Individual Family Place Map to NarrativeWeb; Created and adjusted css elements for Place and Family Maps. 
svn: r15593
 2010-06-25 09:22:14 +00:00
Rob G. Healey
01d27b8694 Removing extra mapstraction provider javascript files after conversations with Serge Noiraud. Would like to do some more research on mxn.googleearth.core.js for possible use in something else. 
svn: r15591
 2010-06-24 06:44:28 +00:00
Rob G. Healey
aad0f9d0f5 Added elements for family map option to mapstraction style sheet. 
svn: r15590
 2010-06-23 08:39:23 +00:00
Rob G. Healey
7fb39141c8 Uploading missing mapstraction javascript files. Updated to 2.0.2 
svn: r15589
 2010-06-23 08:37:47 +00:00
Rob G. Healey
b73286a598 Cleared up some valuable vertical spacing. 
svn: r15588
 2010-06-22 04:32:44 +00:00
Rob G. Healey
59e9259d7a Added border lines to PlaceDetail table section. 
svn: r15587
 2010-06-21 02:44:13 +00:00
Rob G. Healey
84fb222ca0 Added dashed line back into Attributes section. 
svn: r15586
 2010-06-20 19:47:55 +00:00
Rob G. Healey
79e2d97698 Moved _create_place_map() back into class PlacePage. Getting ready for include family place map. Added border around PlacePage map in style sheet. 
svn: r15585
 2010-06-20 07:48:25 +00:00