Adding whitespace? to clojure.string#2
Closed
tebeka wants to merge 1214 commits intoclojure:masterfrom
tebeka:master
Closed
Adding whitespace? to clojure.string#2tebeka wants to merge 1214 commits intoclojure:masterfrom tebeka:master
tebeka wants to merge 1214 commits intoclojure:masterfrom
tebeka:master
Conversation
Other c.c.pprint.* namespaces get compiled, but can't load c.c.pprint itself until dependencies are AOT-compiled.
* most significant argument last, for ->> * 'contains?' renamed 'substring?' * removed 'partial'
'replace' doesn't need runtime dispatch, so multimethods are unnecessary performance overhead. New functions: replace-char, replace-str, replace-re, and replace-by
Binary incompatibility of AOT-compiled namespaces makes it desirable to avoid compilation except when needed for gen-class. Also fixes problem of the compilation order being non-deterministic, depending on the underlying filesystem.
Corrected POM still has Clojure as a dependency, with an optional profile that allows specifying the location of clojure.jar
This is an attempt to fix compilation-order issues with gen-class. See http://groups.google.com/group/clojure-maven-plugin/browse_thread/thread/40150bb45270b322
This reverts commit 4e8696e. Attempted fix doesn't work.
Need to fix order-of-compilation issues with PrettyWriter and ColumnWriter
To avoid order-of-compilation issues, this patch puts the gen-class expressions for ColumnWriter and PrettyWriter in a separate file, rather than in the ns declarations.
But disable tests of pprint, which fail currently
…ime eval Signed-off-by: Stuart Sierra <mail@stuartsierra.com>
bronsa
pushed a commit
to bronsa/clojure
that referenced
this pull request
Apr 27, 2013
This solves two issues as specified by #CLJ-1134. Issue clojure#1 is solved by doing a relative jump forward within `absolute-reposition` in cl_format.clj, line 114 by switching `(- (:pos navigator) position)` with `(- position (:pos navigator))`. Issue clojure#2 is handled by changing the default `n`-parameter to `*` depending on whether the `@`-prefix is placed or not. If it is placed, then `n` defaults to 0, otherwise it defaults to 1. In addition, new tests have been appended to `test_cl_format.clj` to ensure the correctness of this patch. The tests have been tested on the Common Lisp implementation GNU CLISP 2.49, which presumably handle the `~n@*` correctly. This patch and GNU CLISP returns the same output for each format call, sans case for printed symbols; Common Lisp has case-insensitive symbols, whereas Clojure has not.
bronsa
pushed a commit
to bronsa/clojure
that referenced
this pull request
Apr 27, 2013
This solves two issues as specified by #CLJ-1134. Issue clojure#1 is solved by doing a relative jump forward within `absolute-reposition` in cl_format.clj, line 114 by switching `(- (:pos navigator) position)` with `(- position (:pos navigator))`. Issue clojure#2 is handled by changing the default `n`-parameter to `*` depending on whether the `@`-prefix is placed or not. If it is placed, then `n` defaults to 0, otherwise it defaults to 1. In addition, new tests have been appended to `test_cl_format.clj` to ensure the correctness of this patch. The tests have been tested on the Common Lisp implementation GNU CLISP 2.49, which presumably handle the `~n@*` correctly. This patch and GNU CLISP returns the same output for each format call, sans case for printed symbols; Common Lisp has case-insensitive symbols, whereas Clojure has not.
bronsa
pushed a commit
to bronsa/clojure
that referenced
this pull request
Apr 27, 2013
This solves two issues as specified by #CLJ-1134. Issue clojure#1 is solved by doing a relative jump forward within `absolute-reposition` in cl_format.clj, line 114 by switching `(- (:pos navigator) position)` with `(- position (:pos navigator))`. Issue clojure#2 is handled by changing the default `n`-parameter to `*` depending on whether the `@`-prefix is placed or not. If it is placed, then `n` defaults to 0, otherwise it defaults to 1. In addition, new tests have been appended to `test_cl_format.clj` to ensure the correctness of this patch. The tests have been tested on the Common Lisp implementation GNU CLISP 2.49, which presumably handle the `~n@*` correctly. This patch and GNU CLISP returns the same output for each format call, sans case for printed symbols; Common Lisp has case-insensitive symbols, whereas Clojure has not.
bronsa
pushed a commit
to bronsa/clojure
that referenced
this pull request
Apr 27, 2013
This solves two issues as specified by #CLJ-1134. Issue clojure#1 is solved by doing a relative jump forward within `absolute-reposition` in cl_format.clj, line 114 by switching `(- (:pos navigator) position)` with `(- position (:pos navigator))`. Issue clojure#2 is handled by changing the default `n`-parameter to `*` depending on whether the `@`-prefix is placed or not. If it is placed, then `n` defaults to 0, otherwise it defaults to 1. In addition, new tests have been appended to `test_cl_format.clj` to ensure the correctness of this patch. The tests have been tested on the Common Lisp implementation GNU CLISP 2.49, which presumably handle the `~n@*` correctly. This patch and GNU CLISP returns the same output for each format call, sans case for printed symbols; Common Lisp has case-insensitive symbols, whereas Clojure has not.
bronsa
pushed a commit
to bronsa/clojure
that referenced
this pull request
Apr 27, 2013
This solves two issues as specified by #CLJ-1134. Issue clojure#1 is solved by doing a relative jump forward within `absolute-reposition` in cl_format.clj, line 114 by switching `(- (:pos navigator) position)` with `(- position (:pos navigator))`. Issue clojure#2 is handled by changing the default `n`-parameter to `*` depending on whether the `@`-prefix is placed or not. If it is placed, then `n` defaults to 0, otherwise it defaults to 1. In addition, new tests have been appended to `test_cl_format.clj` to ensure the correctness of this patch. The tests have been tested on the Common Lisp implementation GNU CLISP 2.49, which presumably handle the `~n@*` correctly. This patch and GNU CLISP returns the same output for each format call, sans case for printed symbols; Common Lisp has case-insensitive symbols, whereas Clojure has not.
bronsa
pushed a commit
to bronsa/clojure
that referenced
this pull request
Apr 27, 2013
This solves two issues as specified by #CLJ-1134. Issue clojure#1 is solved by doing a relative jump forward within `absolute-reposition` in cl_format.clj, line 114 by switching `(- (:pos navigator) position)` with `(- position (:pos navigator))`. Issue clojure#2 is handled by changing the default `n`-parameter to `*` depending on whether the `@`-prefix is placed or not. If it is placed, then `n` defaults to 0, otherwise it defaults to 1. In addition, new tests have been appended to `test_cl_format.clj` to ensure the correctness of this patch. The tests have been tested on the Common Lisp implementation GNU CLISP 2.49, which presumably handle the `~n@*` correctly. This patch and GNU CLISP returns the same output for each format call, sans case for printed symbols; Common Lisp has case-insensitive symbols, whereas Clojure has not.
bronsa
pushed a commit
to bronsa/clojure
that referenced
this pull request
May 23, 2013
This solves two issues as specified by #CLJ-1134. Issue clojure#1 is solved by doing a relative jump forward within `absolute-reposition` in cl_format.clj, line 114 by switching `(- (:pos navigator) position)` with `(- position (:pos navigator))`. Issue clojure#2 is handled by changing the default `n`-parameter to `*` depending on whether the `@`-prefix is placed or not. If it is placed, then `n` defaults to 0, otherwise it defaults to 1. In addition, new tests have been appended to `test_cl_format.clj` to ensure the correctness of this patch. The tests have been tested on the Common Lisp implementation GNU CLISP 2.49, which presumably handle the `~n@*` correctly. This patch and GNU CLISP returns the same output for each format call, sans case for printed symbols; Common Lisp has case-insensitive symbols, whereas Clojure has not.
bronsa
pushed a commit
to bronsa/clojure
that referenced
this pull request
May 24, 2013
This solves two issues as specified by #CLJ-1134. Issue clojure#1 is solved by doing a relative jump forward within `absolute-reposition` in cl_format.clj, line 114 by switching `(- (:pos navigator) position)` with `(- position (:pos navigator))`. Issue clojure#2 is handled by changing the default `n`-parameter to `*` depending on whether the `@`-prefix is placed or not. If it is placed, then `n` defaults to 0, otherwise it defaults to 1. In addition, new tests have been appended to `test_cl_format.clj` to ensure the correctness of this patch. The tests have been tested on the Common Lisp implementation GNU CLISP 2.49, which presumably handle the `~n@*` correctly. This patch and GNU CLISP returns the same output for each format call, sans case for printed symbols; Common Lisp has case-insensitive symbols, whereas Clojure has not.
bronsa
pushed a commit
to bronsa/clojure
that referenced
this pull request
Jun 9, 2013
This solves two issues as specified by #CLJ-1134. Issue clojure#1 is solved by doing a relative jump forward within `absolute-reposition` in cl_format.clj, line 114 by switching `(- (:pos navigator) position)` with `(- position (:pos navigator))`. Issue clojure#2 is handled by changing the default `n`-parameter to `*` depending on whether the `@`-prefix is placed or not. If it is placed, then `n` defaults to 0, otherwise it defaults to 1. In addition, new tests have been appended to `test_cl_format.clj` to ensure the correctness of this patch. The tests have been tested on the Common Lisp implementation GNU CLISP 2.49, which presumably handle the `~n@*` correctly. This patch and GNU CLISP returns the same output for each format call, sans case for printed symbols; Common Lisp has case-insensitive symbols, whereas Clojure has not.
bronsa
pushed a commit
to bronsa/clojure
that referenced
this pull request
Jun 14, 2013
This solves two issues as specified by #CLJ-1134. Issue clojure#1 is solved by doing a relative jump forward within `absolute-reposition` in cl_format.clj, line 114 by switching `(- (:pos navigator) position)` with `(- position (:pos navigator))`. Issue clojure#2 is handled by changing the default `n`-parameter to `*` depending on whether the `@`-prefix is placed or not. If it is placed, then `n` defaults to 0, otherwise it defaults to 1. In addition, new tests have been appended to `test_cl_format.clj` to ensure the correctness of this patch. The tests have been tested on the Common Lisp implementation GNU CLISP 2.49, which presumably handle the `~n@*` correctly. This patch and GNU CLISP returns the same output for each format call, sans case for printed symbols; Common Lisp has case-insensitive symbols, whereas Clojure has not.
MichaelBlume
pushed a commit
to MichaelBlume/clojure
that referenced
this pull request
Jun 23, 2015
This solves two issues as specified by #CLJ-1134. Issue clojure#1 is solved by doing a relative jump forward within `absolute-reposition` in cl_format.clj, line 114 by switching `(- (:pos navigator) position)` with `(- position (:pos navigator))`. Issue clojure#2 is handled by changing the default `n`-parameter to `*` depending on whether the `@`-prefix is placed or not. If it is placed, then `n` defaults to 0, otherwise it defaults to 1. In addition, new tests have been appended to `test_cl_format.clj` to ensure the correctness of this patch. The tests have been tested on the Common Lisp implementation GNU CLISP 2.49, which presumably handle the `~n@*` correctly. This patch and GNU CLISP returns the same output for each format call, sans case for printed symbols; Common Lisp has case-insensitive symbols, whereas Clojure has not.
MichaelBlume
pushed a commit
to MichaelBlume/clojure
that referenced
this pull request
Jun 29, 2015
This solves two issues as specified by #CLJ-1134. Issue clojure#1 is solved by doing a relative jump forward within `absolute-reposition` in cl_format.clj, line 114 by switching `(- (:pos navigator) position)` with `(- position (:pos navigator))`. Issue clojure#2 is handled by changing the default `n`-parameter to `*` depending on whether the `@`-prefix is placed or not. If it is placed, then `n` defaults to 0, otherwise it defaults to 1. In addition, new tests have been appended to `test_cl_format.clj` to ensure the correctness of this patch. The tests have been tested on the Common Lisp implementation GNU CLISP 2.49, which presumably handle the `~n@*` correctly. This patch and GNU CLISP returns the same output for each format call, sans case for printed symbols; Common Lisp has case-insensitive symbols, whereas Clojure has not.
MichaelBlume
pushed a commit
to MichaelBlume/clojure
that referenced
this pull request
Jun 30, 2015
This solves two issues as specified by #CLJ-1134. Issue clojure#1 is solved by doing a relative jump forward within `absolute-reposition` in cl_format.clj, line 114 by switching `(- (:pos navigator) position)` with `(- position (:pos navigator))`. Issue clojure#2 is handled by changing the default `n`-parameter to `*` depending on whether the `@`-prefix is placed or not. If it is placed, then `n` defaults to 0, otherwise it defaults to 1. In addition, new tests have been appended to `test_cl_format.clj` to ensure the correctness of this patch. The tests have been tested on the Common Lisp implementation GNU CLISP 2.49, which presumably handle the `~n@*` correctly. This patch and GNU CLISP returns the same output for each format call, sans case for printed symbols; Common Lisp has case-insensitive symbols, whereas Clojure has not.
MichaelBlume
pushed a commit
to MichaelBlume/clojure
that referenced
this pull request
Jul 5, 2015
This solves two issues as specified by #CLJ-1134. Issue clojure#1 is solved by doing a relative jump forward within `absolute-reposition` in cl_format.clj, line 114 by switching `(- (:pos navigator) position)` with `(- position (:pos navigator))`. Issue clojure#2 is handled by changing the default `n`-parameter to `*` depending on whether the `@`-prefix is placed or not. If it is placed, then `n` defaults to 0, otherwise it defaults to 1. In addition, new tests have been appended to `test_cl_format.clj` to ensure the correctness of this patch. The tests have been tested on the Common Lisp implementation GNU CLISP 2.49, which presumably handle the `~n@*` correctly. This patch and GNU CLISP returns the same output for each format call, sans case for printed symbols; Common Lisp has case-insensitive symbols, whereas Clojure has not.
MichaelBlume
pushed a commit
to MichaelBlume/clojure
that referenced
this pull request
Jul 6, 2015
This solves two issues as specified by #CLJ-1134. Issue clojure#1 is solved by doing a relative jump forward within `absolute-reposition` in cl_format.clj, line 114 by switching `(- (:pos navigator) position)` with `(- position (:pos navigator))`. Issue clojure#2 is handled by changing the default `n`-parameter to `*` depending on whether the `@`-prefix is placed or not. If it is placed, then `n` defaults to 0, otherwise it defaults to 1. In addition, new tests have been appended to `test_cl_format.clj` to ensure the correctness of this patch. The tests have been tested on the Common Lisp implementation GNU CLISP 2.49, which presumably handle the `~n@*` correctly. This patch and GNU CLISP returns the same output for each format call, sans case for printed symbols; Common Lisp has case-insensitive symbols, whereas Clojure has not.
MichaelBlume
pushed a commit
to MichaelBlume/clojure
that referenced
this pull request
Jul 7, 2015
This solves two issues as specified by #CLJ-1134. Issue clojure#1 is solved by doing a relative jump forward within `absolute-reposition` in cl_format.clj, line 114 by switching `(- (:pos navigator) position)` with `(- position (:pos navigator))`. Issue clojure#2 is handled by changing the default `n`-parameter to `*` depending on whether the `@`-prefix is placed or not. If it is placed, then `n` defaults to 0, otherwise it defaults to 1. In addition, new tests have been appended to `test_cl_format.clj` to ensure the correctness of this patch. The tests have been tested on the Common Lisp implementation GNU CLISP 2.49, which presumably handle the `~n@*` correctly. This patch and GNU CLISP returns the same output for each format call, sans case for printed symbols; Common Lisp has case-insensitive symbols, whereas Clojure has not.
MichaelBlume
pushed a commit
to MichaelBlume/clojure
that referenced
this pull request
Jul 8, 2015
This solves two issues as specified by #CLJ-1134. Issue clojure#1 is solved by doing a relative jump forward within `absolute-reposition` in cl_format.clj, line 114 by switching `(- (:pos navigator) position)` with `(- position (:pos navigator))`. Issue clojure#2 is handled by changing the default `n`-parameter to `*` depending on whether the `@`-prefix is placed or not. If it is placed, then `n` defaults to 0, otherwise it defaults to 1. In addition, new tests have been appended to `test_cl_format.clj` to ensure the correctness of this patch. The tests have been tested on the Common Lisp implementation GNU CLISP 2.49, which presumably handle the `~n@*` correctly. This patch and GNU CLISP returns the same output for each format call, sans case for printed symbols; Common Lisp has case-insensitive symbols, whereas Clojure has not.
MichaelBlume
pushed a commit
to MichaelBlume/clojure
that referenced
this pull request
Jul 10, 2015
This solves two issues as specified by #CLJ-1134. Issue clojure#1 is solved by doing a relative jump forward within `absolute-reposition` in cl_format.clj, line 114 by switching `(- (:pos navigator) position)` with `(- position (:pos navigator))`. Issue clojure#2 is handled by changing the default `n`-parameter to `*` depending on whether the `@`-prefix is placed or not. If it is placed, then `n` defaults to 0, otherwise it defaults to 1. In addition, new tests have been appended to `test_cl_format.clj` to ensure the correctness of this patch. The tests have been tested on the Common Lisp implementation GNU CLISP 2.49, which presumably handle the `~n@*` correctly. This patch and GNU CLISP returns the same output for each format call, sans case for printed symbols; Common Lisp has case-insensitive symbols, whereas Clojure has not.
MichaelBlume
pushed a commit
to MichaelBlume/clojure
that referenced
this pull request
Jul 15, 2015
This solves two issues as specified by #CLJ-1134. Issue clojure#1 is solved by doing a relative jump forward within `absolute-reposition` in cl_format.clj, line 114 by switching `(- (:pos navigator) position)` with `(- position (:pos navigator))`. Issue clojure#2 is handled by changing the default `n`-parameter to `*` depending on whether the `@`-prefix is placed or not. If it is placed, then `n` defaults to 0, otherwise it defaults to 1. In addition, new tests have been appended to `test_cl_format.clj` to ensure the correctness of this patch. The tests have been tested on the Common Lisp implementation GNU CLISP 2.49, which presumably handle the `~n@*` correctly. This patch and GNU CLISP returns the same output for each format call, sans case for printed symbols; Common Lisp has case-insensitive symbols, whereas Clojure has not.
MichaelBlume
pushed a commit
to MichaelBlume/clojure
that referenced
this pull request
Jul 31, 2015
This solves two issues as specified by #CLJ-1134. Issue clojure#1 is solved by doing a relative jump forward within `absolute-reposition` in cl_format.clj, line 114 by switching `(- (:pos navigator) position)` with `(- position (:pos navigator))`. Issue clojure#2 is handled by changing the default `n`-parameter to `*` depending on whether the `@`-prefix is placed or not. If it is placed, then `n` defaults to 0, otherwise it defaults to 1. In addition, new tests have been appended to `test_cl_format.clj` to ensure the correctness of this patch. The tests have been tested on the Common Lisp implementation GNU CLISP 2.49, which presumably handle the `~n@*` correctly. This patch and GNU CLISP returns the same output for each format call, sans case for printed symbols; Common Lisp has case-insensitive symbols, whereas Clojure has not.
stuarthalloway
pushed a commit
that referenced
this pull request
Jul 31, 2015
This solves two issues as specified by #CLJ-1134. Issue #1 is solved by doing a relative jump forward within `absolute-reposition` in cl_format.clj, line 114 by switching `(- (:pos navigator) position)` with `(- position (:pos navigator))`. Issue #2 is handled by changing the default `n`-parameter to `*` depending on whether the `@`-prefix is placed or not. If it is placed, then `n` defaults to 0, otherwise it defaults to 1. In addition, new tests have been appended to `test_cl_format.clj` to ensure the correctness of this patch. The tests have been tested on the Common Lisp implementation GNU CLISP 2.49, which presumably handle the `~n@*` correctly. This patch and GNU CLISP returns the same output for each format call, sans case for printed symbols; Common Lisp has case-insensitive symbols, whereas Clojure has not. Signed-off-by: Stuart Halloway <stu@cognitect.com>
MichaelBlume
pushed a commit
to MichaelBlume/clojure
that referenced
this pull request
Feb 2, 2016
…RG/climate-android:master to master
Squashed commit of the following:
commit 0d8c5812a76c978eff359ccd205fbe05c83f7e7a
Merge: 84aa57f 27f3db4
Author: Curtis <cstuehrenberg@climate.com>
Date: Thu Sep 4 16:12:02 2014 -0700
Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~cstuehrenberg/climate-android
commit 84aa57febcf950208b13503c1a21085e6982f4e1
Author: Curtis <cstuehrenberg@climate.com>
Date: Thu Sep 4 16:10:55 2014 -0700
UTEST] Adding new location files for testing moving around
[TEST] Adding new location files for testing moving around
commit 27f3db4f5c227ce2d0d468a390a746a10031c882
Merge: fca7ee1 2bf8d71
Author: Curtis Stuehrenberg <cstuehrenberg@climate.com>
Date: Thu Sep 4 19:40:12 2014 +0000
Merging in latest from upstream (MOB/climate-android:refs/heads/master)
* commit '2bf8d710324485dca68a7fd10016d590b08badad':
Merge pull request clojure#1 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
Debugged image code for scouting
commit fca7ee1884d109eaccf41861f25a8cc6b83d4e36
Merge: d690f2a ebf41f3
Author: Curtis <cstuehrenberg@climate.com>
Date: Thu Sep 4 12:08:31 2014 -0700
Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~cstuehrenberg/climate-android
commit d690f2ac36ff7ee556f49afba9cfde8414b30ef3
Author: Curtis <cstuehrenberg@climate.com>
Date: Thu Sep 4 12:02:19 2014 -0700
Adding a new test file for creating and deleting activities
MichaelBlume
pushed a commit
to MichaelBlume/clojure
that referenced
this pull request
Feb 2, 2016
…imate-android:master to master
Squashed commit of the following:
commit 10dea1ed1f75fb6cf5737a8d718831df14849443
Author: Ram Joshi <rjoshi@climate.com>
Date: Wed Nov 19 18:04:00 2014 -0800
Unversioned .idea
commit cef44b6c6a343a76fc1601d69921525cfc422817
Merge: 97da1fd 3a4808a
Author: Ram Joshi <rjoshi@climate.com>
Date: Wed Nov 19 16:50:01 2014 -0800
Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/mob/climate-android
Conflicts:
ClimateGrowersProject/ClimateGrowersApp/build.gradle
ClimateGrowersProject/ClimateGrowersApp/proguard-rules.pro
ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/ui/content/MainActivity.java
ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/ui/navigation/NavigationFragment.java
ClimateGrowersProject/ClimateGrowersApp/src/main/res/drawable/bg_red.xml
ClimateGrowersProject/ClimateGrowersApp/src/main/res/layout/frag_navigation.xml
commit 97da1fde5dcb6b55a3d73d03452929b8fb1e2d52
Merge: 7dcffb4 ce369bd
Author: Kaz Baygan <kazb@baygan.com>
Date: Wed Nov 19 12:30:04 2014 -0800
resolved conflict
commit 7dcffb448e0606a606c7fd1be7ed96fb1e80ab3f
Author: Kaz Baygan <kazb@baygan.com>
Date: Wed Nov 19 12:22:31 2014 -0800
Added unread count code. Modified proguard stuff
commit ce369bd2df27de21a980fb3fe4f54887001ac544
Author: Kaz Baygan <kbaygan@climate.com>
Date: Wed Nov 19 19:51:02 2014 +0000
Merge pull request clojure#5 in CERES/notifications-android from ~KBAYGAN/notifications-android:master to master
Squashed commit of the following:
commit 4373f8cd85b7b87c31e2b6550970571c7ac8173a
Author: Kaz Baygan <kazb@baygan.com>
Date: Wed Nov 19 11:46:46 2014 -0800
Added code for notification details. Added activities and backend code.
commit 469ec84f09fda57d259a6939e01bb0398b50532a
Merge: c6e1c1d 613971f
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Nov 17 15:36:26 2014 -0800
Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/ceres/notifications-android
Conflicts:
NotificationLib/NotificationLib.iml
NotificationLib/src/main/java/com/climate/android/notificationlib/service/NotificationService.java
NotificationLib/src/main/java/com/climate/android/notificationlib/sqlite/NotificationDatabase.java
NotificationLib/src/main/java/com/climate/android/notificationlib/ui/NotificationFragment.java
app/build.gradle
commit c6e1c1da903e5735e0f970b0fc3273a35ee4241c
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Nov 17 14:21:34 2014 -0800
Added unread count support
commit 7b9dda8755a1803df90e6d907650f610bb300806
Author: Kaz Baygan <kazb@baygan.com>
Date: Fri Nov 7 10:48:31 2014 -0800
added logic to update 'read count' better. Added code for unread count.
commit 8d8c4f6aba5d0dbda4f180c6e0d64eb7bdca5e9a
Author: Kaz Baygan <kazb@baygan.com>
Date: Wed Nov 5 09:39:50 2014 -0800
deleted dead code. Added count support to notifications.removed unused libraries. Added code to use support libraries, as the main app requires it. Fixed a bug.
commit 3ffb5733f4d3d6da6bac852d92968d5c8eef7264
Author: Kaz Baygan <kazb@baygan.com>
Date: Tue Nov 4 09:12:49 2014 -0800
Changed the 'createdDate' to 'updatedDate' on get list
commit aab607ae0f0b3cd10dd81ec933ff4e202720be43
Author: Kaz Baygan <kazb@baygan.com>
Date: Tue Nov 4 09:08:40 2014 -0800
Cleaned up gradle file. deleted unused libs. Changed the 'createdDate' to 'updatedDate' on call to get list
commit 897a5a6eee1b7a19da9ff413ef0f2d4eb9c76cb7
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Nov 3 15:49:25 2014 -0800
deleted a file
commit 85db15c63cd460fc8db80c62cfe097bdac1984c9
Merge: c0247e4 e64461f
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Nov 3 15:37:17 2014 -0800
resolved conflict
commit c0247e4728ce2a18bdd2f306aaf2db38c535ad39
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Nov 3 14:44:36 2014 -0800
Changed service to IntentService. Db handles multi thread much better. Code cleanup. Deleted dead code.
commit f6b10563b0ea09f613e47ed2b0cf58a2a93a7df5
Author: Kaz Baygan <kazb@baygan.com>
Date: Tue Oct 28 12:26:16 2014 -0700
Added swipe support. Added code to delete messages from outbox when they are delivered
commit 4f2de105ab4d8f7ea2ca92e85347e38fa2d09744
Author: Kaz Baygan <kazb@baygan.com>
Date: Thu Oct 16 14:29:11 2014 -0700
fixed date display issue
commit 0a5ce6782d5e02ecea7380d0f25a26cf36482060
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Nov 17 14:16:52 2014 -0800
Added badge for unread count. Added proguard to strip out unused methods to lower method count to 32k.
commit 613971fa53b673680259edefe78c8a9ef3ae4433
Author: Kaz Baygan <kbaygan@climate.com>
Date: Tue Nov 11 19:58:25 2014 +0000
Merge pull request clojure#4 in CERES/notifications-android from ~KBAYGAN/notifications-android:master to master
Squashed commit of the following:
commit 7b9dda8755a1803df90e6d907650f610bb300806
Author: Kaz Baygan <kazb@baygan.com>
Date: Fri Nov 7 10:48:31 2014 -0800
added logic to update 'read count' better. Added code for unread count.
commit 8d8c4f6aba5d0dbda4f180c6e0d64eb7bdca5e9a
Author: Kaz Baygan <kazb@baygan.com>
Date: Wed Nov 5 09:39:50 2014 -0800
deleted dead code. Added count support to notifications.removed unused libraries. Added code to use support libraries, as the main app requires it. Fixed a bug.
commit 3ffb5733f4d3d6da6bac852d92968d5c8eef7264
Author: Kaz Baygan <kazb@baygan.com>
Date: Tue Nov 4 09:12:49 2014 -0800
Changed the 'createdDate' to 'updatedDate' on get list
commit aab607ae0f0b3cd10dd81ec933ff4e202720be43
Author: Kaz Baygan <kazb@baygan.com>
Date: Tue Nov 4 09:08:40 2014 -0800
Cleaned up gradle file. deleted unused libs. Changed the 'createdDate' to 'updatedDate' on call to get list
commit 897a5a6eee1b7a19da9ff413ef0f2d4eb9c76cb7
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Nov 3 15:49:25 2014 -0800
deleted a file
commit 85db15c63cd460fc8db80c62cfe097bdac1984c9
Merge: c0247e4 e64461f
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Nov 3 15:37:17 2014 -0800
resolved conflict
commit c0247e4728ce2a18bdd2f306aaf2db38c535ad39
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Nov 3 14:44:36 2014 -0800
Changed service to IntentService. Db handles multi thread much better. Code cleanup. Deleted dead code.
commit f6b10563b0ea09f613e47ed2b0cf58a2a93a7df5
Author: Kaz Baygan <kazb@baygan.com>
Date: Tue Oct 28 12:26:16 2014 -0700
Added swipe support. Added code to delete messages from outbox when they are delivered
commit 4f2de105ab4d8f7ea2ca92e85347e38fa2d09744
Author: Kaz Baygan <kazb@baygan.com>
Date: Thu Oct 16 14:29:11 2014 -0700
fixed date display issue
commit 1da49f02eb6b179ed24f1f990c9156cf47fdb0de
Author: Kaz Baygan <kazb@baygan.com>
Date: Wed Nov 5 02:21:49 2014 -0800
incorporated notification library.
commit e64461f06546b32c0919256834e7aa225d23fe8b
Author: Ram Joshi <rjoshi@climate.com>
Date: Tue Oct 28 19:28:13 2014 +0000
Merge pull request clojure#2 in CERES/notifications-android from ~RJOSHI/notifications-android:BASIC-247 to master
Squashed commit of the following:
commit 382ebd9d815f7d827fd284ee814633948b6522ce
Author: Ram Joshi <rjoshi@climate.com>
Date: Mon Oct 27 14:04:33 2014 -0700
Fixed indentation in NotificationListCursorAdapter.java
commit c1c830ecfce6be04d254f8cace975a3240a01211
Author: Ram Joshi <rjoshi@climate.com>
Date: Mon Oct 27 13:13:20 2014 -0700
Refactored DateFormat import
commit 4f3ed4a4801da5d61684412d8ed68fc21c776e4e
Author: Ram Joshi <rjoshi@climate.com>
Date: Mon Oct 27 10:45:37 2014 -0700
Renamed a variable and removed a comment
commit 38ae9ac7bf963dc347d2520c6e1204599cf5126c
Author: Ram Joshi <rjoshi@climate.com>
Date: Sun Oct 26 22:06:00 2014 -0700
Added default notification item icon
commit 07cea5b612ac1ee847c3de6e76e9f175c8b410c5
Author: Ram Joshi <rjoshi@climate.com>
Date: Sun Oct 26 21:43:29 2014 -0700
Layout and styling notifications as per design
commit 83a940a6afbbf254ffe1a7ef2ef6ba30e87765a5
Author: Kaz Baygan <kbaygan@climate.com>
Date: Thu Oct 16 22:55:33 2014 +0000
Merge pull request clojure#1 in CERES/notifications-android from ~KBAYGAN/notifications-android:master to master
Squashed commit of the following:
commit 4f2de105ab4d8f7ea2ca92e85347e38fa2d09744
Author: Kaz Baygan <kazb@baygan.com>
Date: Thu Oct 16 14:29:11 2014 -0700
fixed date display issue
commit 937b38c8ed0fed68955d98277f5246298a8bc11e
Author: Kaz Baygan <kazb@baygan.com>
Date: Wed Oct 15 15:02:55 2014 -0700
Cleanup
commit bc6c44412cb5375028efb036b30615d715a7fa50
Author: Kaz Baygan <kazb@baygan.com>
Date: Wed Oct 15 15:01:14 2014 -0700
Cleanup
commit daf19174bbba6e02d6a645306da8cbd438427530
Author: Kaz Baygan <kazb@baygan.com>
Date: Wed Oct 15 14:55:56 2014 -0700
Added Fragment to support navigation, reformatted the main list screen, completed network calls and completed db, sqlite
commit 156bcec1c2cdda942afa88536db51b5671ff57c0
Author: Kaz Baygan <kazb@baygan.com>
Date: Tue Sep 2 15:12:21 2014 -0700
Initial Commit
MichaelBlume
pushed a commit
to MichaelBlume/clojure
that referenced
this pull request
Feb 2, 2016
…imate-android:master to master Squashed commit of the following: commit 38c50075aec102d1ed27c69bbc058eb6126b28ff Merge: 4cae412 3b9efeb Author: Kaz Baygan <kazb@baygan.com> Date: Mon Dec 1 16:36:40 2014 -0800 merge commit 4cae41249cc05131ab07b2557ec2a73981eb315f Author: Kaz Baygan <kazb@baygan.com> Date: Mon Dec 1 16:32:01 2014 -0800 merge commit 72086f424412b22866f697e31ae87b339e171d51 Author: Kaz Baygan <kazb@baygan.com> Date: Mon Dec 1 16:09:37 2014 -0800 Multidex support. Disabled proguard stuff. Basic 295 - show/hide notifications based on Mercury commit 18da32a4f879d02103dbbd6e8d98115a4fe806c8 Merge: 692ae0f 10dea1e Author: Kaz Baygan <kazb@baygan.com> Date: Tue Nov 25 14:06:44 2014 -0800 merge commit 692ae0faafaf9f23e2fcafe0662b61b20d08c4b1 Author: Kaz Baygan <kazb@baygan.com> Date: Tue Nov 25 14:00:51 2014 -0800 Added user prefrences for notifications. Beefed up proguard.pro in the hopes that it would fix erroneous code disappearing problems. commit 10dea1ed1f75fb6cf5737a8d718831df14849443 Author: Ram Joshi <rjoshi@climate.com> Date: Wed Nov 19 18:04:00 2014 -0800 Unversioned .idea commit cef44b6c6a343a76fc1601d69921525cfc422817 Merge: 97da1fd 3a4808a Author: Ram Joshi <rjoshi@climate.com> Date: Wed Nov 19 16:50:01 2014 -0800 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/mob/climate-android Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle ClimateGrowersProject/ClimateGrowersApp/proguard-rules.pro ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/ui/content/MainActivity.java ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/ui/navigation/NavigationFragment.java ClimateGrowersProject/ClimateGrowersApp/src/main/res/drawable/bg_red.xml ClimateGrowersProject/ClimateGrowersApp/src/main/res/layout/frag_navigation.xml commit 97da1fde5dcb6b55a3d73d03452929b8fb1e2d52 Merge: 7dcffb4 ce369bd Author: Kaz Baygan <kazb@baygan.com> Date: Wed Nov 19 12:30:04 2014 -0800 resolved conflict commit 7dcffb448e0606a606c7fd1be7ed96fb1e80ab3f Author: Kaz Baygan <kazb@baygan.com> Date: Wed Nov 19 12:22:31 2014 -0800 Added unread count code. Modified proguard stuff commit ce369bd2df27de21a980fb3fe4f54887001ac544 Author: Kaz Baygan <kbaygan@climate.com> Date: Wed Nov 19 19:51:02 2014 +0000 Merge pull request clojure#5 in CERES/notifications-android from ~KBAYGAN/notifications-android:master to master Squashed commit of the following: commit 4373f8cd85b7b87c31e2b6550970571c7ac8173a Author: Kaz Baygan <kazb@baygan.com> Date: Wed Nov 19 11:46:46 2014 -0800 Added code for notification details. Added activities and backend code. commit 469ec84f09fda57d259a6939e01bb0398b50532a Merge: c6e1c1d 613971f Author: Kaz Baygan <kazb@baygan.com> Date: Mon Nov 17 15:36:26 2014 -0800 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/ceres/notifications-android Conflicts: NotificationLib/NotificationLib.iml NotificationLib/src/main/java/com/climate/android/notificationlib/service/NotificationService.java NotificationLib/src/main/java/com/climate/android/notificationlib/sqlite/NotificationDatabase.java NotificationLib/src/main/java/com/climate/android/notificationlib/ui/NotificationFragment.java app/build.gradle commit c6e1c1da903e5735e0f970b0fc3273a35ee4241c Author: Kaz Baygan <kazb@baygan.com> Date: Mon Nov 17 14:21:34 2014 -0800 Added unread count support commit 7b9dda8755a1803df90e6d907650f610bb300806 Author: Kaz Baygan <kazb@baygan.com> Date: Fri Nov 7 10:48:31 2014 -0800 added logic to update 'read count' better. Added code for unread count. commit 8d8c4f6aba5d0dbda4f180c6e0d64eb7bdca5e9a Author: Kaz Baygan <kazb@baygan.com> Date: Wed Nov 5 09:39:50 2014 -0800 deleted dead code. Added count support to notifications.removed unused libraries. Added code to use support libraries, as the main app requires it. Fixed a bug. commit 3ffb5733f4d3d6da6bac852d92968d5c8eef7264 Author: Kaz Baygan <kazb@baygan.com> Date: Tue Nov 4 09:12:49 2014 -0800 Changed the 'createdDate' to 'updatedDate' on get list commit aab607ae0f0b3cd10dd81ec933ff4e202720be43 Author: Kaz Baygan <kazb@baygan.com> Date: Tue Nov 4 09:08:40 2014 -0800 Cleaned up gradle file. deleted unused libs. Changed the 'createdDate' to 'updatedDate' on call to get list commit 897a5a6eee1b7a19da9ff413ef0f2d4eb9c76cb7 Author: Kaz Baygan <kazb@baygan.com> Date: Mon Nov 3 15:49:25 2014 -0800 deleted a file commit 85db15c63cd460fc8db80c62cfe097bdac1984c9 Merge: c0247e4 e64461f Author: Kaz Baygan <kazb@baygan.com> Date: Mon Nov 3 15:37:17 2014 -0800 resolved conflict commit c0247e4728ce2a18bdd2f306aaf2db38c535ad39 Author: Kaz Baygan <kazb@baygan.com> Date: Mon Nov 3 14:44:36 2014 -0800 Changed service to IntentService. Db handles multi thread much better. Code cleanup. Deleted dead code. commit f6b10563b0ea09f613e47ed2b0cf58a2a93a7df5 Author: Kaz Baygan <kazb@baygan.com> Date: Tue Oct 28 12:26:16 2014 -0700 Added swipe support. Added code to delete messages from outbox when they are delivered commit 4f2de105ab4d8f7ea2ca92e85347e38fa2d09744 Author: Kaz Baygan <kazb@baygan.com> Date: Thu Oct 16 14:29:11 2014 -0700 fixed date display issue commit 0a5ce6782d5e02ecea7380d0f25a26cf36482060 Author: Kaz Baygan <kazb@baygan.com> Date: Mon Nov 17 14:16:52 2014 -0800 Added badge for unread count. Added proguard to strip out unused methods to lower method count to 32k. commit 613971fa53b673680259edefe78c8a9ef3ae4433 Author: Kaz Baygan <kbaygan@climate.com> Date: Tue Nov 11 19:58:25 2014 +0000 Merge pull request clojure#4 in CERES/notifications-android from ~KBAYGAN/notifications-android:master to master Squashed commit of the following: commit 7b9dda8755a1803df90e6d907650f610bb300806 Author: Kaz Baygan <kazb@baygan.com> Date: Fri Nov 7 10:48:31 2014 -0800 added logic to update 'read count' better. Added code for unread count. commit 8d8c4f6aba5d0dbda4f180c6e0d64eb7bdca5e9a Author: Kaz Baygan <kazb@baygan.com> Date: Wed Nov 5 09:39:50 2014 -0800 deleted dead code. Added count support to notifications.removed unused libraries. Added code to use support libraries, as the main app requires it. Fixed a bug. commit 3ffb5733f4d3d6da6bac852d92968d5c8eef7264 Author: Kaz Baygan <kazb@baygan.com> Date: Tue Nov 4 09:12:49 2014 -0800 Changed the 'createdDate' to 'updatedDate' on get list commit aab607ae0f0b3cd10dd81ec933ff4e202720be43 Author: Kaz Baygan <kazb@baygan.com> Date: Tue Nov 4 09:08:40 2014 -0800 Cleaned up gradle file. deleted unused libs. Changed the 'createdDate' to 'updatedDate' on call to get list commit 897a5a6eee1b7a19da9ff413ef0f2d4eb9c76cb7 Author: Kaz Baygan <kazb@baygan.com> Date: Mon Nov 3 15:49:25 2014 -0800 deleted a file commit 85db15c63cd460fc8db80c62cfe097bdac1984c9 Merge: c0247e4 e64461f Author: Kaz Baygan <kazb@baygan.com> Date: Mon Nov 3 15:37:17 2014 -0800 resolved conflict commit c0247e4728ce2a18bdd2f306aaf2db38c535ad39 Author: Kaz Baygan <kazb@baygan.com> Date: Mon Nov 3 14:44:36 2014 -0800 Changed service to IntentService. Db handles multi thread much better. Code cleanup. Deleted dead code. commit f6b10563b0ea09f613e47ed2b0cf58a2a93a7df5 Author: Kaz Baygan <kazb@baygan.com> Date: Tue Oct 28 12:26:16 2014 -0700 Added swipe support. Added code to delete messages from outbox when they are delivered commit 4f2de105ab4d8f7ea2ca92e85347e38fa2d09744 Author: Kaz Baygan <kazb@baygan.com> Date: Thu Oct 16 14:29:11 2014 -0700 fixed date display issue commit 1da49f02eb6b179ed24f1f990c9156cf47fdb0de Author: Kaz Baygan <kazb@baygan.com> Date: Wed Nov 5 02:21:49 2014 -0800 incorporated notification library. commit e64461f06546b32c0919256834e7aa225d23fe8b Author: Ram Joshi <rjoshi@climate.com> Date: Tue Oct 28 19:28:13 2014 +0000 Merge pull request clojure#2 in CERES/notifications-android from ~RJOSHI/notifications-android:BASIC-247 to master Squashed commit of the following: commit 382ebd9d815f7d827fd284ee814633948b6522ce Author: Ram Joshi <rjoshi@climate.com> Date: Mon Oct 27 14:04:33 2014 -0700 Fixed indentation in NotificationListCursorAdapter.java commit c1c830ecfce6be04d254f8cace975a3240a01211 Author: Ram Joshi <rjoshi@climate.com> Date: Mon Oct 27 13:13:20 2014 -0700 Refactored DateFormat import commit 4f3ed4a4801da5d61684412d8ed68fc21c776e4e Author: Ram Joshi <rjoshi@climate.com> Date: Mon Oct 27 10:45:37 2014 -0700 Renamed a variable and removed a comment commit 38ae9ac7bf963dc347d2520c6e1204599cf5126c Author: Ram Joshi <rjoshi@climate.com> Date: Sun Oct 26 22:06:00 2014 -0700 Added default notification item icon commit 07cea5b612ac1ee847c3de6e76e9f175c8b410c5 Author: Ram Joshi <rjoshi@climate.com> Date: Sun Oct 26 21:43:29 2014 -0700 Layout and styling notifications as per design commit 83a940a6afbbf254ffe1a7ef2ef6ba30e87765a5 Author: Kaz Baygan <kbaygan@climate.com> Date: Thu Oct 16 22:55:33 2014 +0000 Merge pull request clojure#1 in CERES/notifications-android from ~KBAYGAN/notifications-android:master to master Squashed commit of the following: commit 4f2de105ab4d8f7ea2ca92e85347e38fa2d09744 Author: Kaz Baygan <kazb@baygan.com> Date: Thu Oct 16 14:29:11 2014 -0700 fixed date display issue commit 937b38c8ed0fed68955d98277f5246298a8bc11e Author: Kaz Baygan <kazb@baygan.com> Date: Wed Oct 15 15:02:55 2014 -0700 Cleanup commit bc6c44412cb5375028efb036b30615d715a7fa50 Author: Kaz Baygan <kazb@baygan.com> Date: Wed Oct 15 15:01:14 2014 -0700 Cleanup commit daf19174bbba6e02d6a645306da8cbd438427530 Author: Kaz Baygan <kazb@baygan.com> Date: Wed Oct 15 14:55:56 2014 -0700 Added Fragment to support navigation, reformatted the main list screen, completed network calls and completed db, sqlite commit 156bcec1c2cdda942afa88536db51b5671ff57c0 Author: Kaz Baygan <kazb@baygan.com> Date: Tue Sep 2 15:12:21 2014 -0700 Initial Commit
MichaelBlume
pushed a commit
to MichaelBlume/clojure
that referenced
this pull request
Feb 2, 2016
…imate-android:master to master Squashed commit of the following: commit 45ea6e106f506ec53fb9f1c2952632e7d68c409e Merge: 652b0ab e692261 Author: Kaz Baygan <kazb@baygan.com> Date: Thu Dec 4 13:33:33 2014 -0800 merge commit 652b0abf08638c4ba1b72acc2d390d27a1d0c80e Author: Kaz Baygan <kazb@baygan.com> Date: Thu Dec 4 12:31:01 2014 -0800 Basic 334, 328 and Detail view for link notification commit 38c50075aec102d1ed27c69bbc058eb6126b28ff Merge: 4cae412 3b9efeb Author: Kaz Baygan <kazb@baygan.com> Date: Mon Dec 1 16:36:40 2014 -0800 merge commit 4cae41249cc05131ab07b2557ec2a73981eb315f Author: Kaz Baygan <kazb@baygan.com> Date: Mon Dec 1 16:32:01 2014 -0800 merge commit 72086f424412b22866f697e31ae87b339e171d51 Author: Kaz Baygan <kazb@baygan.com> Date: Mon Dec 1 16:09:37 2014 -0800 Multidex support. Disabled proguard stuff. Basic 295 - show/hide notifications based on Mercury commit 18da32a4f879d02103dbbd6e8d98115a4fe806c8 Merge: 692ae0f 10dea1e Author: Kaz Baygan <kazb@baygan.com> Date: Tue Nov 25 14:06:44 2014 -0800 merge commit 692ae0faafaf9f23e2fcafe0662b61b20d08c4b1 Author: Kaz Baygan <kazb@baygan.com> Date: Tue Nov 25 14:00:51 2014 -0800 Added user prefrences for notifications. Beefed up proguard.pro in the hopes that it would fix erroneous code disappearing problems. commit 10dea1ed1f75fb6cf5737a8d718831df14849443 Author: Ram Joshi <rjoshi@climate.com> Date: Wed Nov 19 18:04:00 2014 -0800 Unversioned .idea commit cef44b6c6a343a76fc1601d69921525cfc422817 Merge: 97da1fd 3a4808a Author: Ram Joshi <rjoshi@climate.com> Date: Wed Nov 19 16:50:01 2014 -0800 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/mob/climate-android Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle ClimateGrowersProject/ClimateGrowersApp/proguard-rules.pro ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/ui/content/MainActivity.java ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/ui/navigation/NavigationFragment.java ClimateGrowersProject/ClimateGrowersApp/src/main/res/drawable/bg_red.xml ClimateGrowersProject/ClimateGrowersApp/src/main/res/layout/frag_navigation.xml commit 97da1fde5dcb6b55a3d73d03452929b8fb1e2d52 Merge: 7dcffb4 ce369bd Author: Kaz Baygan <kazb@baygan.com> Date: Wed Nov 19 12:30:04 2014 -0800 resolved conflict commit 7dcffb448e0606a606c7fd1be7ed96fb1e80ab3f Author: Kaz Baygan <kazb@baygan.com> Date: Wed Nov 19 12:22:31 2014 -0800 Added unread count code. Modified proguard stuff commit ce369bd2df27de21a980fb3fe4f54887001ac544 Author: Kaz Baygan <kbaygan@climate.com> Date: Wed Nov 19 19:51:02 2014 +0000 Merge pull request clojure#5 in CERES/notifications-android from ~KBAYGAN/notifications-android:master to master Squashed commit of the following: commit 4373f8cd85b7b87c31e2b6550970571c7ac8173a Author: Kaz Baygan <kazb@baygan.com> Date: Wed Nov 19 11:46:46 2014 -0800 Added code for notification details. Added activities and backend code. commit 469ec84f09fda57d259a6939e01bb0398b50532a Merge: c6e1c1d 613971f Author: Kaz Baygan <kazb@baygan.com> Date: Mon Nov 17 15:36:26 2014 -0800 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/ceres/notifications-android Conflicts: NotificationLib/NotificationLib.iml NotificationLib/src/main/java/com/climate/android/notificationlib/service/NotificationService.java NotificationLib/src/main/java/com/climate/android/notificationlib/sqlite/NotificationDatabase.java NotificationLib/src/main/java/com/climate/android/notificationlib/ui/NotificationFragment.java app/build.gradle commit c6e1c1da903e5735e0f970b0fc3273a35ee4241c Author: Kaz Baygan <kazb@baygan.com> Date: Mon Nov 17 14:21:34 2014 -0800 Added unread count support commit 7b9dda8755a1803df90e6d907650f610bb300806 Author: Kaz Baygan <kazb@baygan.com> Date: Fri Nov 7 10:48:31 2014 -0800 added logic to update 'read count' better. Added code for unread count. commit 8d8c4f6aba5d0dbda4f180c6e0d64eb7bdca5e9a Author: Kaz Baygan <kazb@baygan.com> Date: Wed Nov 5 09:39:50 2014 -0800 deleted dead code. Added count support to notifications.removed unused libraries. Added code to use support libraries, as the main app requires it. Fixed a bug. commit 3ffb5733f4d3d6da6bac852d92968d5c8eef7264 Author: Kaz Baygan <kazb@baygan.com> Date: Tue Nov 4 09:12:49 2014 -0800 Changed the 'createdDate' to 'updatedDate' on get list commit aab607ae0f0b3cd10dd81ec933ff4e202720be43 Author: Kaz Baygan <kazb@baygan.com> Date: Tue Nov 4 09:08:40 2014 -0800 Cleaned up gradle file. deleted unused libs. Changed the 'createdDate' to 'updatedDate' on call to get list commit 897a5a6eee1b7a19da9ff413ef0f2d4eb9c76cb7 Author: Kaz Baygan <kazb@baygan.com> Date: Mon Nov 3 15:49:25 2014 -0800 deleted a file commit 85db15c63cd460fc8db80c62cfe097bdac1984c9 Merge: c0247e4 e64461f Author: Kaz Baygan <kazb@baygan.com> Date: Mon Nov 3 15:37:17 2014 -0800 resolved conflict commit c0247e4728ce2a18bdd2f306aaf2db38c535ad39 Author: Kaz Baygan <kazb@baygan.com> Date: Mon Nov 3 14:44:36 2014 -0800 Changed service to IntentService. Db handles multi thread much better. Code cleanup. Deleted dead code. commit f6b10563b0ea09f613e47ed2b0cf58a2a93a7df5 Author: Kaz Baygan <kazb@baygan.com> Date: Tue Oct 28 12:26:16 2014 -0700 Added swipe support. Added code to delete messages from outbox when they are delivered commit 4f2de105ab4d8f7ea2ca92e85347e38fa2d09744 Author: Kaz Baygan <kazb@baygan.com> Date: Thu Oct 16 14:29:11 2014 -0700 fixed date display issue commit 0a5ce6782d5e02ecea7380d0f25a26cf36482060 Author: Kaz Baygan <kazb@baygan.com> Date: Mon Nov 17 14:16:52 2014 -0800 Added badge for unread count. Added proguard to strip out unused methods to lower method count to 32k. commit 613971fa53b673680259edefe78c8a9ef3ae4433 Author: Kaz Baygan <kbaygan@climate.com> Date: Tue Nov 11 19:58:25 2014 +0000 Merge pull request clojure#4 in CERES/notifications-android from ~KBAYGAN/notifications-android:master to master Squashed commit of the following: commit 7b9dda8755a1803df90e6d907650f610bb300806 Author: Kaz Baygan <kazb@baygan.com> Date: Fri Nov 7 10:48:31 2014 -0800 added logic to update 'read count' better. Added code for unread count. commit 8d8c4f6aba5d0dbda4f180c6e0d64eb7bdca5e9a Author: Kaz Baygan <kazb@baygan.com> Date: Wed Nov 5 09:39:50 2014 -0800 deleted dead code. Added count support to notifications.removed unused libraries. Added code to use support libraries, as the main app requires it. Fixed a bug. commit 3ffb5733f4d3d6da6bac852d92968d5c8eef7264 Author: Kaz Baygan <kazb@baygan.com> Date: Tue Nov 4 09:12:49 2014 -0800 Changed the 'createdDate' to 'updatedDate' on get list commit aab607ae0f0b3cd10dd81ec933ff4e202720be43 Author: Kaz Baygan <kazb@baygan.com> Date: Tue Nov 4 09:08:40 2014 -0800 Cleaned up gradle file. deleted unused libs. Changed the 'createdDate' to 'updatedDate' on call to get list commit 897a5a6eee1b7a19da9ff413ef0f2d4eb9c76cb7 Author: Kaz Baygan <kazb@baygan.com> Date: Mon Nov 3 15:49:25 2014 -0800 deleted a file commit 85db15c63cd460fc8db80c62cfe097bdac1984c9 Merge: c0247e4 e64461f Author: Kaz Baygan <kazb@baygan.com> Date: Mon Nov 3 15:37:17 2014 -0800 resolved conflict commit c0247e4728ce2a18bdd2f306aaf2db38c535ad39 Author: Kaz Baygan <kazb@baygan.com> Date: Mon Nov 3 14:44:36 2014 -0800 Changed service to IntentService. Db handles multi thread much better. Code cleanup. Deleted dead code. commit f6b10563b0ea09f613e47ed2b0cf58a2a93a7df5 Author: Kaz Baygan <kazb@baygan.com> Date: Tue Oct 28 12:26:16 2014 -0700 Added swipe support. Added code to delete messages from outbox when they are delivered commit 4f2de105ab4d8f7ea2ca92e85347e38fa2d09744 Author: Kaz Baygan <kazb@baygan.com> Date: Thu Oct 16 14:29:11 2014 -0700 fixed date display issue commit 1da49f02eb6b179ed24f1f990c9156cf47fdb0de Author: Kaz Baygan <kazb@baygan.com> Date: Wed Nov 5 02:21:49 2014 -0800 incorporated notification library. commit e64461f06546b32c0919256834e7aa225d23fe8b Author: Ram Joshi <rjoshi@climate.com> Date: Tue Oct 28 19:28:13 2014 +0000 Merge pull request clojure#2 in CERES/notifications-android from ~RJOSHI/notifications-android:BASIC-247 to master Squashed commit of the following: commit 382ebd9d815f7d827fd284ee814633948b6522ce Author: Ram Joshi <rjoshi@climate.com> Date: Mon Oct 27 14:04:33 2014 -0700 Fixed indentation in NotificationListCursorAdapter.java commit c1c830ecfce6be04d254f8cace975a3240a01211 Author: Ram Joshi <rjoshi@climate.com> Date: Mon Oct 27 13:13:20 2014 -0700 Refactored DateFormat import commit 4f3ed4a4801da5d61684412d8ed68fc21c776e4e Author: Ram Joshi <rjoshi@climate.com> Date: Mon Oct 27 10:45:37 2014 -0700 Renamed a variable and removed a comment commit 38ae9ac7bf963dc347d2520c6e1204599cf5126c Author: Ram Joshi <rjoshi@climate.com> Date: Sun Oct 26 22:06:00 2014 -0700 Added default notification item icon commit 07cea5b612ac1ee847c3de6e76e9f175c8b410c5 Author: Ram Joshi <rjoshi@climate.com> Date: Sun Oct 26 21:43:29 2014 -0700 Layout and styling notifications as per design commit 83a940a6afbbf254ffe1a7ef2ef6ba30e87765a5 Author: Kaz Baygan <kbaygan@climate.com> Date: Thu Oct 16 22:55:33 2014 +0000 Merge pull request clojure#1 in CERES/notifications-android from ~KBAYGAN/notifications-android:master to master Squashed commit of the following: commit 4f2de105ab4d8f7ea2ca92e85347e38fa2d09744 Author: Kaz Baygan <kazb@baygan.com> Date: Thu Oct 16 14:29:11 2014 -0700 fixed date display issue commit 937b38c8ed0fed68955d98277f5246298a8bc11e Author: Kaz Baygan <kazb@baygan.com> Date: Wed Oct 15 15:02:55 2014 -0700 Cleanup commit bc6c44412cb5375028efb036b30615d715a7fa50 Author: Kaz Baygan <kazb@baygan.com> Date: Wed Oct 15 15:01:14 2014 -0700 Cleanup commit daf19174bbba6e02d6a645306da8cbd438427530 Author: Kaz Baygan <kazb@baygan.com> Date: Wed Oct 15 14:55:56 2014 -0700 Added Fragment to support navigation, reformatted the main list screen, completed network calls and completed db, sqlite commit 156bcec1c2cdda942afa88536db51b5671ff57c0 Author: Kaz Baygan <kazb@baygan.com> Date: Tue Sep 2 15:12:21 2014 -0700 Initial Commit
MichaelBlume
pushed a commit
to MichaelBlume/clojure
that referenced
this pull request
Feb 2, 2016
…imate-android:master to master Squashed commit of the following: commit 99cdbab411d8f0386da1691c653feda3a4451e13 Merge: 913848e 148464e Author: Kaz Baygan <kazb@baygan.com> Date: Tue Dec 9 12:19:32 2014 -0800 merge commit 913848e19cc5001dd3f23b5f7ab38bf393f5ecde Author: Kaz Baygan <kazb@baygan.com> Date: Tue Dec 9 11:26:17 2014 -0800 Added alert type in the factory call commit 45ea6e106f506ec53fb9f1c2952632e7d68c409e Merge: 652b0ab e692261 Author: Kaz Baygan <kazb@baygan.com> Date: Thu Dec 4 13:33:33 2014 -0800 merge commit 652b0abf08638c4ba1b72acc2d390d27a1d0c80e Author: Kaz Baygan <kazb@baygan.com> Date: Thu Dec 4 12:31:01 2014 -0800 Basic 334, 328 and Detail view for link notification commit 38c50075aec102d1ed27c69bbc058eb6126b28ff Merge: 4cae412 3b9efeb Author: Kaz Baygan <kazb@baygan.com> Date: Mon Dec 1 16:36:40 2014 -0800 merge commit 4cae41249cc05131ab07b2557ec2a73981eb315f Author: Kaz Baygan <kazb@baygan.com> Date: Mon Dec 1 16:32:01 2014 -0800 merge commit 72086f424412b22866f697e31ae87b339e171d51 Author: Kaz Baygan <kazb@baygan.com> Date: Mon Dec 1 16:09:37 2014 -0800 Multidex support. Disabled proguard stuff. Basic 295 - show/hide notifications based on Mercury commit 18da32a4f879d02103dbbd6e8d98115a4fe806c8 Merge: 692ae0f 10dea1e Author: Kaz Baygan <kazb@baygan.com> Date: Tue Nov 25 14:06:44 2014 -0800 merge commit 692ae0faafaf9f23e2fcafe0662b61b20d08c4b1 Author: Kaz Baygan <kazb@baygan.com> Date: Tue Nov 25 14:00:51 2014 -0800 Added user prefrences for notifications. Beefed up proguard.pro in the hopes that it would fix erroneous code disappearing problems. commit 10dea1ed1f75fb6cf5737a8d718831df14849443 Author: Ram Joshi <rjoshi@climate.com> Date: Wed Nov 19 18:04:00 2014 -0800 Unversioned .idea commit cef44b6c6a343a76fc1601d69921525cfc422817 Merge: 97da1fd 3a4808a Author: Ram Joshi <rjoshi@climate.com> Date: Wed Nov 19 16:50:01 2014 -0800 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/mob/climate-android Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle ClimateGrowersProject/ClimateGrowersApp/proguard-rules.pro ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/ui/content/MainActivity.java ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/ui/navigation/NavigationFragment.java ClimateGrowersProject/ClimateGrowersApp/src/main/res/drawable/bg_red.xml ClimateGrowersProject/ClimateGrowersApp/src/main/res/layout/frag_navigation.xml commit 97da1fde5dcb6b55a3d73d03452929b8fb1e2d52 Merge: 7dcffb4 ce369bd Author: Kaz Baygan <kazb@baygan.com> Date: Wed Nov 19 12:30:04 2014 -0800 resolved conflict commit 7dcffb448e0606a606c7fd1be7ed96fb1e80ab3f Author: Kaz Baygan <kazb@baygan.com> Date: Wed Nov 19 12:22:31 2014 -0800 Added unread count code. Modified proguard stuff commit ce369bd2df27de21a980fb3fe4f54887001ac544 Author: Kaz Baygan <kbaygan@climate.com> Date: Wed Nov 19 19:51:02 2014 +0000 Merge pull request clojure#5 in CERES/notifications-android from ~KBAYGAN/notifications-android:master to master Squashed commit of the following: commit 4373f8cd85b7b87c31e2b6550970571c7ac8173a Author: Kaz Baygan <kazb@baygan.com> Date: Wed Nov 19 11:46:46 2014 -0800 Added code for notification details. Added activities and backend code. commit 469ec84f09fda57d259a6939e01bb0398b50532a Merge: c6e1c1d 613971f Author: Kaz Baygan <kazb@baygan.com> Date: Mon Nov 17 15:36:26 2014 -0800 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/ceres/notifications-android Conflicts: NotificationLib/NotificationLib.iml NotificationLib/src/main/java/com/climate/android/notificationlib/service/NotificationService.java NotificationLib/src/main/java/com/climate/android/notificationlib/sqlite/NotificationDatabase.java NotificationLib/src/main/java/com/climate/android/notificationlib/ui/NotificationFragment.java app/build.gradle commit c6e1c1da903e5735e0f970b0fc3273a35ee4241c Author: Kaz Baygan <kazb@baygan.com> Date: Mon Nov 17 14:21:34 2014 -0800 Added unread count support commit 7b9dda8755a1803df90e6d907650f610bb300806 Author: Kaz Baygan <kazb@baygan.com> Date: Fri Nov 7 10:48:31 2014 -0800 added logic to update 'read count' better. Added code for unread count. commit 8d8c4f6aba5d0dbda4f180c6e0d64eb7bdca5e9a Author: Kaz Baygan <kazb@baygan.com> Date: Wed Nov 5 09:39:50 2014 -0800 deleted dead code. Added count support to notifications.removed unused libraries. Added code to use support libraries, as the main app requires it. Fixed a bug. commit 3ffb5733f4d3d6da6bac852d92968d5c8eef7264 Author: Kaz Baygan <kazb@baygan.com> Date: Tue Nov 4 09:12:49 2014 -0800 Changed the 'createdDate' to 'updatedDate' on get list commit aab607ae0f0b3cd10dd81ec933ff4e202720be43 Author: Kaz Baygan <kazb@baygan.com> Date: Tue Nov 4 09:08:40 2014 -0800 Cleaned up gradle file. deleted unused libs. Changed the 'createdDate' to 'updatedDate' on call to get list commit 897a5a6eee1b7a19da9ff413ef0f2d4eb9c76cb7 Author: Kaz Baygan <kazb@baygan.com> Date: Mon Nov 3 15:49:25 2014 -0800 deleted a file commit 85db15c63cd460fc8db80c62cfe097bdac1984c9 Merge: c0247e4 e64461f Author: Kaz Baygan <kazb@baygan.com> Date: Mon Nov 3 15:37:17 2014 -0800 resolved conflict commit c0247e4728ce2a18bdd2f306aaf2db38c535ad39 Author: Kaz Baygan <kazb@baygan.com> Date: Mon Nov 3 14:44:36 2014 -0800 Changed service to IntentService. Db handles multi thread much better. Code cleanup. Deleted dead code. commit f6b10563b0ea09f613e47ed2b0cf58a2a93a7df5 Author: Kaz Baygan <kazb@baygan.com> Date: Tue Oct 28 12:26:16 2014 -0700 Added swipe support. Added code to delete messages from outbox when they are delivered commit 4f2de105ab4d8f7ea2ca92e85347e38fa2d09744 Author: Kaz Baygan <kazb@baygan.com> Date: Thu Oct 16 14:29:11 2014 -0700 fixed date display issue commit 0a5ce6782d5e02ecea7380d0f25a26cf36482060 Author: Kaz Baygan <kazb@baygan.com> Date: Mon Nov 17 14:16:52 2014 -0800 Added badge for unread count. Added proguard to strip out unused methods to lower method count to 32k. commit 613971fa53b673680259edefe78c8a9ef3ae4433 Author: Kaz Baygan <kbaygan@climate.com> Date: Tue Nov 11 19:58:25 2014 +0000 Merge pull request clojure#4 in CERES/notifications-android from ~KBAYGAN/notifications-android:master to master Squashed commit of the following: commit 7b9dda8755a1803df90e6d907650f610bb300806 Author: Kaz Baygan <kazb@baygan.com> Date: Fri Nov 7 10:48:31 2014 -0800 added logic to update 'read count' better. Added code for unread count. commit 8d8c4f6aba5d0dbda4f180c6e0d64eb7bdca5e9a Author: Kaz Baygan <kazb@baygan.com> Date: Wed Nov 5 09:39:50 2014 -0800 deleted dead code. Added count support to notifications.removed unused libraries. Added code to use support libraries, as the main app requires it. Fixed a bug. commit 3ffb5733f4d3d6da6bac852d92968d5c8eef7264 Author: Kaz Baygan <kazb@baygan.com> Date: Tue Nov 4 09:12:49 2014 -0800 Changed the 'createdDate' to 'updatedDate' on get list commit aab607ae0f0b3cd10dd81ec933ff4e202720be43 Author: Kaz Baygan <kazb@baygan.com> Date: Tue Nov 4 09:08:40 2014 -0800 Cleaned up gradle file. deleted unused libs. Changed the 'createdDate' to 'updatedDate' on call to get list commit 897a5a6eee1b7a19da9ff413ef0f2d4eb9c76cb7 Author: Kaz Baygan <kazb@baygan.com> Date: Mon Nov 3 15:49:25 2014 -0800 deleted a file commit 85db15c63cd460fc8db80c62cfe097bdac1984c9 Merge: c0247e4 e64461f Author: Kaz Baygan <kazb@baygan.com> Date: Mon Nov 3 15:37:17 2014 -0800 resolved conflict commit c0247e4728ce2a18bdd2f306aaf2db38c535ad39 Author: Kaz Baygan <kazb@baygan.com> Date: Mon Nov 3 14:44:36 2014 -0800 Changed service to IntentService. Db handles multi thread much better. Code cleanup. Deleted dead code. commit f6b10563b0ea09f613e47ed2b0cf58a2a93a7df5 Author: Kaz Baygan <kazb@baygan.com> Date: Tue Oct 28 12:26:16 2014 -0700 Added swipe support. Added code to delete messages from outbox when they are delivered commit 4f2de105ab4d8f7ea2ca92e85347e38fa2d09744 Author: Kaz Baygan <kazb@baygan.com> Date: Thu Oct 16 14:29:11 2014 -0700 fixed date display issue commit 1da49f02eb6b179ed24f1f990c9156cf47fdb0de Author: Kaz Baygan <kazb@baygan.com> Date: Wed Nov 5 02:21:49 2014 -0800 incorporated notification library. commit e64461f06546b32c0919256834e7aa225d23fe8b Author: Ram Joshi <rjoshi@climate.com> Date: Tue Oct 28 19:28:13 2014 +0000 Merge pull request clojure#2 in CERES/notifications-android from ~RJOSHI/notifications-android:BASIC-247 to master Squashed commit of the following: commit 382ebd9d815f7d827fd284ee814633948b6522ce Author: Ram Joshi <rjoshi@climate.com> Date: Mon Oct 27 14:04:33 2014 -0700 Fixed indentation in NotificationListCursorAdapter.java commit c1c830ecfce6be04d254f8cace975a3240a01211 Author: Ram Joshi <rjoshi@climate.com> Date: Mon Oct 27 13:13:20 2014 -0700 Refactored DateFormat import commit 4f3ed4a4801da5d61684412d8ed68fc21c776e4e Author: Ram Joshi <rjoshi@climate.com> Date: Mon Oct 27 10:45:37 2014 -0700 Renamed a variable and removed a comment commit 38ae9ac7bf963dc347d2520c6e1204599cf5126c Author: Ram Joshi <rjoshi@climate.com> Date: Sun Oct 26 22:06:00 2014 -0700 Added default notification item icon commit 07cea5b612ac1ee847c3de6e76e9f175c8b410c5 Author: Ram Joshi <rjoshi@climate.com> Date: Sun Oct 26 21:43:29 2014 -0700 Layout and styling notifications as per design commit 83a940a6afbbf254ffe1a7ef2ef6ba30e87765a5 Author: Kaz Baygan <kbaygan@climate.com> Date: Thu Oct 16 22:55:33 2014 +0000 Merge pull request clojure#1 in CERES/notifications-android from ~KBAYGAN/notifications-android:master to master Squashed commit of the following: commit 4f2de105ab4d8f7ea2ca92e85347e38fa2d09744 Author: Kaz Baygan <kazb@baygan.com> Date: Thu Oct 16 14:29:11 2014 -0700 fixed date display issue commit 937b38c8ed0fed68955d98277f5246298a8bc11e Author: Kaz Baygan <kazb@baygan.com> Date: Wed Oct 15 15:02:55 2014 -0700 Cleanup commit bc6c44412cb5375028efb036b30615d715a7fa50 Author: Kaz Baygan <kazb@baygan.com> Date: Wed Oct 15 15:01:14 2014 -0700 Cleanup commit daf19174bbba6e02d6a645306da8cbd438427530 Author: Kaz Baygan <kazb@baygan.com> Date: Wed Oct 15 14:55:56 2014 -0700 Added Fragment to support navigation, reformatted the main list screen, completed network calls and completed db, sqlite commit 156bcec1c2cdda942afa88536db51b5671ff57c0 Author: Kaz Baygan <kazb@baygan.com> Date: Tue Sep 2 15:12:21 2014 -0700 Initial Commit
MichaelBlume
pushed a commit
to MichaelBlume/clojure
that referenced
this pull request
Feb 2, 2016
…imate-android:master to master
Squashed commit of the following:
commit af21718b98660fccd18667ca42df2d080e9e3f6b
Merge: b2eef5a 35fe889
Author: Kaz Baygan <kazb@baygan.com>
Date: Thu Dec 11 14:29:37 2014 -0800
merge
commit 35fe889d382e5067d0f1ed95e57ab075bc99e0f9
Author: Kaz Baygan <kazb@baygan.com>
Date: Thu Dec 11 14:26:57 2014 -0800
Changed notification popup behaviour from push notifications
commit b2eef5aa2970539a12c5f1b2b0609a077d0ef2f9
Merge: 3fd0c5f 17bf61a
Author: Kaz Baygan <kazb@baygan.com>
Date: Thu Dec 11 11:12:22 2014 -0800
merge
commit 3fd0c5f564e8b35db7df1214954e9179328ff141
Author: Kaz Baygan <kazb@baygan.com>
Date: Thu Dec 11 10:41:54 2014 -0800
Fixed an issue with FieldDetails crashing. TwoWayView has changed a lot. Reimplemented the adapter for the TwoWayView using the new RecyclerView from Google. Included the library source code in this checkin since the TwoWayView is still in alpha with the new design. We can revisit this approach later. I just did not wanted to link snapshot libs as dependencies.
commit 99cdbab411d8f0386da1691c653feda3a4451e13
Merge: 913848e 148464e
Author: Kaz Baygan <kazb@baygan.com>
Date: Tue Dec 9 12:19:32 2014 -0800
merge
commit 913848e19cc5001dd3f23b5f7ab38bf393f5ecde
Author: Kaz Baygan <kazb@baygan.com>
Date: Tue Dec 9 11:26:17 2014 -0800
Added alert type in the factory call
commit 45ea6e106f506ec53fb9f1c2952632e7d68c409e
Merge: 652b0ab e692261
Author: Kaz Baygan <kazb@baygan.com>
Date: Thu Dec 4 13:33:33 2014 -0800
merge
commit 652b0abf08638c4ba1b72acc2d390d27a1d0c80e
Author: Kaz Baygan <kazb@baygan.com>
Date: Thu Dec 4 12:31:01 2014 -0800
Basic 334, 328 and Detail view for link notification
commit 38c50075aec102d1ed27c69bbc058eb6126b28ff
Merge: 4cae412 3b9efeb
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Dec 1 16:36:40 2014 -0800
merge
commit 4cae41249cc05131ab07b2557ec2a73981eb315f
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Dec 1 16:32:01 2014 -0800
merge
commit 72086f424412b22866f697e31ae87b339e171d51
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Dec 1 16:09:37 2014 -0800
Multidex support. Disabled proguard stuff. Basic 295 - show/hide notifications based on Mercury
commit 18da32a4f879d02103dbbd6e8d98115a4fe806c8
Merge: 692ae0f 10dea1e
Author: Kaz Baygan <kazb@baygan.com>
Date: Tue Nov 25 14:06:44 2014 -0800
merge
commit 692ae0faafaf9f23e2fcafe0662b61b20d08c4b1
Author: Kaz Baygan <kazb@baygan.com>
Date: Tue Nov 25 14:00:51 2014 -0800
Added user prefrences for notifications. Beefed up proguard.pro in the hopes that it would fix erroneous code disappearing problems.
commit 10dea1ed1f75fb6cf5737a8d718831df14849443
Author: Ram Joshi <rjoshi@climate.com>
Date: Wed Nov 19 18:04:00 2014 -0800
Unversioned .idea
commit cef44b6c6a343a76fc1601d69921525cfc422817
Merge: 97da1fd 3a4808a
Author: Ram Joshi <rjoshi@climate.com>
Date: Wed Nov 19 16:50:01 2014 -0800
Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/mob/climate-android
Conflicts:
ClimateGrowersProject/ClimateGrowersApp/build.gradle
ClimateGrowersProject/ClimateGrowersApp/proguard-rules.pro
ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/ui/content/MainActivity.java
ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/ui/navigation/NavigationFragment.java
ClimateGrowersProject/ClimateGrowersApp/src/main/res/drawable/bg_red.xml
ClimateGrowersProject/ClimateGrowersApp/src/main/res/layout/frag_navigation.xml
commit 97da1fde5dcb6b55a3d73d03452929b8fb1e2d52
Merge: 7dcffb4 ce369bd
Author: Kaz Baygan <kazb@baygan.com>
Date: Wed Nov 19 12:30:04 2014 -0800
resolved conflict
commit 7dcffb448e0606a606c7fd1be7ed96fb1e80ab3f
Author: Kaz Baygan <kazb@baygan.com>
Date: Wed Nov 19 12:22:31 2014 -0800
Added unread count code. Modified proguard stuff
commit ce369bd2df27de21a980fb3fe4f54887001ac544
Author: Kaz Baygan <kbaygan@climate.com>
Date: Wed Nov 19 19:51:02 2014 +0000
Merge pull request clojure#5 in CERES/notifications-android from ~KBAYGAN/notifications-android:master to master
Squashed commit of the following:
commit 4373f8cd85b7b87c31e2b6550970571c7ac8173a
Author: Kaz Baygan <kazb@baygan.com>
Date: Wed Nov 19 11:46:46 2014 -0800
Added code for notification details. Added activities and backend code.
commit 469ec84f09fda57d259a6939e01bb0398b50532a
Merge: c6e1c1d 613971f
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Nov 17 15:36:26 2014 -0800
Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/ceres/notifications-android
Conflicts:
NotificationLib/NotificationLib.iml
NotificationLib/src/main/java/com/climate/android/notificationlib/service/NotificationService.java
NotificationLib/src/main/java/com/climate/android/notificationlib/sqlite/NotificationDatabase.java
NotificationLib/src/main/java/com/climate/android/notificationlib/ui/NotificationFragment.java
app/build.gradle
commit c6e1c1da903e5735e0f970b0fc3273a35ee4241c
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Nov 17 14:21:34 2014 -0800
Added unread count support
commit 7b9dda8755a1803df90e6d907650f610bb300806
Author: Kaz Baygan <kazb@baygan.com>
Date: Fri Nov 7 10:48:31 2014 -0800
added logic to update 'read count' better. Added code for unread count.
commit 8d8c4f6aba5d0dbda4f180c6e0d64eb7bdca5e9a
Author: Kaz Baygan <kazb@baygan.com>
Date: Wed Nov 5 09:39:50 2014 -0800
deleted dead code. Added count support to notifications.removed unused libraries. Added code to use support libraries, as the main app requires it. Fixed a bug.
commit 3ffb5733f4d3d6da6bac852d92968d5c8eef7264
Author: Kaz Baygan <kazb@baygan.com>
Date: Tue Nov 4 09:12:49 2014 -0800
Changed the 'createdDate' to 'updatedDate' on get list
commit aab607ae0f0b3cd10dd81ec933ff4e202720be43
Author: Kaz Baygan <kazb@baygan.com>
Date: Tue Nov 4 09:08:40 2014 -0800
Cleaned up gradle file. deleted unused libs. Changed the 'createdDate' to 'updatedDate' on call to get list
commit 897a5a6eee1b7a19da9ff413ef0f2d4eb9c76cb7
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Nov 3 15:49:25 2014 -0800
deleted a file
commit 85db15c63cd460fc8db80c62cfe097bdac1984c9
Merge: c0247e4 e64461f
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Nov 3 15:37:17 2014 -0800
resolved conflict
commit c0247e4728ce2a18bdd2f306aaf2db38c535ad39
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Nov 3 14:44:36 2014 -0800
Changed service to IntentService. Db handles multi thread much better. Code cleanup. Deleted dead code.
commit f6b10563b0ea09f613e47ed2b0cf58a2a93a7df5
Author: Kaz Baygan <kazb@baygan.com>
Date: Tue Oct 28 12:26:16 2014 -0700
Added swipe support. Added code to delete messages from outbox when they are delivered
commit 4f2de105ab4d8f7ea2ca92e85347e38fa2d09744
Author: Kaz Baygan <kazb@baygan.com>
Date: Thu Oct 16 14:29:11 2014 -0700
fixed date display issue
commit 0a5ce6782d5e02ecea7380d0f25a26cf36482060
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Nov 17 14:16:52 2014 -0800
Added badge for unread count. Added proguard to strip out unused methods to lower method count to 32k.
commit 613971fa53b673680259edefe78c8a9ef3ae4433
Author: Kaz Baygan <kbaygan@climate.com>
Date: Tue Nov 11 19:58:25 2014 +0000
Merge pull request clojure#4 in CERES/notifications-android from ~KBAYGAN/notifications-android:master to master
Squashed commit of the following:
commit 7b9dda8755a1803df90e6d907650f610bb300806
Author: Kaz Baygan <kazb@baygan.com>
Date: Fri Nov 7 10:48:31 2014 -0800
added logic to update 'read count' better. Added code for unread count.
commit 8d8c4f6aba5d0dbda4f180c6e0d64eb7bdca5e9a
Author: Kaz Baygan <kazb@baygan.com>
Date: Wed Nov 5 09:39:50 2014 -0800
deleted dead code. Added count support to notifications.removed unused libraries. Added code to use support libraries, as the main app requires it. Fixed a bug.
commit 3ffb5733f4d3d6da6bac852d92968d5c8eef7264
Author: Kaz Baygan <kazb@baygan.com>
Date: Tue Nov 4 09:12:49 2014 -0800
Changed the 'createdDate' to 'updatedDate' on get list
commit aab607ae0f0b3cd10dd81ec933ff4e202720be43
Author: Kaz Baygan <kazb@baygan.com>
Date: Tue Nov 4 09:08:40 2014 -0800
Cleaned up gradle file. deleted unused libs. Changed the 'createdDate' to 'updatedDate' on call to get list
commit 897a5a6eee1b7a19da9ff413ef0f2d4eb9c76cb7
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Nov 3 15:49:25 2014 -0800
deleted a file
commit 85db15c63cd460fc8db80c62cfe097bdac1984c9
Merge: c0247e4 e64461f
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Nov 3 15:37:17 2014 -0800
resolved conflict
commit c0247e4728ce2a18bdd2f306aaf2db38c535ad39
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Nov 3 14:44:36 2014 -0800
Changed service to IntentService. Db handles multi thread much better. Code cleanup. Deleted dead code.
commit f6b10563b0ea09f613e47ed2b0cf58a2a93a7df5
Author: Kaz Baygan <kazb@baygan.com>
Date: Tue Oct 28 12:26:16 2014 -0700
Added swipe support. Added code to delete messages from outbox when they are delivered
commit 4f2de105ab4d8f7ea2ca92e85347e38fa2d09744
Author: Kaz Baygan <kazb@baygan.com>
Date: Thu Oct 16 14:29:11 2014 -0700
fixed date display issue
commit 1da49f02eb6b179ed24f1f990c9156cf47fdb0de
Author: Kaz Baygan <kazb@baygan.com>
Date: Wed Nov 5 02:21:49 2014 -0800
incorporated notification library.
commit e64461f06546b32c0919256834e7aa225d23fe8b
Author: Ram Joshi <rjoshi@climate.com>
Date: Tue Oct 28 19:28:13 2014 +0000
Merge pull request clojure#2 in CERES/notifications-android from ~RJOSHI/notifications-android:BASIC-247 to master
Squashed commit of the following:
commit 382ebd9d815f7d827fd284ee814633948b6522ce
Author: Ram Joshi <rjoshi@climate.com>
Date: Mon Oct 27 14:04:33 2014 -0700
Fixed indentation in NotificationListCursorAdapter.java
commit c1c830ecfce6be04d254f8cace975a3240a01211
Author: Ram Joshi <rjoshi@climate.com>
Date: Mon Oct 27 13:13:20 2014 -0700
Refactored DateFormat import
commit 4f3ed4a4801da5d61684412d8ed68fc21c776e4e
Author: Ram Joshi <rjoshi@climate.com>
Date: Mon Oct 27 10:45:37 2014 -0700
Renamed a variable and removed a comment
commit 38ae9ac7bf963dc347d2520c6e1204599cf5126c
Author: Ram Joshi <rjoshi@climate.com>
Date: Sun Oct 26 22:06:00 2014 -0700
Added default notification item icon
commit 07cea5b612ac1ee847c3de6e76e9f175c8b410c5
Author: Ram Joshi <rjoshi@climate.com>
Date: Sun Oct 26 21:43:29 2014 -0700
Layout and styling notifications as per design
commit 83a940a6afbbf254ffe1a7ef2ef6ba30e87765a5
Author: Kaz Baygan <kbaygan@climate.com>
Date: Thu Oct 16 22:55:33 2014 +0000
Merge pull request clojure#1 in CERES/notifications-android from ~KBAYGAN/notifications-android:master to master
Squashed commit of the following:
commit 4f2de105ab4d8f7ea2ca92e85347e38fa2d09744
Author: Kaz Baygan <kazb@baygan.com>
Date: Thu Oct 16 14:29:11 2014 -0700
fixed date display issue
commit 937b38c8ed0fed68955d98277f5246298a8bc11e
Author: Kaz Baygan <kazb@baygan.com>
Date: Wed Oct 15 15:02:55 2014 -0700
Cleanup
commit bc6c44412cb5375028efb036b30615d715a7fa50
Author: Kaz Baygan <kazb@baygan.com>
Date: Wed Oct 15 15:01:14 2014 -0700
Cleanup
commit daf19174bbba6e02d6a645306da8cbd438427530
Author: Kaz Baygan <kazb@baygan.com>
Date: Wed Oct 15 14:55:56 2014 -0700
Added Fragment to support navigation, reformatted the main list screen, completed network calls and completed db, sqlite
commit 156bcec1c2cdda942afa88536db51b5671ff57c0
Author: Kaz Baygan <kazb@baygan.com>
Date: Tue Sep 2 15:12:21 2014 -0700
Initial Commit
MichaelBlume
pushed a commit
to MichaelBlume/clojure
that referenced
this pull request
Feb 2, 2016
…imate-android:master to master
Squashed commit of the following:
commit 9ebb2a7b7462ec72d15567eb4851a51abc7aa1c7
Merge: 8a0eae6 f5e2c41
Author: Kaz Baygan <kazb@baygan.com>
Date: Thu Dec 18 16:23:26 2014 -0800
Merge branch 'workspace'
commit f5e2c41a5e6b2874c17b081a62c62c2dc475a2e2
Author: Kaz Baygan <kazb@baygan.com>
Date: Thu Dec 18 16:22:39 2014 -0800
Adde notifications settings
commit 8a0eae6b861ee33ab6b530fb1b13bd91dbd0b088
Merge: 4e3c617 1f8659e
Author: Kaz Baygan <kazb@baygan.com>
Date: Fri Dec 12 11:35:13 2014 -0800
merge
commit 4e3c617196c6e87edacf279eb5a0dd31434519c0
Merge: af21718 c2c8081
Author: Kaz Baygan <kazb@baygan.com>
Date: Fri Dec 12 11:11:56 2014 -0800
merge
commit c2c8081a142f0a0425d2e6ed47ae3012c423ce7a
Author: Kaz Baygan <kazb@baygan.com>
Date: Fri Dec 12 11:05:32 2014 -0800
Added code to fetch fields info if it does nto exists
commit 93347cdaefaa1e780b1ccfd88b1dd6b5a4b9d491
Author: Kaz Baygan <kazb@baygan.com>
Date: Fri Dec 12 10:37:23 2014 -0800
bug fixes. Added backbutton support
commit af21718b98660fccd18667ca42df2d080e9e3f6b
Merge: b2eef5a 35fe889
Author: Kaz Baygan <kazb@baygan.com>
Date: Thu Dec 11 14:29:37 2014 -0800
merge
commit 35fe889d382e5067d0f1ed95e57ab075bc99e0f9
Author: Kaz Baygan <kazb@baygan.com>
Date: Thu Dec 11 14:26:57 2014 -0800
Changed notification popup behaviour from push notifications
commit b2eef5aa2970539a12c5f1b2b0609a077d0ef2f9
Merge: 3fd0c5f 17bf61a
Author: Kaz Baygan <kazb@baygan.com>
Date: Thu Dec 11 11:12:22 2014 -0800
merge
commit 3fd0c5f564e8b35db7df1214954e9179328ff141
Author: Kaz Baygan <kazb@baygan.com>
Date: Thu Dec 11 10:41:54 2014 -0800
Fixed an issue with FieldDetails crashing. TwoWayView has changed a lot. Reimplemented the adapter for the TwoWayView using the new RecyclerView from Google. Included the library source code in this checkin since the TwoWayView is still in alpha with the new design. We can revisit this approach later. I just did not wanted to link snapshot libs as dependencies.
commit 99cdbab411d8f0386da1691c653feda3a4451e13
Merge: 913848e 148464e
Author: Kaz Baygan <kazb@baygan.com>
Date: Tue Dec 9 12:19:32 2014 -0800
merge
commit 913848e19cc5001dd3f23b5f7ab38bf393f5ecde
Author: Kaz Baygan <kazb@baygan.com>
Date: Tue Dec 9 11:26:17 2014 -0800
Added alert type in the factory call
commit 45ea6e106f506ec53fb9f1c2952632e7d68c409e
Merge: 652b0ab e692261
Author: Kaz Baygan <kazb@baygan.com>
Date: Thu Dec 4 13:33:33 2014 -0800
merge
commit 652b0abf08638c4ba1b72acc2d390d27a1d0c80e
Author: Kaz Baygan <kazb@baygan.com>
Date: Thu Dec 4 12:31:01 2014 -0800
Basic 334, 328 and Detail view for link notification
commit 38c50075aec102d1ed27c69bbc058eb6126b28ff
Merge: 4cae412 3b9efeb
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Dec 1 16:36:40 2014 -0800
merge
commit 4cae41249cc05131ab07b2557ec2a73981eb315f
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Dec 1 16:32:01 2014 -0800
merge
commit 72086f424412b22866f697e31ae87b339e171d51
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Dec 1 16:09:37 2014 -0800
Multidex support. Disabled proguard stuff. Basic 295 - show/hide notifications based on Mercury
commit 18da32a4f879d02103dbbd6e8d98115a4fe806c8
Merge: 692ae0f 10dea1e
Author: Kaz Baygan <kazb@baygan.com>
Date: Tue Nov 25 14:06:44 2014 -0800
merge
commit 692ae0faafaf9f23e2fcafe0662b61b20d08c4b1
Author: Kaz Baygan <kazb@baygan.com>
Date: Tue Nov 25 14:00:51 2014 -0800
Added user prefrences for notifications. Beefed up proguard.pro in the hopes that it would fix erroneous code disappearing problems.
commit 10dea1ed1f75fb6cf5737a8d718831df14849443
Author: Ram Joshi <rjoshi@climate.com>
Date: Wed Nov 19 18:04:00 2014 -0800
Unversioned .idea
commit cef44b6c6a343a76fc1601d69921525cfc422817
Merge: 97da1fd 3a4808a
Author: Ram Joshi <rjoshi@climate.com>
Date: Wed Nov 19 16:50:01 2014 -0800
Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/mob/climate-android
Conflicts:
ClimateGrowersProject/ClimateGrowersApp/build.gradle
ClimateGrowersProject/ClimateGrowersApp/proguard-rules.pro
ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/ui/content/MainActivity.java
ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/ui/navigation/NavigationFragment.java
ClimateGrowersProject/ClimateGrowersApp/src/main/res/drawable/bg_red.xml
ClimateGrowersProject/ClimateGrowersApp/src/main/res/layout/frag_navigation.xml
commit 97da1fde5dcb6b55a3d73d03452929b8fb1e2d52
Merge: 7dcffb4 ce369bd
Author: Kaz Baygan <kazb@baygan.com>
Date: Wed Nov 19 12:30:04 2014 -0800
resolved conflict
commit 7dcffb448e0606a606c7fd1be7ed96fb1e80ab3f
Author: Kaz Baygan <kazb@baygan.com>
Date: Wed Nov 19 12:22:31 2014 -0800
Added unread count code. Modified proguard stuff
commit ce369bd2df27de21a980fb3fe4f54887001ac544
Author: Kaz Baygan <kbaygan@climate.com>
Date: Wed Nov 19 19:51:02 2014 +0000
Merge pull request clojure#5 in CERES/notifications-android from ~KBAYGAN/notifications-android:master to master
Squashed commit of the following:
commit 4373f8cd85b7b87c31e2b6550970571c7ac8173a
Author: Kaz Baygan <kazb@baygan.com>
Date: Wed Nov 19 11:46:46 2014 -0800
Added code for notification details. Added activities and backend code.
commit 469ec84f09fda57d259a6939e01bb0398b50532a
Merge: c6e1c1d 613971f
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Nov 17 15:36:26 2014 -0800
Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/ceres/notifications-android
Conflicts:
NotificationLib/NotificationLib.iml
NotificationLib/src/main/java/com/climate/android/notificationlib/service/NotificationService.java
NotificationLib/src/main/java/com/climate/android/notificationlib/sqlite/NotificationDatabase.java
NotificationLib/src/main/java/com/climate/android/notificationlib/ui/NotificationFragment.java
app/build.gradle
commit c6e1c1da903e5735e0f970b0fc3273a35ee4241c
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Nov 17 14:21:34 2014 -0800
Added unread count support
commit 7b9dda8755a1803df90e6d907650f610bb300806
Author: Kaz Baygan <kazb@baygan.com>
Date: Fri Nov 7 10:48:31 2014 -0800
added logic to update 'read count' better. Added code for unread count.
commit 8d8c4f6aba5d0dbda4f180c6e0d64eb7bdca5e9a
Author: Kaz Baygan <kazb@baygan.com>
Date: Wed Nov 5 09:39:50 2014 -0800
deleted dead code. Added count support to notifications.removed unused libraries. Added code to use support libraries, as the main app requires it. Fixed a bug.
commit 3ffb5733f4d3d6da6bac852d92968d5c8eef7264
Author: Kaz Baygan <kazb@baygan.com>
Date: Tue Nov 4 09:12:49 2014 -0800
Changed the 'createdDate' to 'updatedDate' on get list
commit aab607ae0f0b3cd10dd81ec933ff4e202720be43
Author: Kaz Baygan <kazb@baygan.com>
Date: Tue Nov 4 09:08:40 2014 -0800
Cleaned up gradle file. deleted unused libs. Changed the 'createdDate' to 'updatedDate' on call to get list
commit 897a5a6eee1b7a19da9ff413ef0f2d4eb9c76cb7
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Nov 3 15:49:25 2014 -0800
deleted a file
commit 85db15c63cd460fc8db80c62cfe097bdac1984c9
Merge: c0247e4 e64461f
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Nov 3 15:37:17 2014 -0800
resolved conflict
commit c0247e4728ce2a18bdd2f306aaf2db38c535ad39
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Nov 3 14:44:36 2014 -0800
Changed service to IntentService. Db handles multi thread much better. Code cleanup. Deleted dead code.
commit f6b10563b0ea09f613e47ed2b0cf58a2a93a7df5
Author: Kaz Baygan <kazb@baygan.com>
Date: Tue Oct 28 12:26:16 2014 -0700
Added swipe support. Added code to delete messages from outbox when they are delivered
commit 4f2de105ab4d8f7ea2ca92e85347e38fa2d09744
Author: Kaz Baygan <kazb@baygan.com>
Date: Thu Oct 16 14:29:11 2014 -0700
fixed date display issue
commit 0a5ce6782d5e02ecea7380d0f25a26cf36482060
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Nov 17 14:16:52 2014 -0800
Added badge for unread count. Added proguard to strip out unused methods to lower method count to 32k.
commit 613971fa53b673680259edefe78c8a9ef3ae4433
Author: Kaz Baygan <kbaygan@climate.com>
Date: Tue Nov 11 19:58:25 2014 +0000
Merge pull request clojure#4 in CERES/notifications-android from ~KBAYGAN/notifications-android:master to master
Squashed commit of the following:
commit 7b9dda8755a1803df90e6d907650f610bb300806
Author: Kaz Baygan <kazb@baygan.com>
Date: Fri Nov 7 10:48:31 2014 -0800
added logic to update 'read count' better. Added code for unread count.
commit 8d8c4f6aba5d0dbda4f180c6e0d64eb7bdca5e9a
Author: Kaz Baygan <kazb@baygan.com>
Date: Wed Nov 5 09:39:50 2014 -0800
deleted dead code. Added count support to notifications.removed unused libraries. Added code to use support libraries, as the main app requires it. Fixed a bug.
commit 3ffb5733f4d3d6da6bac852d92968d5c8eef7264
Author: Kaz Baygan <kazb@baygan.com>
Date: Tue Nov 4 09:12:49 2014 -0800
Changed the 'createdDate' to 'updatedDate' on get list
commit aab607ae0f0b3cd10dd81ec933ff4e202720be43
Author: Kaz Baygan <kazb@baygan.com>
Date: Tue Nov 4 09:08:40 2014 -0800
Cleaned up gradle file. deleted unused libs. Changed the 'createdDate' to 'updatedDate' on call to get list
commit 897a5a6eee1b7a19da9ff413ef0f2d4eb9c76cb7
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Nov 3 15:49:25 2014 -0800
deleted a file
commit 85db15c63cd460fc8db80c62cfe097bdac1984c9
Merge: c0247e4 e64461f
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Nov 3 15:37:17 2014 -0800
resolved conflict
commit c0247e4728ce2a18bdd2f306aaf2db38c535ad39
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Nov 3 14:44:36 2014 -0800
Changed service to IntentService. Db handles multi thread much better. Code cleanup. Deleted dead code.
commit f6b10563b0ea09f613e47ed2b0cf58a2a93a7df5
Author: Kaz Baygan <kazb@baygan.com>
Date: Tue Oct 28 12:26:16 2014 -0700
Added swipe support. Added code to delete messages from outbox when they are delivered
commit 4f2de105ab4d8f7ea2ca92e85347e38fa2d09744
Author: Kaz Baygan <kazb@baygan.com>
Date: Thu Oct 16 14:29:11 2014 -0700
fixed date display issue
commit 1da49f02eb6b179ed24f1f990c9156cf47fdb0de
Author: Kaz Baygan <kazb@baygan.com>
Date: Wed Nov 5 02:21:49 2014 -0800
incorporated notification library.
commit e64461f06546b32c0919256834e7aa225d23fe8b
Author: Ram Joshi <rjoshi@climate.com>
Date: Tue Oct 28 19:28:13 2014 +0000
Merge pull request clojure#2 in CERES/notifications-android from ~RJOSHI/notifications-android:BASIC-247 to master
Squashed commit of the following:
commit 382ebd9d815f7d827fd284ee814633948b6522ce
Author: Ram Joshi <rjoshi@climate.com>
Date: Mon Oct 27 14:04:33 2014 -0700
Fixed indentation in NotificationListCursorAdapter.java
commit c1c830ecfce6be04d254f8cace975a3240a01211
Author: Ram Joshi <rjoshi@climate.com>
Date: Mon Oct 27 13:13:20 2014 -0700
Refactored DateFormat import
commit 4f3ed4a4801da5d61684412d8ed68fc21c776e4e
Author: Ram Joshi <rjoshi@climate.com>
Date: Mon Oct 27 10:45:37 2014 -0700
Renamed a variable and removed a comment
commit 38ae9ac7bf963dc347d2520c6e1204599cf5126c
Author: Ram Joshi <rjoshi@climate.com>
Date: Sun Oct 26 22:06:00 2014 -0700
Added default notification item icon
commit 07cea5b612ac1ee847c3de6e76e9f175c8b410c5
Author: Ram Joshi <rjoshi@climate.com>
Date: Sun Oct 26 21:43:29 2014 -0700
Layout and styling notifications as per design
commit 83a940a6afbbf254ffe1a7ef2ef6ba30e87765a5
Author: Kaz Baygan <kbaygan@climate.com>
Date: Thu Oct 16 22:55:33 2014 +0000
Merge pull request clojure#1 in CERES/notifications-android from ~KBAYGAN/notifications-android:master to master
Squashed commit of the following:
commit 4f2de105ab4d8f7ea2ca92e85347e38fa2d09744
Author: Kaz Baygan <kazb@baygan.com>
Date: Thu Oct 16 14:29:11 2014 -0700
fixed date display issue
commit 937b38c8ed0fed68955d98277f5246298a8bc11e
Author: Kaz Baygan <kazb@baygan.com>
Date: Wed Oct 15 15:02:55 2014 -0700
Cleanup
commit bc6c44412cb5375028efb036b30615d715a7fa50
Author: Kaz Baygan <kazb@baygan.com>
Date: Wed Oct 15 15:01:14 2014 -0700
Cleanup
commit daf19174bbba6e02d6a645306da8cbd438427530
Author: Kaz Baygan <kazb@baygan.com>
Date: Wed Oct 15 14:55:56 2014 -0700
Added Fragment to support navigation, reformatted the main list screen, completed network calls and completed db, sqlite
commit 156bcec1c2cdda942afa88536db51b5671ff57c0
Author: Kaz Baygan <kazb@baygan.com>
Date: Tue Sep 2 15:12:21 2014 -0700
Initial Commit
MichaelBlume
pushed a commit
to MichaelBlume/clojure
that referenced
this pull request
Feb 2, 2016
…limate-android:master to master Squashed commit of the following: commit 4ead35f91063171e36bbb92cc6704b1b31023919 Merge: b28d896 de4140c Author: Kaz Baygan <kazb@baygan.com> Date: Fri Dec 19 15:16:34 2014 -0800 merge commit b28d896c06a6a147edca14fada9a5103df2eb67f Merge: 9ebb2a7 aab31bd Author: Kaz Baygan <kazb@baygan.com> Date: Fri Dec 19 14:54:28 2014 -0800 Merge branch 'workspace' commit aab31bdad821938b5ab1be5de1de9832499ae115 Author: Kaz Baygan <kazb@baygan.com> Date: Fri Dec 19 14:53:59 2014 -0800 Fixed a bug related to launching field detail from notifications. commit 9ebb2a7b7462ec72d15567eb4851a51abc7aa1c7 Merge: 8a0eae6 f5e2c41 Author: Kaz Baygan <kazb@baygan.com> Date: Thu Dec 18 16:23:26 2014 -0800 Merge branch 'workspace' commit f5e2c41a5e6b2874c17b081a62c62c2dc475a2e2 Author: Kaz Baygan <kazb@baygan.com> Date: Thu Dec 18 16:22:39 2014 -0800 Adde notifications settings commit 8a0eae6b861ee33ab6b530fb1b13bd91dbd0b088 Merge: 4e3c617 1f8659e Author: Kaz Baygan <kazb@baygan.com> Date: Fri Dec 12 11:35:13 2014 -0800 merge commit 4e3c617196c6e87edacf279eb5a0dd31434519c0 Merge: af21718 c2c8081 Author: Kaz Baygan <kazb@baygan.com> Date: Fri Dec 12 11:11:56 2014 -0800 merge commit c2c8081a142f0a0425d2e6ed47ae3012c423ce7a Author: Kaz Baygan <kazb@baygan.com> Date: Fri Dec 12 11:05:32 2014 -0800 Added code to fetch fields info if it does nto exists commit 93347cdaefaa1e780b1ccfd88b1dd6b5a4b9d491 Author: Kaz Baygan <kazb@baygan.com> Date: Fri Dec 12 10:37:23 2014 -0800 bug fixes. Added backbutton support commit af21718b98660fccd18667ca42df2d080e9e3f6b Merge: b2eef5a 35fe889 Author: Kaz Baygan <kazb@baygan.com> Date: Thu Dec 11 14:29:37 2014 -0800 merge commit 35fe889d382e5067d0f1ed95e57ab075bc99e0f9 Author: Kaz Baygan <kazb@baygan.com> Date: Thu Dec 11 14:26:57 2014 -0800 Changed notification popup behaviour from push notifications commit b2eef5aa2970539a12c5f1b2b0609a077d0ef2f9 Merge: 3fd0c5f 17bf61a Author: Kaz Baygan <kazb@baygan.com> Date: Thu Dec 11 11:12:22 2014 -0800 merge commit 3fd0c5f564e8b35db7df1214954e9179328ff141 Author: Kaz Baygan <kazb@baygan.com> Date: Thu Dec 11 10:41:54 2014 -0800 Fixed an issue with FieldDetails crashing. TwoWayView has changed a lot. Reimplemented the adapter for the TwoWayView using the new RecyclerView from Google. Included the library source code in this checkin since the TwoWayView is still in alpha with the new design. We can revisit this approach later. I just did not wanted to link snapshot libs as dependencies. commit 99cdbab411d8f0386da1691c653feda3a4451e13 Merge: 913848e 148464e Author: Kaz Baygan <kazb@baygan.com> Date: Tue Dec 9 12:19:32 2014 -0800 merge commit 913848e19cc5001dd3f23b5f7ab38bf393f5ecde Author: Kaz Baygan <kazb@baygan.com> Date: Tue Dec 9 11:26:17 2014 -0800 Added alert type in the factory call commit 45ea6e106f506ec53fb9f1c2952632e7d68c409e Merge: 652b0ab e692261 Author: Kaz Baygan <kazb@baygan.com> Date: Thu Dec 4 13:33:33 2014 -0800 merge commit 652b0abf08638c4ba1b72acc2d390d27a1d0c80e Author: Kaz Baygan <kazb@baygan.com> Date: Thu Dec 4 12:31:01 2014 -0800 Basic 334, 328 and Detail view for link notification commit 38c50075aec102d1ed27c69bbc058eb6126b28ff Merge: 4cae412 3b9efeb Author: Kaz Baygan <kazb@baygan.com> Date: Mon Dec 1 16:36:40 2014 -0800 merge commit 4cae41249cc05131ab07b2557ec2a73981eb315f Author: Kaz Baygan <kazb@baygan.com> Date: Mon Dec 1 16:32:01 2014 -0800 merge commit 72086f424412b22866f697e31ae87b339e171d51 Author: Kaz Baygan <kazb@baygan.com> Date: Mon Dec 1 16:09:37 2014 -0800 Multidex support. Disabled proguard stuff. Basic 295 - show/hide notifications based on Mercury commit 18da32a4f879d02103dbbd6e8d98115a4fe806c8 Merge: 692ae0f 10dea1e Author: Kaz Baygan <kazb@baygan.com> Date: Tue Nov 25 14:06:44 2014 -0800 merge commit 692ae0faafaf9f23e2fcafe0662b61b20d08c4b1 Author: Kaz Baygan <kazb@baygan.com> Date: Tue Nov 25 14:00:51 2014 -0800 Added user prefrences for notifications. Beefed up proguard.pro in the hopes that it would fix erroneous code disappearing problems. commit 10dea1ed1f75fb6cf5737a8d718831df14849443 Author: Ram Joshi <rjoshi@climate.com> Date: Wed Nov 19 18:04:00 2014 -0800 Unversioned .idea commit cef44b6c6a343a76fc1601d69921525cfc422817 Merge: 97da1fd 3a4808a Author: Ram Joshi <rjoshi@climate.com> Date: Wed Nov 19 16:50:01 2014 -0800 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/mob/climate-android Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle ClimateGrowersProject/ClimateGrowersApp/proguard-rules.pro ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/ui/content/MainActivity.java ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/ui/navigation/NavigationFragment.java ClimateGrowersProject/ClimateGrowersApp/src/main/res/drawable/bg_red.xml ClimateGrowersProject/ClimateGrowersApp/src/main/res/layout/frag_navigation.xml commit 97da1fde5dcb6b55a3d73d03452929b8fb1e2d52 Merge: 7dcffb4 ce369bd Author: Kaz Baygan <kazb@baygan.com> Date: Wed Nov 19 12:30:04 2014 -0800 resolved conflict commit 7dcffb448e0606a606c7fd1be7ed96fb1e80ab3f Author: Kaz Baygan <kazb@baygan.com> Date: Wed Nov 19 12:22:31 2014 -0800 Added unread count code. Modified proguard stuff commit ce369bd2df27de21a980fb3fe4f54887001ac544 Author: Kaz Baygan <kbaygan@climate.com> Date: Wed Nov 19 19:51:02 2014 +0000 Merge pull request clojure#5 in CERES/notifications-android from ~KBAYGAN/notifications-android:master to master Squashed commit of the following: commit 4373f8cd85b7b87c31e2b6550970571c7ac8173a Author: Kaz Baygan <kazb@baygan.com> Date: Wed Nov 19 11:46:46 2014 -0800 Added code for notification details. Added activities and backend code. commit 469ec84f09fda57d259a6939e01bb0398b50532a Merge: c6e1c1d 613971f Author: Kaz Baygan <kazb@baygan.com> Date: Mon Nov 17 15:36:26 2014 -0800 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/ceres/notifications-android Conflicts: NotificationLib/NotificationLib.iml NotificationLib/src/main/java/com/climate/android/notificationlib/service/NotificationService.java NotificationLib/src/main/java/com/climate/android/notificationlib/sqlite/NotificationDatabase.java NotificationLib/src/main/java/com/climate/android/notificationlib/ui/NotificationFragment.java app/build.gradle commit c6e1c1da903e5735e0f970b0fc3273a35ee4241c Author: Kaz Baygan <kazb@baygan.com> Date: Mon Nov 17 14:21:34 2014 -0800 Added unread count support commit 7b9dda8755a1803df90e6d907650f610bb300806 Author: Kaz Baygan <kazb@baygan.com> Date: Fri Nov 7 10:48:31 2014 -0800 added logic to update 'read count' better. Added code for unread count. commit 8d8c4f6aba5d0dbda4f180c6e0d64eb7bdca5e9a Author: Kaz Baygan <kazb@baygan.com> Date: Wed Nov 5 09:39:50 2014 -0800 deleted dead code. Added count support to notifications.removed unused libraries. Added code to use support libraries, as the main app requires it. Fixed a bug. commit 3ffb5733f4d3d6da6bac852d92968d5c8eef7264 Author: Kaz Baygan <kazb@baygan.com> Date: Tue Nov 4 09:12:49 2014 -0800 Changed the 'createdDate' to 'updatedDate' on get list commit aab607ae0f0b3cd10dd81ec933ff4e202720be43 Author: Kaz Baygan <kazb@baygan.com> Date: Tue Nov 4 09:08:40 2014 -0800 Cleaned up gradle file. deleted unused libs. Changed the 'createdDate' to 'updatedDate' on call to get list commit 897a5a6eee1b7a19da9ff413ef0f2d4eb9c76cb7 Author: Kaz Baygan <kazb@baygan.com> Date: Mon Nov 3 15:49:25 2014 -0800 deleted a file commit 85db15c63cd460fc8db80c62cfe097bdac1984c9 Merge: c0247e4 e64461f Author: Kaz Baygan <kazb@baygan.com> Date: Mon Nov 3 15:37:17 2014 -0800 resolved conflict commit c0247e4728ce2a18bdd2f306aaf2db38c535ad39 Author: Kaz Baygan <kazb@baygan.com> Date: Mon Nov 3 14:44:36 2014 -0800 Changed service to IntentService. Db handles multi thread much better. Code cleanup. Deleted dead code. commit f6b10563b0ea09f613e47ed2b0cf58a2a93a7df5 Author: Kaz Baygan <kazb@baygan.com> Date: Tue Oct 28 12:26:16 2014 -0700 Added swipe support. Added code to delete messages from outbox when they are delivered commit 4f2de105ab4d8f7ea2ca92e85347e38fa2d09744 Author: Kaz Baygan <kazb@baygan.com> Date: Thu Oct 16 14:29:11 2014 -0700 fixed date display issue commit 0a5ce6782d5e02ecea7380d0f25a26cf36482060 Author: Kaz Baygan <kazb@baygan.com> Date: Mon Nov 17 14:16:52 2014 -0800 Added badge for unread count. Added proguard to strip out unused methods to lower method count to 32k. commit 613971fa53b673680259edefe78c8a9ef3ae4433 Author: Kaz Baygan <kbaygan@climate.com> Date: Tue Nov 11 19:58:25 2014 +0000 Merge pull request clojure#4 in CERES/notifications-android from ~KBAYGAN/notifications-android:master to master Squashed commit of the following: commit 7b9dda8755a1803df90e6d907650f610bb300806 Author: Kaz Baygan <kazb@baygan.com> Date: Fri Nov 7 10:48:31 2014 -0800 added logic to update 'read count' better. Added code for unread count. commit 8d8c4f6aba5d0dbda4f180c6e0d64eb7bdca5e9a Author: Kaz Baygan <kazb@baygan.com> Date: Wed Nov 5 09:39:50 2014 -0800 deleted dead code. Added count support to notifications.removed unused libraries. Added code to use support libraries, as the main app requires it. Fixed a bug. commit 3ffb5733f4d3d6da6bac852d92968d5c8eef7264 Author: Kaz Baygan <kazb@baygan.com> Date: Tue Nov 4 09:12:49 2014 -0800 Changed the 'createdDate' to 'updatedDate' on get list commit aab607ae0f0b3cd10dd81ec933ff4e202720be43 Author: Kaz Baygan <kazb@baygan.com> Date: Tue Nov 4 09:08:40 2014 -0800 Cleaned up gradle file. deleted unused libs. Changed the 'createdDate' to 'updatedDate' on call to get list commit 897a5a6eee1b7a19da9ff413ef0f2d4eb9c76cb7 Author: Kaz Baygan <kazb@baygan.com> Date: Mon Nov 3 15:49:25 2014 -0800 deleted a file commit 85db15c63cd460fc8db80c62cfe097bdac1984c9 Merge: c0247e4 e64461f Author: Kaz Baygan <kazb@baygan.com> Date: Mon Nov 3 15:37:17 2014 -0800 resolved conflict commit c0247e4728ce2a18bdd2f306aaf2db38c535ad39 Author: Kaz Baygan <kazb@baygan.com> Date: Mon Nov 3 14:44:36 2014 -0800 Changed service to IntentService. Db handles multi thread much better. Code cleanup. Deleted dead code. commit f6b10563b0ea09f613e47ed2b0cf58a2a93a7df5 Author: Kaz Baygan <kazb@baygan.com> Date: Tue Oct 28 12:26:16 2014 -0700 Added swipe support. Added code to delete messages from outbox when they are delivered commit 4f2de105ab4d8f7ea2ca92e85347e38fa2d09744 Author: Kaz Baygan <kazb@baygan.com> Date: Thu Oct 16 14:29:11 2014 -0700 fixed date display issue commit 1da49f02eb6b179ed24f1f990c9156cf47fdb0de Author: Kaz Baygan <kazb@baygan.com> Date: Wed Nov 5 02:21:49 2014 -0800 incorporated notification library. commit e64461f06546b32c0919256834e7aa225d23fe8b Author: Ram Joshi <rjoshi@climate.com> Date: Tue Oct 28 19:28:13 2014 +0000 Merge pull request clojure#2 in CERES/notifications-android from ~RJOSHI/notifications-android:BASIC-247 to master Squashed commit of the following: commit 382ebd9d815f7d827fd284ee814633948b6522ce Author: Ram Joshi <rjoshi@climate.com> Date: Mon Oct 27 14:04:33 2014 -0700 Fixed indentation in NotificationListCursorAdapter.java commit c1c830ecfce6be04d254f8cace975a3240a01211 Author: Ram Joshi <rjoshi@climate.com> Date: Mon Oct 27 13:13:20 2014 -0700 Refactored DateFormat import commit 4f3ed4a4801da5d61684412d8ed68fc21c776e4e Author: Ram Joshi <rjoshi@climate.com> Date: Mon Oct 27 10:45:37 2014 -0700 Renamed a variable and removed a comment commit 38ae9ac7bf963dc347d2520c6e1204599cf5126c Author: Ram Joshi <rjoshi@climate.com> Date: Sun Oct 26 22:06:00 2014 -0700 Added default notification item icon commit 07cea5b612ac1ee847c3de6e76e9f175c8b410c5 Author: Ram Joshi <rjoshi@climate.com> Date: Sun Oct 26 21:43:29 2014 -0700 Layout and styling notifications as per design commit 83a940a6afbbf254ffe1a7ef2ef6ba30e87765a5 Author: Kaz Baygan <kbaygan@climate.com> Date: Thu Oct 16 22:55:33 2014 +0000 Merge pull request clojure#1 in CERES/notifications-android from ~KBAYGAN/notifications-android:master to master Squashed commit of the following: commit 4f2de105ab4d8f7ea2ca92e85347e38fa2d09744 Author: Kaz Baygan <kazb@baygan.com> Date: Thu Oct 16 14:29:11 2014 -0700 fixed date display issue commit 937b38c8ed0fed68955d98277f5246298a8bc11e Author: Kaz Baygan <kazb@baygan.com> Date: Wed Oct 15 15:02:55 2014 -0700 Cleanup commit bc6c44412cb5375028efb036b30615d715a7fa50 Author: Kaz Baygan <kazb@baygan.com> Date: Wed Oct 15 15:01:14 2014 -0700 Cleanup commit daf19174bbba6e02d6a645306da8cbd438427530 Author: Kaz Baygan <kazb@baygan.com> Date: Wed Oct 15 14:55:56 2014 -0700 Added Fragment to support navigation, reformatted the main list screen, completed network calls and completed db, sqlite commit 156bcec1c2cdda942afa88536db51b5671ff57c0 Author: Kaz Baygan <kazb@baygan.com> Date: Tue Sep 2 15:12:21 2014 -0700 Initial Commit
MichaelBlume
pushed a commit
to MichaelBlume/clojure
that referenced
this pull request
Feb 2, 2016
…android:master to master
Squashed commit of the following:
commit 9677ad5b283ee30b813e44068c88a80a934c64a0
Merge: 4ead35f 9a93e70
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Dec 22 12:23:11 2014 -0800
deleted app
commit 9a93e70ea777cf1c53790ce85f316691a7b207e3
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Dec 22 12:19:25 2014 -0800
removed app
commit 4ead35f91063171e36bbb92cc6704b1b31023919
Merge: b28d896 de4140c
Author: Kaz Baygan <kazb@baygan.com>
Date: Fri Dec 19 15:16:34 2014 -0800
merge
commit b28d896c06a6a147edca14fada9a5103df2eb67f
Merge: 9ebb2a7 aab31bd
Author: Kaz Baygan <kazb@baygan.com>
Date: Fri Dec 19 14:54:28 2014 -0800
Merge branch 'workspace'
commit aab31bdad821938b5ab1be5de1de9832499ae115
Author: Kaz Baygan <kazb@baygan.com>
Date: Fri Dec 19 14:53:59 2014 -0800
Fixed a bug related to launching field detail from notifications.
commit 9ebb2a7b7462ec72d15567eb4851a51abc7aa1c7
Merge: 8a0eae6 f5e2c41
Author: Kaz Baygan <kazb@baygan.com>
Date: Thu Dec 18 16:23:26 2014 -0800
Merge branch 'workspace'
commit f5e2c41a5e6b2874c17b081a62c62c2dc475a2e2
Author: Kaz Baygan <kazb@baygan.com>
Date: Thu Dec 18 16:22:39 2014 -0800
Adde notifications settings
commit 8a0eae6b861ee33ab6b530fb1b13bd91dbd0b088
Merge: 4e3c617 1f8659e
Author: Kaz Baygan <kazb@baygan.com>
Date: Fri Dec 12 11:35:13 2014 -0800
merge
commit 4e3c617196c6e87edacf279eb5a0dd31434519c0
Merge: af21718 c2c8081
Author: Kaz Baygan <kazb@baygan.com>
Date: Fri Dec 12 11:11:56 2014 -0800
merge
commit c2c8081a142f0a0425d2e6ed47ae3012c423ce7a
Author: Kaz Baygan <kazb@baygan.com>
Date: Fri Dec 12 11:05:32 2014 -0800
Added code to fetch fields info if it does nto exists
commit 93347cdaefaa1e780b1ccfd88b1dd6b5a4b9d491
Author: Kaz Baygan <kazb@baygan.com>
Date: Fri Dec 12 10:37:23 2014 -0800
bug fixes. Added backbutton support
commit af21718b98660fccd18667ca42df2d080e9e3f6b
Merge: b2eef5a 35fe889
Author: Kaz Baygan <kazb@baygan.com>
Date: Thu Dec 11 14:29:37 2014 -0800
merge
commit 35fe889d382e5067d0f1ed95e57ab075bc99e0f9
Author: Kaz Baygan <kazb@baygan.com>
Date: Thu Dec 11 14:26:57 2014 -0800
Changed notification popup behaviour from push notifications
commit b2eef5aa2970539a12c5f1b2b0609a077d0ef2f9
Merge: 3fd0c5f 17bf61a
Author: Kaz Baygan <kazb@baygan.com>
Date: Thu Dec 11 11:12:22 2014 -0800
merge
commit 3fd0c5f564e8b35db7df1214954e9179328ff141
Author: Kaz Baygan <kazb@baygan.com>
Date: Thu Dec 11 10:41:54 2014 -0800
Fixed an issue with FieldDetails crashing. TwoWayView has changed a lot. Reimplemented the adapter for the TwoWayView using the new RecyclerView from Google. Included the library source code in this checkin since the TwoWayView is still in alpha with the new design. We can revisit this approach later. I just did not wanted to link snapshot libs as dependencies.
commit 99cdbab411d8f0386da1691c653feda3a4451e13
Merge: 913848e 148464e
Author: Kaz Baygan <kazb@baygan.com>
Date: Tue Dec 9 12:19:32 2014 -0800
merge
commit 913848e19cc5001dd3f23b5f7ab38bf393f5ecde
Author: Kaz Baygan <kazb@baygan.com>
Date: Tue Dec 9 11:26:17 2014 -0800
Added alert type in the factory call
commit 45ea6e106f506ec53fb9f1c2952632e7d68c409e
Merge: 652b0ab e692261
Author: Kaz Baygan <kazb@baygan.com>
Date: Thu Dec 4 13:33:33 2014 -0800
merge
commit 652b0abf08638c4ba1b72acc2d390d27a1d0c80e
Author: Kaz Baygan <kazb@baygan.com>
Date: Thu Dec 4 12:31:01 2014 -0800
Basic 334, 328 and Detail view for link notification
commit 38c50075aec102d1ed27c69bbc058eb6126b28ff
Merge: 4cae412 3b9efeb
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Dec 1 16:36:40 2014 -0800
merge
commit 4cae41249cc05131ab07b2557ec2a73981eb315f
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Dec 1 16:32:01 2014 -0800
merge
commit 72086f424412b22866f697e31ae87b339e171d51
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Dec 1 16:09:37 2014 -0800
Multidex support. Disabled proguard stuff. Basic 295 - show/hide notifications based on Mercury
commit 18da32a4f879d02103dbbd6e8d98115a4fe806c8
Merge: 692ae0f 10dea1e
Author: Kaz Baygan <kazb@baygan.com>
Date: Tue Nov 25 14:06:44 2014 -0800
merge
commit 692ae0faafaf9f23e2fcafe0662b61b20d08c4b1
Author: Kaz Baygan <kazb@baygan.com>
Date: Tue Nov 25 14:00:51 2014 -0800
Added user prefrences for notifications. Beefed up proguard.pro in the hopes that it would fix erroneous code disappearing problems.
commit 10dea1ed1f75fb6cf5737a8d718831df14849443
Author: Ram Joshi <rjoshi@climate.com>
Date: Wed Nov 19 18:04:00 2014 -0800
Unversioned .idea
commit cef44b6c6a343a76fc1601d69921525cfc422817
Merge: 97da1fd 3a4808a
Author: Ram Joshi <rjoshi@climate.com>
Date: Wed Nov 19 16:50:01 2014 -0800
Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/mob/climate-android
Conflicts:
ClimateGrowersProject/ClimateGrowersApp/build.gradle
ClimateGrowersProject/ClimateGrowersApp/proguard-rules.pro
ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/ui/content/MainActivity.java
ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/ui/navigation/NavigationFragment.java
ClimateGrowersProject/ClimateGrowersApp/src/main/res/drawable/bg_red.xml
ClimateGrowersProject/ClimateGrowersApp/src/main/res/layout/frag_navigation.xml
commit 97da1fde5dcb6b55a3d73d03452929b8fb1e2d52
Merge: 7dcffb4 ce369bd
Author: Kaz Baygan <kazb@baygan.com>
Date: Wed Nov 19 12:30:04 2014 -0800
resolved conflict
commit 7dcffb448e0606a606c7fd1be7ed96fb1e80ab3f
Author: Kaz Baygan <kazb@baygan.com>
Date: Wed Nov 19 12:22:31 2014 -0800
Added unread count code. Modified proguard stuff
commit ce369bd2df27de21a980fb3fe4f54887001ac544
Author: Kaz Baygan <kbaygan@climate.com>
Date: Wed Nov 19 19:51:02 2014 +0000
Merge pull request clojure#5 in CERES/notifications-android from ~KBAYGAN/notifications-android:master to master
Squashed commit of the following:
commit 4373f8cd85b7b87c31e2b6550970571c7ac8173a
Author: Kaz Baygan <kazb@baygan.com>
Date: Wed Nov 19 11:46:46 2014 -0800
Added code for notification details. Added activities and backend code.
commit 469ec84f09fda57d259a6939e01bb0398b50532a
Merge: c6e1c1d 613971f
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Nov 17 15:36:26 2014 -0800
Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/ceres/notifications-android
Conflicts:
NotificationLib/NotificationLib.iml
NotificationLib/src/main/java/com/climate/android/notificationlib/service/NotificationService.java
NotificationLib/src/main/java/com/climate/android/notificationlib/sqlite/NotificationDatabase.java
NotificationLib/src/main/java/com/climate/android/notificationlib/ui/NotificationFragment.java
app/build.gradle
commit c6e1c1da903e5735e0f970b0fc3273a35ee4241c
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Nov 17 14:21:34 2014 -0800
Added unread count support
commit 7b9dda8755a1803df90e6d907650f610bb300806
Author: Kaz Baygan <kazb@baygan.com>
Date: Fri Nov 7 10:48:31 2014 -0800
added logic to update 'read count' better. Added code for unread count.
commit 8d8c4f6aba5d0dbda4f180c6e0d64eb7bdca5e9a
Author: Kaz Baygan <kazb@baygan.com>
Date: Wed Nov 5 09:39:50 2014 -0800
deleted dead code. Added count support to notifications.removed unused libraries. Added code to use support libraries, as the main app requires it. Fixed a bug.
commit 3ffb5733f4d3d6da6bac852d92968d5c8eef7264
Author: Kaz Baygan <kazb@baygan.com>
Date: Tue Nov 4 09:12:49 2014 -0800
Changed the 'createdDate' to 'updatedDate' on get list
commit aab607ae0f0b3cd10dd81ec933ff4e202720be43
Author: Kaz Baygan <kazb@baygan.com>
Date: Tue Nov 4 09:08:40 2014 -0800
Cleaned up gradle file. deleted unused libs. Changed the 'createdDate' to 'updatedDate' on call to get list
commit 897a5a6eee1b7a19da9ff413ef0f2d4eb9c76cb7
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Nov 3 15:49:25 2014 -0800
deleted a file
commit 85db15c63cd460fc8db80c62cfe097bdac1984c9
Merge: c0247e4 e64461f
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Nov 3 15:37:17 2014 -0800
resolved conflict
commit c0247e4728ce2a18bdd2f306aaf2db38c535ad39
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Nov 3 14:44:36 2014 -0800
Changed service to IntentService. Db handles multi thread much better. Code cleanup. Deleted dead code.
commit f6b10563b0ea09f613e47ed2b0cf58a2a93a7df5
Author: Kaz Baygan <kazb@baygan.com>
Date: Tue Oct 28 12:26:16 2014 -0700
Added swipe support. Added code to delete messages from outbox when they are delivered
commit 4f2de105ab4d8f7ea2ca92e85347e38fa2d09744
Author: Kaz Baygan <kazb@baygan.com>
Date: Thu Oct 16 14:29:11 2014 -0700
fixed date display issue
commit 0a5ce6782d5e02ecea7380d0f25a26cf36482060
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Nov 17 14:16:52 2014 -0800
Added badge for unread count. Added proguard to strip out unused methods to lower method count to 32k.
commit 613971fa53b673680259edefe78c8a9ef3ae4433
Author: Kaz Baygan <kbaygan@climate.com>
Date: Tue Nov 11 19:58:25 2014 +0000
Merge pull request clojure#4 in CERES/notifications-android from ~KBAYGAN/notifications-android:master to master
Squashed commit of the following:
commit 7b9dda8755a1803df90e6d907650f610bb300806
Author: Kaz Baygan <kazb@baygan.com>
Date: Fri Nov 7 10:48:31 2014 -0800
added logic to update 'read count' better. Added code for unread count.
commit 8d8c4f6aba5d0dbda4f180c6e0d64eb7bdca5e9a
Author: Kaz Baygan <kazb@baygan.com>
Date: Wed Nov 5 09:39:50 2014 -0800
deleted dead code. Added count support to notifications.removed unused libraries. Added code to use support libraries, as the main app requires it. Fixed a bug.
commit 3ffb5733f4d3d6da6bac852d92968d5c8eef7264
Author: Kaz Baygan <kazb@baygan.com>
Date: Tue Nov 4 09:12:49 2014 -0800
Changed the 'createdDate' to 'updatedDate' on get list
commit aab607ae0f0b3cd10dd81ec933ff4e202720be43
Author: Kaz Baygan <kazb@baygan.com>
Date: Tue Nov 4 09:08:40 2014 -0800
Cleaned up gradle file. deleted unused libs. Changed the 'createdDate' to 'updatedDate' on call to get list
commit 897a5a6eee1b7a19da9ff413ef0f2d4eb9c76cb7
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Nov 3 15:49:25 2014 -0800
deleted a file
commit 85db15c63cd460fc8db80c62cfe097bdac1984c9
Merge: c0247e4 e64461f
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Nov 3 15:37:17 2014 -0800
resolved conflict
commit c0247e4728ce2a18bdd2f306aaf2db38c535ad39
Author: Kaz Baygan <kazb@baygan.com>
Date: Mon Nov 3 14:44:36 2014 -0800
Changed service to IntentService. Db handles multi thread much better. Code cleanup. Deleted dead code.
commit f6b10563b0ea09f613e47ed2b0cf58a2a93a7df5
Author: Kaz Baygan <kazb@baygan.com>
Date: Tue Oct 28 12:26:16 2014 -0700
Added swipe support. Added code to delete messages from outbox when they are delivered
commit 4f2de105ab4d8f7ea2ca92e85347e38fa2d09744
Author: Kaz Baygan <kazb@baygan.com>
Date: Thu Oct 16 14:29:11 2014 -0700
fixed date display issue
commit 1da49f02eb6b179ed24f1f990c9156cf47fdb0de
Author: Kaz Baygan <kazb@baygan.com>
Date: Wed Nov 5 02:21:49 2014 -0800
incorporated notification library.
commit e64461f06546b32c0919256834e7aa225d23fe8b
Author: Ram Joshi <rjoshi@climate.com>
Date: Tue Oct 28 19:28:13 2014 +0000
Merge pull request clojure#2 in CERES/notifications-android from ~RJOSHI/notifications-android:BASIC-247 to master
Squashed commit of the following:
commit 382ebd9d815f7d827fd284ee814633948b6522ce
Author: Ram Joshi <rjoshi@climate.com>
Date: Mon Oct 27 14:04:33 2014 -0700
Fixed indentation in NotificationListCursorAdapter.java
commit c1c830ecfce6be04d254f8cace975a3240a01211
Author: Ram Joshi <rjoshi@climate.com>
Date: Mon Oct 27 13:13:20 2014 -0700
Refactored DateFormat import
commit 4f3ed4a4801da5d61684412d8ed68fc21c776e4e
Author: Ram Joshi <rjoshi@climate.com>
Date: Mon Oct 27 10:45:37 2014 -0700
Renamed a variable and removed a comment
commit 38ae9ac7bf963dc347d2520c6e1204599cf5126c
Author: Ram Joshi <rjoshi@climate.com>
Date: Sun Oct 26 22:06:00 2014 -0700
Added default notification item icon
commit 07cea5b612ac1ee847c3de6e76e9f175c8b410c5
Author: Ram Joshi <rjoshi@climate.com>
Date: Sun Oct 26 21:43:29 2014 -0700
Layout and styling notifications as per design
commit 83a940a6afbbf254ffe1a7ef2ef6ba30e87765a5
Author: Kaz Baygan <kbaygan@climate.com>
Date: Thu Oct 16 22:55:33 2014 +0000
Merge pull request clojure#1 in CERES/notifications-android from ~KBAYGAN/notifications-android:master to master
Squashed commit of the following:
commit 4f2de105ab4d8f7ea2ca92e85347e38fa2d09744
Author: Kaz Baygan <kazb@baygan.com>
Date: Thu Oct 16 14:29:11 2014 -0700
fixed date display issue
commit 937b38c8ed0fed68955d98277f5246298a8bc11e
Author: Kaz Baygan <kazb@baygan.com>
Date: Wed Oct 15 15:02:55 2014 -0700
Cleanup
commit bc6c44412cb5375028efb036b30615d715a7fa50
Author: Kaz Baygan <kazb@baygan.com>
Date: Wed Oct 15 15:01:14 2014 -0700
Cleanup
commit daf19174bbba6e02d6a645306da8cbd438427530
Author: Kaz Baygan <kazb@baygan.com>
Date: Wed Oct 15 14:55:56 2014 -0700
Added Fragment to support navigation, reformatted the main list screen, completed network calls and completed db, sqlite
commit 156bcec1c2cdda942afa88536db51b5671ff57c0
Author: Kaz Baygan <kazb@baygan.com>
Date: Tue Sep 2 15:12:21 2014 -0700
Initial Commit
This pull request was closed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
12 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I had the need for whitespace? a few times now, thought it'll make a good addition to clojure.string