-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy pathgit_log.txt
412 lines (281 loc) · 13.8 KB
/
git_log.txt
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
commit 8627d21a5b3844920c8865d1d3207a6be0ba3897
Author: Anupam <[email protected]>
Date: Mon Nov 9 14:07:29 2015 -0500
Removed small error in case of search by location
commit 30ed9ccf1a93f6c9d9347997742c7c0b33d1f7bb
Merge: 510708c e2b3dc6
Author: Harshal Lehri <[email protected]>
Date: Sun Nov 8 17:55:55 2015 -0500
Merge branch 'Following_v1.0'
commit 510708c61c371f22c158e95b2308385e7ee9747a
Author: Nishant <[email protected]>
Date: Sun Nov 8 17:55:00 2015 -0500
Improved GUI for ratings
commit e2b3dc662c43bad265fe30e13a59231531afec24
Author: Harshal Lehri <[email protected]>
Date: Sun Nov 8 17:53:11 2015 -0500
Added Following Feature to the App
commit 6f34d78d92e67e87650ba7d8e3203cc6daa1ce14
Merge: f68e498 672a7ca
Author: Nishant <[email protected]>
Date: Sun Nov 8 17:49:55 2015 -0500
Merge branch 'master' of https://github.com/LehriHarshal/JobBoard
commit f68e4984448dea25c155fcd7c9c4ec4c73bcf3d2
Merge: f1d4914 40c8216
Author: Nishant <[email protected]>
Date: Sun Nov 8 17:46:27 2015 -0500
Improved GUI for ratings
commit 672a7ca28fd2e4515d3b1514cfcda3c7210fab7c
Merge: 7864d5b 40c8216
Author: Anupam <[email protected]>
Date: Sun Nov 8 16:01:32 2015 -0500
All user points completed
commit 7864d5be07202745cbda95993c9e00105369ed69
Author: Anupam <[email protected]>
Date: Sun Nov 8 15:57:20 2015 -0500
Searching and sorting according to the rating done
commit c0c167261a804b5eaa64710f41dad3367667d4e1
Author: Anupam <[email protected]>
Date: Sun Nov 8 15:54:41 2015 -0500
Searching according to the location done
commit f1d491433cf16fa613ed6450c68c48a554774cf4
Author: Nishant <[email protected]>
Date: Sun Nov 8 14:40:17 2015 -0500
just for pulling
commit 40c8216ce0f8cbf07c131adf74eeb0ebcf07024a
Author: Harshal Lehri <[email protected]>
Date: Sun Nov 8 14:33:10 2015 -0500
Able to add Followings to the List. Next part is adding notifications based on the job postings of people in the 'following' list
commit d499b9b310057b609417cdcdf3826f4fcabdf072
Merge: 750f4f3 a7ad897
Author: chirags <[email protected]>
Date: Sat Nov 7 17:46:19 2015 -0500
Merge branch 'master' of https://github.com/LehriHarshal/JobBoard
commit 750f4f3f21a629c9045d841a82adb667a5f0e2ef
Author: chirags <[email protected]>
Date: Sat Nov 7 17:45:49 2015 -0500
Added Dynamic Profile Photo updates. The user can now loggout and yet see the photo as the photo will be retrieved from parse itself.-- Chirag
commit a7ad897084455865faef735070833035641eb4cd
Author: Harshal Lehri <[email protected]>
Date: Sat Nov 7 17:45:12 2015 -0500
Pushing minor fixes with Layout 2
commit 07db0c6c368b663f8f03c3baa82898bfd8704f61
Author: Harshal Lehri <[email protected]>
Date: Sat Nov 7 16:21:02 2015 -0500
Pushing minor fixes with Layout
commit d00d3bf6cd6bdef2ca315b172f6aef968129f50f
Author: Harshal Lehri <[email protected]>
Date: Sat Nov 7 15:46:59 2015 -0500
Pushing minor fixes
commit dc0078a173a3782b81b382ddf87a1c8a6f481155
Merge: d4a3ce3 91e0eee
Author: Harshal Lehri <[email protected]>
Date: Sat Nov 7 14:11:15 2015 -0500
Commit before pull
commit d4a3ce3f8e05bc86dd3977b1f6f0ddab1fb183e2
Author: Harshal Lehri <[email protected]>
Date: Sat Nov 7 14:08:19 2015 -0500
Commiting my changes before pulling new upgrades
commit 91e0eee5b138905367fae545e1765680e464ad9d
Author: Anupam <[email protected]>
Date: Fri Nov 6 17:08:43 2015 -0500
Search and Sort according to Type working perfectly
commit 2f3f5b40c89e1167d5b5dacb6771dd10f721d6b3
Merge: 2b57517 b59dd85
Author: Anupam <[email protected]>
Date: Fri Nov 6 12:52:14 2015 -0500
Adding files -anupam
commit 677924a3b8e4c8755e98e11d3274afabb5134adc
Merge: ae386e2 b59dd85
Author: Harshal Lehri <[email protected]>
Date: Tue Nov 3 12:35:11 2015 -0500
Merge branch 'master' of https://github.com/LehriHarshal/JobBoard
Updating Local Repo
commit b59dd853151239839dc3bbb5756f481cc440e546
Merge: 7e849fd 16179a3
Author: chirags <[email protected]>
Date: Tue Nov 3 12:31:51 2015 -0500
Profile Activity and Maps added
commit ae386e22415afb371030d8d383d148506914ca74
Merge: 24ff9bb 16179a3
Author: Harshal Lehri <[email protected]>
Date: Tue Nov 3 10:10:41 2015 -0500
Merge branch 'master' of https://github.com/LehriHarshal/JobBoard
Merging Changes made by Nishant
commit 2b57517b5855fa4f1ebba421062eb64bc8c461c2
Author: Anupam <[email protected]>
Date: Tue Nov 3 04:54:55 2015 -0500
Searching sorting by type done. A few results inaccurate. Will fix them by next iteration
commit 7eec80688af51c1164d933a98b8c525ce34b5970
Author: Anupam <[email protected]>
Date: Tue Nov 3 04:16:18 2015 -0500
Fixed Action Bar not visible Problem
commit 499748153585e0aeec97d6b3c4180f728768b4db
Author: Anupam <[email protected]>
Date: Tue Nov 3 03:47:01 2015 -0500
added type to job
commit 75eb448b51fa893dd25f01dde2599c5592244d23
Author: Anupam <[email protected]>
Date: Tue Nov 3 00:59:04 2015 -0500
testing on branch Anupam
commit 16179a3fb4e7a73dd321b8726a3bb35b3d2d265f
Author: Nishant <[email protected]>
Date: Mon Nov 2 22:02:56 2015 -0500
Activities were getting created multiple time. Fixed that
commit 24ff9bb37caf873fcde06bfb223351e683238e35
Author: Harshal Lehri <[email protected]>
Date: Mon Nov 2 16:12:15 2015 -0500
Basic Functionality of Messaging Now works. It is slow and cannot fetch Dynamic Updates. Will add that
commit 9e19c3d9049d8474da29744792b72e6413d1f294
Author: Harshal Lehri <[email protected]>
Date: Sun Nov 1 22:44:07 2015 -0500
User able to send messages to Parse Database. Next to include Chat Activity
commit 7e849fdeffc9cccd651efb34c3cab5d689d49411
Author: chirags <[email protected]>
Date: Sat Oct 31 20:49:14 2015 -0400
Profile Photo functionality added
commit 4342e57ce3b702e50118bf0a456e378fe0bedc25
Merge: f7c35fa fb96e95
Author: Harshal Lehri <[email protected]>
Date: Fri Oct 30 11:50:16 2015 -0400
Resolving merge conflicts with the main branch
commit f7c35faa6bd24d6d79a1250d6a77c2df45c176fa
Merge: f12e324 a8c8c88
Author: chirags <[email protected]>
Date: Tue Oct 27 18:48:11 2015 -0400
Merge remote-tracking branch 'origin' into Chirag
Conflicts:
build/intermediates/dex-cache/cache.xml
commit f12e3247266a899a4c45f0e4a09ed04bfce4d253
Author: chirags <[email protected]>
Date: Tue Oct 27 18:33:04 2015 -0400
Location functionality added! Enhanced version added in which user can dynamically set the location and post a job remotely. Major Feature! Activity also created
commit fb96e957751fb98264ce725ab9df26f5bdfe99c3
Author: Harshal Lehri <[email protected]>
Date: Tue Oct 27 14:38:13 2015 -0400
Notifications appear now! Minor fixes remain
commit 256fe6af1274836bd27b58b67283fdccd983d54d
Author: Harshal Lehri <[email protected]>
Date: Tue Oct 27 02:14:53 2015 -0400
Fixed part of JobDetailsActivity, The activity now shows the Complete Task option where appropriate
commit 265e988539412289d3b43642caa995d96feaf7a8
Author: Harshal Lehri <[email protected]>
Date: Mon Oct 26 22:49:08 2015 -0400
Location gave null pointer exception. Have temporarily fixed it.
commit a8c8c880538cd6269d029ccde7914b8d6f88a103
Author: Harshal Lehri <[email protected]>
Date: Mon Oct 26 21:33:58 2015 -0400
Fixed the Request Job Issue, Should be working now
commit 8f79bbeed634f1aecbb90e1ce10afac443bb44f1
Merge: 4c84da7 79b0553
Author: Harshal Lehri <[email protected]>
Date: Sat Oct 24 19:42:33 2015 -0400
Merge branch 'master' of https://github.com/LehriHarshal/JobBoard
commit 4c84da7c143a70ddc1e69f9abcd737cc81db26b8
Author: Harshal Lehri <[email protected]>
Date: Sat Oct 24 19:42:26 2015 -0400
Commiting before Pulling location changes
commit 79b055324ed7b3e87ac2ff4754148b12cadfb878
Author: chirags <[email protected]>
Date: Sat Oct 24 19:39:22 2015 -0400
Location functionality added :D The location can be viewed in the database. Also, location autoupdate checker added.
commit 365d57943563a7bc969ab5e8948eac3a2cf25abd
Author: chirags <[email protected]>
Date: Sat Oct 24 15:57:57 2015 -0400
Email Verification added
commit 7de8aca3c514c5edf421c6479783e3881f5f0966
Author: chirags <[email protected]>
Date: Sat Oct 24 15:46:54 2015 -0400
Email Verification feature added.
commit 9fe37e45d5cbea3af88020fadd64e00bc69de7eb
Author: Harshal Lehri <[email protected]>
Date: Sat Oct 24 15:43:59 2015 -0400
Created New Database, Checking Email Verification
commit 1a0b858f2e0ddb30f1cb95bdf4e1d04a5042d3da
Merge: 5664439 1fb4d15
Author: Harshal Lehri <[email protected]>
Date: Sat Oct 24 15:18:05 2015 -0400
Refreshing Project 2
commit 56644392bcf1161057d9ab05c295196476e613dd
Author: Harshal Lehri <[email protected]>
Date: Sat Oct 24 15:12:21 2015 -0400
Refreshing Project
commit 1fb4d1552eaf4d2c8b87919f8f8f37cb3328c5b2
Author: chirags <[email protected]>
Date: Fri Oct 23 16:54:57 2015 -0400
Hello, Commiting demo changes from Ubuntu
commit 5622331342c942386362cb2a384eb9d52f260f4f
Merge: 275d593 ad3266c
Author: Chirag <[email protected]>
Date: Tue Oct 13 12:46:31 2015 -0400
Testing
commit 275d593bbbeff40f4be8a4b8c36bce7d656011f0
Author: Chirag <[email protected]>
Date: Tue Oct 13 12:28:02 2015 -0400
SignInActivity Modified
commit ad3266ca43a3d2e4ba911dcaf5573636f9d8ea0e
Author: Anupam Alur <[email protected]>
Date: Tue Oct 13 09:19:28 2015 -0400
Removed primitive obsession from the ViewRequestor Activity.java by creating a new class UserJobData for userId,jobId,jobName and jobStatus. Also removed code repitition from SearchableActivity.java and MyPostedJobsActivity.java by creating a new method called addvalues in MyPostedJobsActivity and calling it from Searchable Activity whenever required. This avoided writing the code again and again.
commit 61909850450ecefbd331aabe531c2cfb102c23a9
Author: Anupam Alur <[email protected]>
Date: Tue Oct 13 02:36:06 2015 -0400
removed code repititon and eliminated primitive obsession
commit ff310bf86e5168d172f09a1c16521d9d6db036cd
Author: Harshal Lehri <[email protected]>
Date: Tue Oct 13 00:39:37 2015 -0400
JobDetailsActivity seems to be working fine changes made by Nishant and so does error checking added by Chirag.
commit 9b67cdb6c4c183dc11b3034e6ddab838f9e7dd43
Merge: e25a9fb 1e6ea9d
Author: Harshal Lehri <[email protected]>
Date: Tue Oct 13 00:34:55 2015 -0400
Merge branch 'master' of https://github.com/LehriHarshal/JobBoard
commit e25a9fbbf96da2252925df16ae85d07c2bf9e6fa
Author: Harshal Lehri <[email protected]>
Date: Tue Oct 13 00:34:21 2015 -0400
Added DatePicker Class for picking dates in JobCreation Activity instead of using simple EditText
commit 1e6ea9dde19aa3d56df4d2b8a2e9c0985d009aab
Author: nishantbindu <[email protected]>
Date: Mon Oct 12 23:48:20 2015 -0400
Initialized job object
commit 86d089ce239787d23c1d9d595a86a6d09c131323
Author: nishantbindu <[email protected]>
Date: Mon Oct 12 23:30:11 2015 -0400
JobId and JobName stored in Job Class. New class called JobInfo created to store JobDescription. Converted addToMyRequested() and addUserToJobRequestor() functions into one method because they are called back to back.
commit deafbd5b0999770e4c91bd6b1558c0f5034edebd
Merge: 9412f76 7d7613b
Author: nishantbindu <[email protected]>
Date: Mon Oct 12 23:20:49 2015 -0400
Merge remote-tracking branch 'origin/master'
commit 7d7613bf762b079e48a33adce7000742097d45be
Author: Chirag <[email protected]>
Date: Mon Oct 12 22:16:11 2015 -0400
Hello FieldToCheck added
commit 9412f766a57903f0161f73f17f3c4fca7cd08167
Author: nishantbindu <[email protected]>
Date: Mon Oct 12 20:39:38 2015 -0400
JobId and JobName moved to Job class. JobDescription and other related information stored in a new class JobInfo. Required methods created. Converted addJobtoMyRequested function and addUsertoJobRequestor() to a single function, since they are called back to back and should be done in one method itself.
commit 2aa47cc249bc134dbf9b080fcbab1a9e25b971a1
Author: Harshal Lehri <[email protected]>
Date: Mon Oct 12 18:31:34 2015 -0400
Fixed button overlap issues and overflow.
commit 2314890829387532b5c848c8731e2072b20bc4fa
Author: Harshal Lehri <[email protected]>
Date: Mon Oct 12 16:11:59 2015 -0400
Fixed issue with activity job_creation_view to allow expansion as text increases.
commit d07e4ba203f79e62bad5bee37799a28b20d4142b
Author: Harshal Lehri <[email protected]>
Date: Mon Oct 12 15:00:52 2015 -0400
Created Common View for button menu used in multiple layouts. Created a common class to handle button requests.
commit d6fa6435dc8fc3fec04182adcd76c018ece5f779
Author: Harshal Lehri <[email protected]>
Date: Mon Oct 12 08:07:58 2015 -0400
Fixing issue with git ignore
commit ae23811b82ba4b25e358d4eba290d8c54e1641eb
Author: Harshal Lehri <[email protected]>
Date: Mon Oct 12 00:32:33 2015 -0400
Commiting on Local Repo
commit 58f58e11ec075a1d0e0e3af7bc8d4e5b7ebff316
Author: Harshal Lehri <[email protected]>
Date: Mon Oct 12 00:29:57 2015 -0400
Commiting on Local Repo