Permalink
Commits on Feb 8, 2012
  1. Bump version for release

    committed Feb 8, 2012
Commits on Feb 7, 2012
  1. Fixes issue #153

    Merge remote-tracking branch 'origin/isempty_fix'
    
    * origin/isempty_fix:
      Replaced calls to String.isEmpty() with TextUtils.isEmpty().
    committed Feb 7, 2012
  2. Closes issue #151

    Merge remote-tracking branch 'origin/calendar_fix'
    
    * origin/calendar_fix:
      Fix for calendar, ignoring the day field from scheduled entries to support people with other locales.
      test
    committed Feb 7, 2012
  3. Fix for calendar, ignoring the day field from scheduled entries to

    support people with other locales.
    hdweiss committed Feb 7, 2012
  4. Show upgrade popup under all circumstances on startup if this version…

    … has not been seen before
    committed Feb 7, 2012
Commits on Feb 6, 2012
  1. Bump version for release

    committed Feb 6, 2012
Commits on Feb 5, 2012
  1. Merge branch 'sshsynchrowork'

    * sshsynchrowork:
      Redo pushing and pulling on the SSH synchronizer entirely
      Implement better settings for the ssh synchronizer.  Something is still wrong synchronizing files
      Partial work to integrate the scp/ssh synchro mode into the wizard
      Partial work to integrate the scp/ssh synchro mode into the wizard
      Partial work to integrate the scp/ssh synchro mode into the wizard
    
    Conflicts:
    	src/com/matburt/mobileorg/Synchronizers/Synchronizer.java
    committed Feb 5, 2012
Commits on Feb 3, 2012
  1. Merge remote-tracking branch 'origin/calendar'

    * origin/calendar:
      Added deadlines to calendar parsing.
      Added option to toggle display of done items in calendar.
      Added option to toggle display of habits in calendar.
      Don't set reminders for done items.
      Hack to work around that pre-froyo devices have different calendar uri.
      Added reminders.
      Selectable calendar, entries are now compatible with google sync. Cleanups.
      Fixed timezone offset.
      Integrated calendar synchronizer.
      Implemented initial calendar synchronizer.
      Added Spanish translations
    committed Feb 3, 2012
Commits on Feb 2, 2012
  1. Added option to toggle display of habits in calendar.

    Habits must have ":STYLE: habits" with exactly one space in between for
    this to work.
    hdweiss committed Feb 2, 2012
Commits on Feb 1, 2012
  1. Added reminders.

    hdweiss committed Feb 1, 2012
  2. Fixed timezone offset.

    hdweiss committed Feb 1, 2012
  3. Added Spanish translations

    mkaito committed with hdweiss Jan 31, 2012
  4. test

    hdweiss committed Feb 1, 2012
  5. Merge branch 'sshsynchrowork' of github.com:matburt/mobileorg-android…

    … into sshsynchrowork
    
    * 'sshsynchrowork' of github.com:matburt/mobileorg-android:
      Partial work to integrate the scp/ssh synchro mode into the wizard
      Partial work to integrate the scp/ssh synchro mode into the wizard
    
    Conflicts:
    	res/layout/wizard_ssh.xml
    	src/com/matburt/mobileorg/Settings/WizardActivity.java
    	src/com/matburt/mobileorg/Synchronizers/SSHSynchronizer.java
    committed Feb 1, 2012
  6. Implement better settings for the ssh synchronizer. Something is stil…

    …l wrong synchronizing files
    committed Feb 1, 2012
  7. Merge pull request #148 from mkaito/master

    Added Spanish translations
    committed Feb 1, 2012
Commits on Jan 31, 2012
  1. Merge remote-tracking branch 'origin/combine_block_agendas'

    * origin/combine_block_agendas:
      Fixed some cursor leaks.
      Improved handling of daily/weekly agendas.
      Added collapsing of block agendas.
    committed Jan 31, 2012
  2. Fixed some cursor leaks.

    hdweiss committed Jan 31, 2012
  3. Added collapsing of block agendas.

    This is very ugly code, but it gets the job done. Block agendas are now
    collapsed into one entry and the appropriate separators are inserted.
    This makes the display similar to how org-mode shows them.
    hdweiss committed Jan 31, 2012
  4. Added Spanish translations

    mkaito committed Jan 31, 2012