Tim Su
ea10f25814
Merge remote branch 'stingeraj/dev' into dev
14 years ago
Tim Su
50422e15e9
Now refreshing list properly on delete
14 years ago
Tim Su
616b7e4072
Working on fix for AST-227 - launching app goes straight to filters. Also adjusting appearance of filters button, and lastly, got deleting custom filters up
14 years ago
Tim Su
7cbc7478c0
got saved filter saving working. also updated the icon on the task list activity
14 years ago
Arne Jans
a8b5865663
resolved conflicts with my own branch...
14 years ago
Arne Jans
b25e6c21ab
Changed manifest, so Astrid works on 2.1-phones. Fixed Task-assignment- and dashboard-spinner on TaskEditActivity. Changes arent pushed to the server, dont know how. Here are 2 bugs left: responsible person and dashboard isnt saved with task (see Producteev-tasks and notes I gave you), and the responsible-spinner is too small, I dont know why....
14 years ago
Arne Jans
49ac72b647
Merge remote branch 'upstream/dev' into dev
14 years ago
Arne Jans
e33dd8a54d
Merge remote branch 'upstream/master' into dev
14 years ago
Arne Jans
01ff80a369
added some missing new files
14 years ago
Arne Jans
a9130b3ba4
first version of responsible- and dashboard-assignment. still needs testing and pushing assignment-changes to producteev-service. see TODO in ProducteevControlSet.
14 years ago
Tim Su
23df93f19c
Turned off debugging for safety purposes. Also killed apostrophe.
14 years ago
Tim Su
567ebfb02e
Fix for crash from replaceAll not liking non-regular expression
14 years ago
Tim Su
515ce9bcdc
Merge remote branch 'origin/dev' into dev
14 years ago
Tim Su
f33c456f89
Fixed up tags not working in custom filter, hooked it up to the rest of the application
14 years ago
Tim Su
8e7b96f78f
Got the awesome filter screen working. Won't save as bookmarks, but at least... it works and can filter tasks. Can edit the chaining type, can delete rows. Pretty much awesome.
14 years ago
Tim Su
0f77edb13e
Wrote code for custom filter. A bunch of code. Time to see if it works
14 years ago
Tim Su
b50e22996c
Merge remote branch 'origin/master' into dev
14 years ago
Tim Su
509c699251
Custom filter activity prototype
14 years ago
Tim Su
cc40525b3d
Merge branch 'master' into dev
14 years ago
Tim Su
76b85c3efe
trying out new icon things in details
14 years ago
Tim Su
ef8798c0da
Fix for NPE from older version of Producteev detail exposer
14 years ago
Tim Su
b116bdfc7a
Merge branch 'dev'
...
Conflicts:
astrid/common-src/com/todoroo/andlib/sql/Order.java
astrid/src/com/todoroo/astrid/widget/TasksWidget.java
14 years ago
Tim Su
8004d6f906
dos-to-unix on all files. Everything now should have only LF
14 years ago
Tim Su
0ae7d4ddd2
Fixed bug where neither widget nor task list would respect default settings
14 years ago
Tim Su
0ced4fc3d9
New sort selection activity now works, updates the task list as you'd expect.
14 years ago
Tim Su
796d26955b
Added instructions for dealing with line endings
14 years ago
Arne Jans
315584ce2e
commiting intermediary changes
14 years ago
Tim Su
d1b7bc77ab
Sort selection dialog. Now to actually make it work.
14 years ago
Arne Jans
e5c677412e
merged dummy-conflicts from git
14 years ago
Arne Jans
d7f17502fe
Fix CRLF for dev
14 years ago
Tim Su
8697f99cab
If PDV tasks aren't created by or responsible by current user, don't synchronize them
14 years ago
Tim Su
5472e0da2c
Fixed some bugs, now we actually are able to synchronize producteev workspaces and responsible parties. Todo: edit dashboard / responsible, filters, hide tasks you aren't able to edit
14 years ago
Tim Su
aa2fe7db1b
Producteev Shared Desktop initial work. what's here: synchronizing multiple workspaces, displaying this information, displaying task responsiblity info, switching things into multiple workspaces
14 years ago
Tim Su
8b4b79db88
Added default dashboard option. It's not hooked up to anything right now.
14 years ago
Tim Su
cb7afcea2c
Got Producteev Login activity and signup working fully.
14 years ago
Tim Su
6784b38cb1
Styled up producteev login activity. Next need to hook up to actual api calls
14 years ago
Tim Su
01c6874c69
Fix for compile errors, synchronize producteev in background on login
14 years ago
Tim Su
b8b89672d8
Fix for AST-179 - adding a task w/ due date but no due time, calendar sends it to the next day
14 years ago
Tim Su
0643e6b97b
Merge branch 'master' into dev
14 years ago
Tim Su
b4bf894752
Exported .po files from XML files to update to new template and fix for format string issues
14 years ago
Tim Su
c9c915e610
Removed some extra logging statements.
14 years ago
Tim Su
5dafaaa80a
Imported translations into xml's, fixed up format string bugs, and updated spanish translation from launchpad
14 years ago
Tim Su
a249d3a919
Merged some dropped data values into strings
14 years ago
Tim Su
884beeeca1
Pulled in latest translations from launchpad
14 years ago
Tim Su
0d7aca4f22
made an ugly 4x4 widget prototype
14 years ago
Tim Su
a943385ef6
Updated pot with new updated strings
14 years ago
Arne Jans
78e6107ce0
done reading/display-side of producteev-dashboard in the TaskDetailExposer
...
at least the reading/displaying part is ready for testing, the part where dashboard-infos are written into metadata-db
and dataservice-cache is missing and should be done by tim, i think.
14 years ago
Arne Jans
1b5a1f9d79
merged AndroidManifest.xml and added missing things for LoginActivity
14 years ago
Arne Jans
d9241288b6
added ProducteevLoginActivity
14 years ago
Tim Su
44e0f00b38
Merge branch 'master' into dev
...
Conflicts:
astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
14 years ago