Code

Update README.md#2

Code

Open

michaelsingh100 wants to merge 134 commits intoSravan2j:masterSravan2j/Cinequest-Android:masterfrom cpollett:mastercpollett/Cinequest-Android:masterCopy head branch name to clipboard

+2,956-3,080

Commits

Commits on Sep 24, 2014

• Update README.md

  cpollett

  committed
  47e0554

  Copy full SHA for 47e0554

Commits on Sep 30, 2014

• Added our names

  8Mobius8

  committed
  2a58116

  Copy full SHA for 2a58116

• new file

  Show description for 7b16a0d
  

  nabilamiri

  authored and

  nabilamiri

  committed
  7b16a0d

  Copy full SHA for 7b16a0d

Commits on Oct 9, 2014

• Document SeparatedListAdapter.java

  Show description for 9796e79
  hongde88

  committed
  9796e79

  Copy full SHA for 9796e79

• Merge pull request #1 from hongde88/master

  Show description for 70e6be9
  cpollett

  committed
  70e6be9

  Copy full SHA for 70e6be9

Commits on Oct 10, 2014

• Added some documentaion to the FileCache.java file

  8Mobius8

  committed
  df8c26a

  Copy full SHA for df8c26a

• Add class & method documentation

  johnsmiller

  committed
  92e648e

  Copy full SHA for 92e648e

• LazyAdapter comments/documentation

  Show description for 3476e74
  

  nabilamiri

  authored and

  nabilamiri

  committed
  3476e74

  Copy full SHA for 3476e74

Commits on Oct 11, 2014

• Changed comments to JavaDoc type comments.

  8Mobius8

  committed
  541d2e5

  Copy full SHA for 541d2e5

• Merge pull request #6 from 8Mobius8/master

  Show description for b5d7ba7
  cpollett

  committed
  b5d7ba7

  Copy full SHA for b5d7ba7

• Cleaned up some code and added some javadoc

  katharinebrinker

  committed
  80ff8b2

  Copy full SHA for 80ff8b2

• Merge pull request #7 from katharinebrinker/master

  Show description for 8d6acc1
  cpollett

  committed
  8d6acc1

  Copy full SHA for 8d6acc1

• Commented on some classes.

  bruno1308

  committed
  5ed020d

  Copy full SHA for 5ed020d

• Merge https://github.com/cpollett/Cinequest-Android

  bruno1308

  committed
  6b396f0

  Copy full SHA for 6b396f0

Commits on Oct 18, 2014

• Added comments to some undocumented classes and clarifid some classes

  

  System Administrator

  authored and

  System Administrator

  committed
  8039141

  Copy full SHA for 8039141

Commits on Oct 21, 2014

• Updated with necessary changes

  

  System Administrator

  authored and

  System Administrator

  committed
  a69577e

  Copy full SHA for a69577e

• Applied Requested Changes

  

  System Administrator

  authored and

  System Administrator

  committed
  282fc40

  Copy full SHA for 282fc40

Commits on Oct 22, 2014

• Changed 'Schedule' to 'My Cinequest'

  johnsmiller

  committed
  dbc2ca9

  Copy full SHA for dbc2ca9

• Merging in commits made by other students in CS 175 course.

  8Mobius8

  committed
  14b08d8

  Copy full SHA for 14b08d8

Commits on Oct 23, 2014

• Merge pull request #19 from Ofek86/master

  Show description for 2ffd446
  cpollett

  committed
  2ffd446

  Copy full SHA for 2ffd446

• Commit for First part of Paint the App Red, Issue #11

  sreenidhipm

  committed
  8444e4a

  Copy full SHA for 8444e4a

Commits on Oct 27, 2014

• Merge pull request #22 from sreenidhipm/Sreenidhi-Cinequest-Android

  Show description for fd8e602
  cpollett

  committed
  fd8e602

  Copy full SHA for fd8e602

• Add some missing imports, delete whitespace, a=chris

  cpollett

  committed
  c46fb83

  Copy full SHA for c46fb83

Commits on Oct 29, 2014

• We should really git fetch upstream more often.

  Show description for b7ae702
  8Mobius8

  committed
  b7ae702

  Copy full SHA for b7ae702

Commits on Nov 2, 2014

• issue #13 fixed

  shwu2012

  committed
  f17eca9

  Copy full SHA for f17eca9

• issue 13 films and events buttons updated

  shwu2012

  committed
  6ace69f

  Copy full SHA for 6ace69f

