aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix separator in the glade and show the chat widget when adding on a windowXavier Claessens2008-04-022-3/+2
* Update doc for new APIXavier Claessens2008-04-024-6/+0
* Fix build errors EmpathyChatWindow, port to new API.Xavier Claessens2008-04-025-672/+294
* Add a tooltip property on EmpathyChatXavier Claessens2008-04-022-55/+110
* Fix load/save chat geometryXavier Claessens2008-04-022-48/+19
* Remove Room menu, chatrooms will be handled in a dedicated program.Xavier Claessens2008-04-021-93/+1
* Adapt to new apiXavier Claessens2008-04-021-1/+1
* Build UI from gladeXavier Claessens2008-04-021-16/+180
* Rework EmpathyChat's API, it is now a subclass of GtkBin.Xavier Claessens2008-04-0213-528/+511
* Move window's glade to empathy-chat-window.glade. Reorder empathy-chat-window.cXavier Claessens2008-04-023-927/+810
* Fix some coding style and move group chat glade into empathy-chat.gladeXavier Claessens2008-04-022-44/+120
* Remove unimplementer and not used APIXavier Claessens2008-04-021-1/+0
* Add empathy_chat_new and don't use empathy_group/private_* in empathy.cXavier Claessens2008-04-023-25/+10
* Remove vtable and add info as properties. Reorder empathy-chat.c to not decla...Xavier Claessens2008-04-022-573/+493
* Remove deleted files from Makefile.amXavier Claessens2008-04-021-5/+0
* Remove group/private chat, will unify in empathy-chat.chXavier Claessens2008-04-025-1315/+0
* Fix leaks in finalizeXavier Claessens2008-04-021-0/+7
* Update status icon for new chat APIXavier Claessens2008-04-021-1/+1
* Unify EmpathyTpChatroom and EmpathyTpChat.Xavier Claessens2008-04-025-385/+131
* Updated el translation by Giannis Katsampirhs Nikos Charonitakis2008-03-311-896/+1379
* Add missing glade filesXavier Claessens2008-03-271-1/+3
* Add GUI to configure groupwise account. Fixes bug #522862 (Vincent Untz).Xavier Claessens2008-03-275-0/+232
* Disconnect invalidated signal when TpCall is finalized. Fixes bug #523766.Xavier Claessens2008-03-261-9/+9
* Better detection of backlog to avoid droping messagesXavier Claessens2008-03-261-28/+42
* Add more SIP profilesXavier Claessens2008-03-254-0/+48
* Add a widget to configure SIP accounts. Fixes bug #513679 (Baptiste Mille-Mat...Xavier Claessens2008-03-255-0/+561
* Disconnect invalidated signal from stream-engine when media channel is closed...Xavier Claessens2008-03-231-12/+20
* More coding styleXavier Claessens2008-03-231-19/+5
* Fix some coding styleXavier Claessens2008-03-231-14/+14
* Updated Spanish translation (Jorge Gonzalez)Jorge Gonzalez Gonzalez2008-03-211-60/+108
* Fix includesXavier Claessens2008-03-192-3/+4
* Hide unused functions with #if 0Xavier Claessens2008-03-191-70/+48
* Do not autoconnect if networkmanager says we are not connected at startup.Xavier Claessens2008-03-172-56/+66
* Adding groupwise profile. Fixes bug #517776 (Vincent Untz).Xavier Claessens2008-03-172-1/+13
* Use empathy_file_lookup for glade files since some are in libempathy-gtk/ and...Xavier Claessens2008-03-1722-36/+143
* Remove previous hack, it was stupid, we have a param to increase dbus timeout...Xavier Claessens2008-03-171-29/+8
* Updated Spanish translation (Jorge Gonzalez)Jorge Gonzalez Gonzalez2008-03-171-555/+579
* Keep the 0 in the end of the array when duping itXavier Claessens2008-03-171-1/+1
* Make sure the dup_handles array is ended by 0.Xavier Claessens2008-03-171-1/+3
* Fix includes of files that are now in src/. Fixes bug #522780.Xavier Claessens2008-03-172-4/+3
* Fix warning when showing about dialog from a chat windowXavier Claessens2008-03-161-1/+3
* Bump version to 0.23.1Xavier Claessens2008-03-161-1/+1
* Remove doc for modules removed from libempathy-gtkXavier Claessens2008-03-162-11/+0
* fix indentationXavier Claessens2008-03-161-2/+1
* Add python exampleXavier Claessens2008-03-161-0/+31
* Update python bindingXavier Claessens2008-03-161-6/+0
* Remove Presence object, it doesn't exists anymore (Alban Crequy).Xavier Claessens2008-03-161-1/+0
* Remove empathy_chat_present from header, it's not implemented anymoreXavier Claessens2008-03-161-1/+0
* Update python binding and add a script to make it more automaticXavier Claessens2008-03-166-1890/+1708
* Retry requesting aliases if it fails, it can happen if there is too many alia...Xavier Claessens2008-03-162-4/+26
* Update POTFILES.in according to new files layout. Fixes bug #522528.Nickolay V. Shmyrev2008-03-161-14/+14
* Install glade files that got moved to src/Xavier Claessens2008-03-151-1/+11
* Cleanup a bit previous commitXavier Claessens2008-03-141-15/+17
* Confirmation dialog on remove contact/group. Fixes bug #519946 (Bruno Dusausoy).Xavier Claessens2008-03-141-6/+57
* Wait for the factory to be ready before getting membersXavier Claessens2008-03-141-19/+47
* Emit notify::ready signalsXavier Claessens2008-03-141-0/+3
* Remove EmpathyChatViewBlock and empaty_chat_view_set_last_contactXavier Claessens2008-03-143-109/+17
* Add a ready property on EmpathyTpContactFactoryXavier Claessens2008-03-144-11/+34
* Move modules that make no sense to be used in other applicaton from libempath...Xavier Claessens2008-03-1439-377/+323
* Move chat chandler into the same process than contact listXavier Claessens2008-03-144-162/+79
* Updated ca translation (Gil Forcada).Gil Forcada Codinachs2008-03-131-13/+13
* Updated ca translation (Gil Forcada).Gil Forcada Codinachs2008-03-131-485/+926
* Updated Basque translation (Inaki Larranaga Murgoitio <dooteo@euskalgnu.org>).Iñaki Larrañaga Murgoitio2008-03-111-144/+144
* Remove the select all entry for nowXavier Claessens2008-03-111-14/+0
* Use more stock menu entries and fix a separatorXavier Claessens2008-03-111-12/+3
* Convert another glade file to glade3Xavier Claessens2008-03-111-524/+313
* Use stock menu entriesXavier Claessens2008-03-112-40/+27
* Convert glade file to glade3 to minimize future deltaXavier Claessens2008-03-1116-6509/+4099
* Make use of tp-glib helpers func for GValueXavier Claessens2008-03-111-6/+3
* remove _set_topic from binding since it's removed from APIXavier Claessens2008-03-111-11/+0
* Remove useless libtelepathy headersXavier Claessens2008-03-1114-15/+9
* Fix warnings if finalizing a disconnected EmpathyGroupChatXavier Claessens2008-03-111-2/+6
* Connect to PropertyFlagsChangedXavier Claessens2008-03-111-0/+40
* Check if property is writable before setting it. Fix leaksXavier Claessens2008-03-111-0/+7
* Implement _set_propertyXavier Claessens2008-03-113-2/+43
* Fix usage of property iface and make use of it to get chatroom topic.Xavier Claessens2008-03-112-73/+63
* Display GError's message when a call fails.Xavier Claessens2008-03-111-0/+18
* Fix some warnings when getting propertiesXavier Claessens2008-03-111-8/+21
* Add back "tp-chan" property, still used to inspect the channel handle.Xavier Claessens2008-03-112-9/+23
* Continue property stuffXavier Claessens2008-03-113-5/+90
* Do not close the channel if the channel is invalidatedXavier Claessens2008-03-111-1/+1
* Prepare a new API for chat propertiesXavier Claessens2008-03-113-107/+160
* Fix coding styleXavier Claessens2008-03-111-2/+2
* Remove unused priv->factoryXavier Claessens2008-03-111-8/+4
* Queue received messages until the sender got his alias.Xavier Claessens2008-03-113-31/+48
* Refactor EmpathyTpChat to use tp-glib client codeXavier Claessens2008-03-112-456/+173
* Don't wait for connection-ready if it was already ready.Xavier Claessens2008-03-111-3/+11
* Improve a bit the test and fix empathy_contact_run_until, data.ready was not ...Xavier Claessens2008-03-112-9/+12
* Minimal version of contact-run-until-ready testXavier Claessens2008-03-112-20/+15
* Add a test for empathy_contact_run_until_readyXavier Claessens2008-03-112-1/+48
* Remove useless empathy_contact_run_until_ready and use tp_strdiff instead of ...Xavier Claessens2008-03-111-5/+2
* Simplify !(a==b) to a!=bXavier Claessens2008-03-111-1/+1
* Make sure we don't expect contact id and handle to be directly ready. Add som...Xavier Claessens2008-03-1117-124/+108
* Simplify tp_group_get_contact.Xavier Claessens2008-03-111-1/+1
* Add debug messages in _run_until_readyXavier Claessens2008-03-111-0/+5
* Keep EmpathyContact object instead of the self handle, avoid using the connec...Xavier Claessens2008-03-111-98/+141
* Fix droping a contact to the chat window.Xavier Claessens2008-03-111-21/+6
* simplify empathy_call_with_contact_id using empathy_contact_run_until_readyXavier Claessens2008-03-111-25/+5
* Add empathy_contact_run_until_ready()Xavier Claessens2008-03-112-2/+81
* Ready property on EmpathyContact is not a boolean but flags for each property.Xavier Claessens2008-03-112-10/+19
* Add a ready property on EmpathyContact and make use of tp_strdiff.Xavier Claessens2008-03-112-13/+33
* Lazy init of contact hash.Xavier Claessens2008-03-111-4/+5
* If we set contact's id and name is still empty, emit notify::name.Xavier Claessens2008-03-111-0/+3
* Make InspectHandles call asyncXavier Claessens2008-03-111-26/+41
* Set self handle to 0 when connection is invalidatedXavier Claessens2008-03-111-2/+1
* Use new apiXavier Claessens2008-03-113-384/+306
* Fix compilation and usage of GErrorXavier Claessens2008-03-111-2/+2
* Fix build of extensions: s/>>/>/ for signals rule.Xavier Claessens2008-03-111-1/+1
* Fix leaksXavier Claessens2008-03-111-10/+11
* Avoid dup the url string if not needed.Xavier Claessens2008-03-111-15/+11
* Drop gnome-vfs dependency and use gio instead. Fixes bug #514380 (Cosimo Cecc...Xavier Claessens2008-03-115-34/+43
* Fix a leak and simplify account_chooser_set_account_foreach.Xavier Claessens2008-03-111-4/+7
* By default display all the favorite rooms in the favorite room dialog. Fixes ...Xavier Claessens2008-03-111-1/+1
* Never show avatars in compact mode. Fixes #475789 (Marco Barisione).Xavier Claessens2008-03-111-1/+5
* Fix indentationXavier Claessens2008-03-111-1/+2
* Merge commit 'bari/disable-avatars-opt-if-compact'Xavier Claessens2008-03-112-14/+40
* Do not use a global variable but a field in the call. Use a boolean since we ...Xavier Claessens2008-03-111-9/+9
* Fix: do not close the call channel if stream-engine is not yet started (Alban...Xavier Claessens2008-03-111-1/+13
* Updated Basque translation ( Inaki Larranaga Murgoitio <dooteo@euskalgnu.org>).Iñaki Larrañaga Murgoitio2008-03-101-34/+45
* Updated Spanish translation (Jorge Gonzalez)Jorge Gonzalez Gonzalez2008-03-101-99/+104
* Removed some tasks from TODOEMPATHY_0_22_0Xavier Claessens2008-03-101-2/+0
* Bump revision version of ABIXavier Claessens2008-03-101-2/+2
* Update NEWSXavier Claessens2008-03-091-0/+20
* Remove commit log that has nothing to do there.Xavier Claessens2008-03-091-4/+0
* Remove useless headerXavier Claessens2008-03-091-1/+0
* Updatre python bindingXavier Claessens2008-03-094-15/+218
* Update API documentationXavier Claessens2008-03-093-5/+6
* Add missing file in POTFILES.inXavier Claessens2008-03-091-0/+1
* Updated Finnish translationIlkka Tuohela2008-03-092-120/+177
* Bump version, forgot to do that after previous releaseXavier Claessens2008-03-091-1/+1
* Reset block event time to 1sec, messages are not blocked anymoreXavier Claessens2008-03-091-1/+1
* Do not queue messages in EmpathyChat as there are queued in EmpathyTpChat now.Xavier Claessens2008-03-091-23/+0
* Queue received messages until the sender got his alias.Xavier Claessens2008-03-095-94/+154
* Reorder functions to avoid having to declare them in the beginingXavier Claessens2008-03-091-471/+421
* Do not run multiple instances of empathy. Fixes bug #501805 (Marco Barisione).Xavier Claessens2008-03-094-1/+561
* Reduce block events time, this is still a ugly hack but better fix is too dan...Xavier Claessens2008-03-081-1/+1
* If the main window already exists show it using empathy_window_present() inst...Xavier Claessens2008-03-081-1/+1
* Allow underscores in URLs. Fixes bug #505616 (Marco Barisione).Xavier Claessens2008-03-081-1/+1
* Move the "Close" button after the other ones in the favourite rooms dialog. F...Xavier Claessens2008-03-081-7/+7
* Add an advanced expander in the generic setting widget. Fixes bug #466521 (Ma...Xavier Claessens2008-03-083-17/+117
* Remember correctly the window position and size when using tabs in the chat w...Xavier Claessens2008-03-082-25/+33
* Updated en_GB translation (Philip Withnall).Philip Withnall2008-03-081-489/+1292
* Updated sv translation (Daniel Nylander).Daniel Nylander2008-03-081-98/+142
* === DO NOT EDIT ===Stéphane Raimbault2008-03-061-181/+497
* Replace g_signal_emit_by_name by g_signal_emit (Alban Crequy).Xavier Claessens2008-03-051-8/+8
* Fix call when then stream is created with a 'Bidirectional' direction (Alban ...Xavier Claessens2008-03-051-0/+13
* Remove EMPATHY_CAPABILITIES_UNKNOWN flag when setting capabilitiesXavier Claessens2008-03-051-0/+1
* Updated it translation (Milo Casagrande)Luca Ferretti2008-03-051-197/+542
* Updated Spanish translation (Jorge Gonzalez)Jorge Gonzalez Gonzalez2008-03-051-30/+74
* Add an action to the release scriptXavier Claessens2008-03-041-0/+1
* Add an entry for latest commit in NEWSEMPATHY_0_21_91Xavier Claessens2008-03-041-0/+1
* Don't hardcode path to uninstalled files, use EMPATHY_SRCDIR env var instead.Xavier Claessens2008-03-046-36/+84
* Updated eu translation <dooteo@euskalgnu.org>Iñaki Larrañaga Murgoitio2008-03-031-98/+142
* Add xml files for unit tests to the release tarballXavier Claessens2008-03-033-0/+6
* Install missing glade files and add them in POTFILESXavier Claessens2008-03-032-3/+5
* Add missing files to POTFILEXavier Claessens2008-03-031-0/+2
* Update collabora copyright to 2008Xavier Claessens2008-03-0348-48/+48
* Prepare for releaseXavier Claessens2008-03-032-23/+63
* Fix crash: g_object_new()'s last argument must be NULL (Alban Crequy).Xavier Claessens2008-03-021-1/+2
* Minor fix in pt_BR translation (Og Maciel).Leonardo Ferreira Fontenelle2008-03-021-2/+2
* Updated pt_BR translation (Og Maciel).Leonardo Ferreira Fontenelle2008-03-021-92/+83
* Updated sv translation(Daniel Nylander)Daniel Nylander2008-03-021-10/+19
* Add missing include of tp-conn.hXavier Claessens2008-03-021-0/+1
* Updated Spanish translation (Jorge Gonzalez)Jorge Gonzalez Gonzalez2008-02-292-15/+20
* Added Hebrew translationYair Hershkovitz2008-02-292-0/+1680
* Updated pt_BR translation (Og Maciel).Leonardo Ferreira Fontenelle2008-02-281-199/+485
* Updated Arabic Translation by Abou Manal. Djihed Afifi2008-02-272-63/+325
* Updated eu translation (Inaki Larranaga Murgoitio Iñaki Larrañaga Murgoitio2008-02-271-7/+16
* Add filter for incoming calls so the status icon blink instead of popup direc...Xavier Claessens2008-02-273-6/+132
* configure.ac: Add -Wno-portability to AM_INIT_AUTOMAKE to suppress automake >...Xavier Claessens2008-02-261-1/+1
* libempathy-gtk/libempathy-gtk.pc.in: fix name of the libraryXavier Claessens2008-02-261-1/+1
* Remove useless commit messagesXavier Claessens2008-02-261-24/+0
* Cancel name owner watch when the call is finalizedXavier Claessens2008-02-261-0/+7
* Watch name owner changes to know when s-e falls off the bus.Xavier Claessens2008-02-261-1/+24
* Avoid calling Close() on the media channel if it's already closed.Xavier Claessens2008-02-261-0/+5
* Close the channel if se proxy is invalidated and do not change status to clos...Xavier Claessens2008-02-261-8/+1
* Change status to closed if stream engine dies or if a call fails.Xavier Claessens2008-02-261-1/+24
* unref stream-engine proxy when TpCall is finalizedXavier Claessens2008-02-261-2/+3
* Fix typo in var name and don't link empathy-call-chandler on libemp-extension...Xavier Claessens2008-02-262-2/+1
* It's now safe to call emp_cli_init multiple times. Move that call to empathy_...Xavier Claessens2008-02-263-5/+11
* Make use of generated code for using stream engine.Xavier Claessens2008-02-268-165/+88
* Import tools from telepathy-glib 0.7.3 and build a static libemp-extensions.la.Xavier Claessens2008-02-2632-2/+4275
* Updated Occitan translationYannig MARCHEGAY2008-02-231-34/+34
* Updated sv translation (Daniel Nylander).Daniel Nylander2008-02-231-123/+375
* Updated Basque translation.Inaki Larranaga Murgoitio2008-02-222-13/+259
* Fix typo in APIXavier Claessens2008-02-212-6/+6
* Add a GUI to configure yahoo accounts. Fixes bug #513674 (Susana).Xavier Claessens2008-02-205-1/+567
* Remove "override server settings" frame in ICQ widget.Xavier Claessens2008-02-201-256/+373
* Add GUI to configure ICQ accounts. Fixes bug #513673 (Andreas Henriksson).Xavier Claessens2008-02-205-1/+297
* Updated Occitan translationYannig MARCHEGAY2008-02-201-165/+460
* Updated Finnish translationIlkka Tuohela2008-02-192-42/+293
* Updated Spanish translation (Jorge Gonzalez)Jorge Gonzalez Gonzalez2008-02-181-49/+293
* Do not load avatar from cache if token is empty. Fixes bug #517098.Xavier Claessens2008-02-181-1/+1
* Merge commit 'bari/marshalList'Xavier Claessens2008-02-182-2/+2
* Remove useless m4/Makefile.amXavier Claessens2008-02-181-0/+0
* Merge commit 'cassidy/irc'Xavier Claessens2008-02-1836-11/+5770
* Merge commit 'cassidy/accounts-create-order'Xavier Claessens2008-02-181-15/+15
* Add tags in .gitignoreXavier Claessens2008-02-181-0/+2
* EmpathyContact: Set G_PARAM_CONSTRUCT on the capabilities property. (Sjoerd)Xavier Claessens2008-02-181-1/+1
* Updated Basque translation.Inaki Larranaga Murgoitio2008-02-172-63/+69
* Updated ja translation (Takeshi AIHANA).Takeshi Aihana2008-02-161-96/+108
* Wait a bit before displaying pending messages of a chat to have a chance to g...Xavier Claessens2008-02-161-7/+31
* Remove unused PROP_SUBSCRIPTIONXavier Claessens2008-02-161-1/+0
* Block events messages when the chat is connecting to a new Text channel. Fixe...Xavier Claessens2008-02-164-21/+48
* Removed unused PROP_GROUPSXavier Claessens2008-02-161-1/+0
* Create avatar pixbuf only if the theme shows avatarsXavier Claessens2008-02-161-7/+8
* Cleanup code from previous mergeXavier Claessens2008-02-163-15/+14
* Merge commit 'sjoerd/master'Xavier Claessens2008-02-164-4/+33
* Simplifies empathy_call_with_contact_id.Xavier Claessens2008-02-161-20/+11
* Merge commit 'sjoerd/master'Xavier Claessens2008-02-162-8/+49
* Add self contact to the group iface of media channel.Xavier Claessens2008-02-161-8/+15
* If there is an error when listing streams, return for the func to avoid crash...Xavier Claessens2008-02-151-0/+1
* Merge call branch from Elliot Fairweather with cleanups from Xavier Claessens.Xavier Claessens2008-02-1511-1209/+1744
* Call gtk_window_deiconify() when presenting a window because in some cases th...Xavier Claessens2008-02-151-0/+3
* Updated Nepali TranslationPawan Chitrakar2008-02-142-1510/+822
* Updated Finnish translationIlkka Tuohela2008-02-142-204/+278
* Updated Galician Translation.Ignacio Casal Quinteiro2008-02-122-28/+38
* Try to create salut account if getting the gconf key fails. If the user start...Xavier Claessens2008-02-121-6/+4
* Gdk python module is in the Gtk namespace.Xavier Claessens2008-02-111-1/+1
* Updated Spanish translation by Jorge GonzalezJorge Gonzalez Gonzalez2008-02-111-32/+38
* Update README explaining how update python binding.Xavier Claessens2008-02-111-13/+1
* Fix a bug when unset portXavier Claessens2008-02-111-6/+4
* Change a bit the generic account setting API.Xavier Claessens2008-02-115-102/+47
* Add a generic UI to make easy building UI for protocol specific settings. Por...Xavier Claessens2008-02-1118-1258/+741
* EmpathyTpContactFactory: If the presence dict doesn't contain a presence-mess...Xavier Claessens2008-02-101-0/+2
* Updated Arabic Translation by Abou Manal. Djihed Afifi2008-02-102-76/+112
* Bump version to 0.21.91Xavier Claessens2008-02-101-1/+1
* Force a larger account treeview.EMPATHY_0_21_90Xavier Claessens2008-02-101-577/+346
* Update python binding to not add ephy symbolsXavier Claessens2008-02-103-45/+2
* Generate marshal.list thanks to gabble black magic.Xavier Claessens2008-02-106-19/+38
* Do not export symbols outside the empathy_ namespace.Xavier Claessens2008-02-1014-25/+24
* Mark some private symbols as staticXavier Claessens2008-02-101-6/+6
* Prepare for 0.21.90 releaseXavier Claessens2008-02-103-97/+103
* Set a title to the enable column in account dialogXavier Claessens2008-02-101-7/+8
* Put the toggle cell to enable/disable account in a separate column. Fixes bug...Xavier Claessens2008-02-101-5/+7
* Change new message dialog to new conversation and make possible to do voip call.Xavier Claessens2008-02-099-613/+512
* Updated eu translation (<Inaki Larranaga Murgoitio Iñaki Larrañaga Murgoitio2008-02-091-161/+183
* Make sure translator set the right commit message.Xavier Claessens2008-02-081-4/+3
* Move nickname to the main section of account setting UI and do not set automa...Xavier Claessens2008-02-082-75/+67
* Updated Arabic Translation by Djihed Afifi. Djihed Afifi2008-01-312-183/+303
* Updated Galician Translation.Ignacio Casal Quinteiro2008-01-302-196/+222
* Updated Spanish translation by Jorge GonzalezJorge Gonzalez Gonzalez2008-01-271-49/+41
* Remove EmpathyPresence object and have "presence" and "presence-message" prop...Xavier Claessens2008-01-2526-665/+289
* Add *.loT to gitignoreXavier Claessens2008-01-251-0/+1
* fix src/empathy build. empathy-conf was moved to libempathy-gtk. Fixes bug #5...Xavier Claessens2008-01-241-1/+1
* Add a public method to change the contact showed.Xavier Claessens2008-01-242-0/+25
* Move empathy-conf to libempathy-gtk. libempathy do not depend directly on gco...Xavier Claessens2008-01-2322-244/+145
* Try to load dtd and glade files from the srcdir first to aboid having to inst...Xavier Claessens2008-01-233-3/+22
* Change "Edit account details" to "Edit account" because it gets too long in l...Xavier Claessens2008-01-231-1/+1
* Update python binding and docs with recent code moveXavier Claessens2008-01-216-95/+161
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 15:53:00 +0800