• Merge pull request #23 from 8Mobius8/master

  Show description for ebb8dc1
  cpollett

  committed
  ebb8dc1

  Copy full SHA for ebb8dc1

• Merge pull request #25 from shwu2012/master

  Show description for 2ac4e24
  cpollett

  committed
  2ac4e24

  Copy full SHA for 2ac4e24

Commits on Nov 3, 2014

• Removed forums tab from MainTab. Removed "else if" clause which handeled

  Show description for cbb0077
  kenano

  committed
  cbb0077

  Copy full SHA for cbb0077

Commits on Nov 4, 2014

• Merge pull request #26 from kenano/master

  Show description for e4250a9
  cpollett

  committed
  e4250a9

  Copy full SHA for e4250a9

Commits on Nov 8, 2014

• fixed button border and list_header color

  farjahan

  committed
  f2937bf

  Copy full SHA for f2937bf

• Merge pull request #28 from farjahan/master

  Show description for 611093d
  cpollett

  committed
  611093d

  Copy full SHA for 611093d

Commits on Nov 11, 2014

• Added border for Films and Events button

  farjahan

  committed
  49e8e56

  Copy full SHA for 49e8e56

• Fixed Comments according to directions:

  Show description for 0ef10fa
  swathi-k

  committed
  0ef10fa

  Copy full SHA for 0ef10fa

Commits on Nov 12, 2014

• Merge pull request #29 from swathi-k/master

  Show description for 540aba6
  cpollett

  committed
  540aba6

  Copy full SHA for 540aba6

Commits on Nov 15, 2014

• Merge pull request #31 from farjahan/master

  Show description for 67494fd
  cpollett

  committed
  67494fd

  Copy full SHA for 67494fd

Commits on Nov 17, 2014

• Display a server down message if app hangs at the loading sreen

  hongde88

  committed
  dc1b9bd

  Copy full SHA for dc1b9bd

Commits on Nov 18, 2014

• Merge branch 'master' of https://github.com/cpollett/Cinequest-Android

  bruno1308

  committed
  1983e32

  Copy full SHA for 1983e32

Commits on Nov 19, 2014

• change server message to what Matt wanted it to be

  hongde88

  committed
  d371ede

  Copy full SHA for d371ede

Commits on Nov 21, 2014

• search edit text added

  hongde88

  committed
  432d2d8

  Copy full SHA for 432d2d8

Commits on Nov 22, 2014

• Special character bug fix

  Show description for a2aa6a3
  michaelsingh99

  committed
  a2aa6a3

  Copy full SHA for a2aa6a3

Commits on Nov 24, 2014

• searchable edit text added

  hongde88

  committed
  803230b

  Copy full SHA for 803230b

• Merge branch 'master' of https://github.com/hongde88/Cinequest-Android

  hongde88

  committed
  3753c92

  Copy full SHA for 3753c92

• Merge pull request #36 from michaelsingh99/master

  Show description for 6fc9533
  cpollett

  committed
  6fc9533

  Copy full SHA for 6fc9533

• Merge pull request #33 from hongde88/master

  Show description for c530401
  cpollett

  committed
  c530401

  Copy full SHA for c530401

Commits on Nov 25, 2014

• Updated Share Options banner color. Everything that's supposed to be red should now be red. For issue: Paint The App Red

  katharinebrinker

  committed
  6755052

  Copy full SHA for 6755052

• Merge pull request #43 from katharinebrinker/master

  Show description for 33365d2
  cpollett

  committed
  33365d2

  Copy full SHA for 33365d2

Commits on Nov 27, 2014

• Just fixed image loading issue by encoding image url

  hongde88

  committed
  4c1fa68

  Copy full SHA for 4c1fa68

Commits on Nov 29, 2014

• Merge pull request #44 from hongde88/master

  Show description for f11e0e9
  cpollett

  committed
  f11e0e9

  Copy full SHA for f11e0e9

Commits on Dec 2, 2014

• "Make Events Tab into Schedule Tab"

  Show description for b320501
  BrianGuilardi

  committed
  b320501

  Copy full SHA for b320501

• Update AndroidManifest.xml

  Show description for 1935636
  michaelsingh99

  committed
  1935636

  Copy full SHA for 1935636

• Update AndroidManifest.xml

  Show description for 085845c
  michaelsingh99

  committed
  085845c

  Copy full SHA for 085845c

• Update AndroidManifest.xml

  Show description for 4190973
  michaelsingh99

  committed
  4190973

  Copy full SHA for 4190973

Commits on Dec 3, 2014

• Merge pull request #48 from BrianGuilardi/master

  Show description for 6b3b55a
  cpollett

  committed
  6b3b55a

  Copy full SHA for 6b3b55a

• Merge pull request #50 from michaelsingh99/master

  Show description for 99bff09
  cpollett

  committed
  99bff09

  Copy full SHA for 99bff09

• refixed interaction color to red

  farjahan

  committed
  7b652c0

  Copy full SHA for 7b652c0

• Test

  Show description for 5290ccd
  michaelsingh99

  committed
  5290ccd

  Copy full SHA for 5290ccd

Commits on Dec 4, 2014

• Update/change current images to same size grey icons,Update Icons for non-active and active Buttons states, and Swap schedule tab and My Cinequest tab Icons

  farjahan

  committed
  92cfd72

  Copy full SHA for 92cfd72

• fixed and limited the Android application only in Portrait orientation #54

  Show description for e6e4e63
  zhen511

  committed
  e6e4e63

  Copy full SHA for e6e4e63

• Merge pull request #58 from zhen511/master

  Show description for 9f07a6e
  cpollett

  committed
  9f07a6e

  Copy full SHA for 9f07a6e

• Merge pull request #57 from farjahan/master

  Show description for f43cd88
  cpollett

  committed
  f43cd88

  Copy full SHA for f43cd88

• Merge pull request #51 from farjahan/master

  Show description for 164714a
  cpollett

  committed
  164714a

  Copy full SHA for 164714a

Commits on Dec 8, 2014

• uploaded missing images

  farjahan

  committed
  d499347

  Copy full SHA for d499347

Commits on Dec 9, 2014

• Merge pull request #61 from farjahan/master

  Show description for 9d167ce
  cpollett

  committed
  9d167ce

  Copy full SHA for 9d167ce

Commits on Dec 10, 2014

• Changed My Cinequest tab text size so it fits on the tab

  katharinebrinker

  committed
  fd99d66

  Copy full SHA for fd99d66

• Merging with upstream. App actually builds now

  katharinebrinker

  committed
  8dd0576

  Copy full SHA for 8dd0576

• Updated images, now that Eclipse decided they exist

  katharinebrinker

  committed
  ffba2cd

  Copy full SHA for ffba2cd

• Merge pull request #65 from katharinebrinker/master

  Show description for 6a8cbab
  cpollett

  committed
  6a8cbab

  Copy full SHA for 6a8cbab

• fixed secondary App Navigation Options #64

  farjahan

  committed
  c9bbafe

  Copy full SHA for c9bbafe

Commits on Dec 11, 2014

• finish issue #63, replace youtube with Twiiter

  luznlun

  committed
  16bcd0b

  Copy full SHA for 16bcd0b

• Merge pull request #66 from farjahan/master

  Show description for 50865f5
  cpollett

  committed
  50865f5

  Copy full SHA for 50865f5

• finish issue #63, replace youtube with twitter

  luznlun

  committed
  b62e1fa

  Copy full SHA for b62e1fa

Commits on Dec 13, 2014

• Merge branch 'master' of https://github.com/cpollett/Cinequest-Android

  bruno1308

  committed
  8fd6169

  Copy full SHA for 8fd6169

Commits on Dec 16, 2014

• Merge pull request #68 from luznlun/master

  Show description for b058963
  cpollett

  committed
  b058963

  Copy full SHA for b058963

• Revert "finish issue #63, replace youtube with Twiiter"

  cpollett

  committed
  d971d2d

  Copy full SHA for d971d2d

• Merge pull request #69 from cpollett/revert-68-master

  Show description for 00a394a
  cpollett

  committed
  00a394a

  Copy full SHA for 00a394a

• Update README.md

  cpollett

  committed
  141b4bd

  Copy full SHA for 141b4bd

• Deprecated method being replaced by the new one.

  bruno1308

  committed
  93a1e84

  Copy full SHA for 93a1e84

• Merge branch 'master' of https://github.com/cpollett/Cinequest-Android

  bruno1308

  committed
  6cffbab

  Copy full SHA for 6cffbab

Commits on Dec 17, 2014

• fix the build error, now youtube button is replaced with Twitter. It will search the title name upon click.

  luznlun

  committed
  f3d39cb

  Copy full SHA for f3d39cb

• Merge pull request #70 from bruno1308/master

  Show description for 4768bee
  cpollett

  committed
  4768bee

  Copy full SHA for 4768bee

• Merge pull request #71 from luznlun/master

  Show description for 76aaf25
  cpollett

  committed
  76aaf25

  Copy full SHA for 76aaf25

Commits on Dec 23, 2014

• Updated ScheduleActivity

  

  ofek86

  committed
  33f064d

  Copy full SHA for 33f064d

Commits on Dec 24, 2014

• Updated Cinequest Activity to enable clicking on event and adding it to schedule of Cinequest. So, now clicking on calendar icon and on the event adds that event to cinequest

  

  ofek86

  committed
  480148b

  Copy full SHA for 480148b

• Put back original Schedule Activity with working delete button

  

  ofek86

  committed
  4d204ac

  Copy full SHA for 4d204ac

Commits on Dec 28, 2014

• Updated FilmsActivity1.java to anchor date when user scrolls through items

  

  ofek86

  committed
  7920487

  Copy full SHA for 7920487

Commits on Jan 2, 2015

• Updated FilmsActivity1.java to anchor date when user scrolls through items

  

  ofek86

  committed
  aca520d

  Copy full SHA for aca520d

Commits on Jan 4, 2015

• Optimized Code For Faster Performance, and added anchoring of date to MyCinequest tab

  

  ofek86

  committed
  7e47928

  Copy full SHA for 7e47928

Commits on Jan 6, 2015

• latest changes to email application, it uses a chooser so user can choose which application to user to email with

  

  ofek86

  committed
  e7a5796

  Copy full SHA for e7a5796

• Updateed button names in FilmsDetails, and put code that should allow a person to send email

  

  ofek86

  committed
  e514942

  Copy full SHA for e514942

Commits on Jan 7, 2015

• Email functionality checked and verified, latest code is submitted

  

  ofek86

  committed
  5699fe6

  Copy full SHA for 5699fe6

• Facebook login and post functions merged into one function. Its easy to post now.

  

  ofek86

  committed
  216ee8f

  Copy full SHA for 216ee8f

• Twitter works again now.

  

  ofek86

  committed
  e43a76b

  Copy full SHA for e43a76b

Commits on Jan 8, 2015

• Twitter works again now. Repolished facebook code

  

  ofek86

  committed
  728b5ea

  Copy full SHA for 728b5ea

Commits on Jan 14, 2015

• Facebook now works, there is not need for a facebook application

  

  ofek86

  committed
  c99c5dc

  Copy full SHA for c99c5dc

• Extra Two necessary files

  

  ofek86

  committed
  d27fdd7

  Copy full SHA for d27fdd7

Commits on Jan 15, 2015

• Commit with latest changes

  

  ofek86

  committed
  fef7102

  Copy full SHA for fef7102

Commits on Jan 17, 2015

• Gave credit to facebook Webview code

  

  ofek86

  committed
  cd028c5

  Copy full SHA for cd028c5

Commits on Jan 19, 2015

• Attempt to fix a bug of having schedule events actually be removed when deleting from MyCinequest schedule

  

  ofek86

  committed
  40a1287

  Copy full SHA for 40a1287

Commits on Jan 20, 2015

• Contacts refresh as they are added and deleted

  

  ofek86

  committed
  65deb77

  Copy full SHA for 65deb77

• Changing banner

  

  ofek86

  committed
  f71bdbb

  Copy full SHA for f71bdbb

• changed backgroundimage name

  

  ofek86

  committed
  3013bd0

  Copy full SHA for 3013bd0

• commit removing old filmreel

  

  ofek86

  committed
  6e2049f

  Copy full SHA for 6e2049f

• Adding filmreel2.jpg

  

  ofek86

  committed
  61614e2

  Copy full SHA for 61614e2

• Adding filmreel3.jpg

  

  ofek86

  committed
  5660a00

  Copy full SHA for 5660a00

• removing filmreel2.jpg

  

  ofek86

  committed
  2e5f367

  Copy full SHA for 2e5f367

Commits on Jan 21, 2015

• adding two new images one for splash and one for news banner

  

  ofek86

  committed
  5fb1ae0

  Copy full SHA for 5fb1ae0

• adding two new images one for splash and one for news banner

  

  ofek86

  committed
  edc3746

  Copy full SHA for edc3746

• adding androidsplash due to naming conventions

  

  ofek86

  committed
  e0dac90

  Copy full SHA for e0dac90

Commits on Jan 27, 2015

• adding more stuff to ignore list

  cpollett

  committed
  a484449

  Copy full SHA for a484449

Commits on Jan 29, 2015

• Changes cinequest guid, a=chris

  cpollett

  committed
  4bb4d65

  Copy full SHA for 4bb4d65

Commits on Jan 30, 2015

• Fixed Schedule not showing

  

  ofek86

  committed
  248c793

  Copy full SHA for 248c793

• Fixed Schedule to display in a chronological order

  

  ofek86

  committed
  378ea43

  Copy full SHA for 378ea43

Commits on Dec 17, 2015

• ...

  cayhorstmann

  committed
  a562bcd

  Copy full SHA for a562bcd

• removed .idea

  cayhorstmann

  committed
  b608a5c

  Copy full SHA for b608a5c

Commits on Jan 15, 2016

• Videos playing

  cayhorstmann

  committed
  7f6a8a4

  Copy full SHA for 7f6a8a4

Commits on Jan 20, 2016

• Schedule fix

  cayhorstmann

  committed
  af329d4

  Copy full SHA for af329d4

• New splash screen

  cayhorstmann

  committed
  c73586c

  Copy full SHA for c73586c

Commits on Jan 26, 2016

• added - android:versionCode="1601251907" android:versionName="16.0125.1907" to the manifest header for the Google Play store to accept the signed APK (mopsal)

  

  cayhorstmann

  authored and

  mopsal

  committed
  8ab332a

  Copy full SHA for 8ab332a

Commits on Jan 31, 2016

• ...

  cayhorstmann

  committed
  3c2734f

  Copy full SHA for 3c2734f

Commits on Feb 4, 2016

• added - android:versionCode="1602041503" android:versionName="16.0204.1503" to the manifest header for the Google Play store to accept the signed APK (mopsal)

  

  cayhorstmann

  authored and

  mopsal

  committed
  28808ec

  Copy full SHA for 28808ec

Commits on Feb 6, 2016

• ...

  cayhorstmann

  committed
  4087b2f

  Copy full SHA for 4087b2f

• Merge branch 'master' of github.com:cpollett/Cinequest-Android

  cayhorstmann

  committed
  9d2f8c8

  Copy full SHA for 9d2f8c8

• added - android:versionCode="1602060938" android:versionName="16.0206.0938" to the manifest header for the Google Play store to accept the signed APK (mopsal)

  

  cayhorstmann

  authored and

  mopsal

  committed
  87be56e

  Copy full SHA for 87be56e

Commits on Feb 7, 2016

• ...

  cayhorstmann

  committed
  82cc7e3

  Copy full SHA for 82cc7e3

• Merge branch 'master' of github.com:cpollett/Cinequest-Android

  cayhorstmann

  committed
  3891821

  Copy full SHA for 3891821

Commits on Feb 8, 2016

• ...

  cayhorstmann

  committed
  568207b

  Copy full SHA for 568207b

• added - android:versionCode="1602081518" android:versionName="16.0208.1518" to the manifest header for the Google Play store to accept the signed APK (mopsal)

  mopsal

  committed
  e6295b6

  Copy full SHA for e6295b6

Commits on Apr 24, 2016

• Merge pull request #1 from cpollett/master

  Show description for 3cbdcdb
  

  Ofek86

  committed
  3cbdcdb

  Copy full SHA for 3cbdcdb

Commits on Dec 21, 2016

• Updated Gradle, updated splash screen image

  mopsal

  committed
  5c11fe2

  Copy full SHA for 5c11fe2

Commits on Mar 30, 2017

• Updated Gradle, updated URLs for trending and venues

  mopsal

  committed
  23fc69b

  Copy full SHA for 23fc69b

Commits on Jun 28, 2017

• Merge pull request #75 from Ofek86/master

  Show description for 8f0369f
  

  Ofek86

  authored
  8f0369f

  Copy full SHA for 8f0369f

Commits on Dec 6, 2017

• Updated newsFeedURL to point to main feed from Agile Ticketing - mopsal

  mopsal

  committed
  aa95c5c

  Copy full SHA for aa95c5c

• Merge remote-tracking branch 'origin/master'

  mopsal

  committed
  39da57d

  Copy full SHA for 39da57d