Skip to content

Master #167

Closed
wants to merge 234 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
234 commits
Select commit Hold shift + click to select a range
783c3ca
test for my branch
jic13003 Feb 1, 2017
8506f3a
Icons Galore!
clj13001 Feb 7, 2017
4cf6475
Update CREDITS.md
clj13001 Feb 7, 2017
0f95bc8
Update CREDITS.md
clj13001 Feb 7, 2017
d4a6920
Profile Image Integration
clj13001 Feb 8, 2017
7eb10f0
A lot added into the Profile Settings Page.
clj13001 Feb 9, 2017
97d5692
Update README.md
clj13001 Feb 10, 2017
a7d9b91
Changing Text
clj13001 Feb 10, 2017
9adfdea
Changing MySQLAccess query
clj13001 Feb 10, 2017
b545bb8
Merge pull request #23 from arc12012/Connor's-Branch
clj13001 Feb 12, 2017
c5330f3
Imporoved the look of the order info popup
arc12012 Feb 14, 2017
11fe650
Minor DB Class Changes. Also cats
Feb 18, 2017
e4b62fd
Merge pull request #25 from arc12012/BriBranch
beb13005 Feb 18, 2017
a04ef03
Catching up with last weeks updates
clj13001 Feb 21, 2017
cced9d4
Queries work now!
clj13001 Feb 21, 2017
3b4bc36
Images actually were working.
clj13001 Feb 21, 2017
b872a75
Yay!
clj13001 Feb 23, 2017
ded7118
Some minor modal changes to return page.
clj13001 Feb 23, 2017
e41e62e
Typo in the Database
clj13001 Feb 23, 2017
8448e1c
Shop.jsp can now communicate with the dataabase! Yay!
arc12012 Feb 23, 2017
1193551
DB changes
clj13001 Feb 23, 2017
0a35b90
Refactoring
arc12012 Feb 23, 2017
edaca2a
Merge branch 'master' of
jic13003 Feb 24, 2017
00da908
test commit to remove whatever the fuck I did earlier
jic13003 Feb 24, 2017
bb28f4d
Merge remote-tracking branch 'refs/remotes/origin/master' into Connor…
clj13001 Feb 24, 2017
7f7fee9
Adding pom file back
clj13001 Feb 24, 2017
e8c597f
Merge pull request #27 from arc12012/Connors-Branch
clj13001 Feb 24, 2017
f72173c
Merge remote-tracking branch 'refs/remotes/origin/master' into
jic13003 Feb 24, 2017
fb681c7
got the listed devices page to show all devices
jic13003 Feb 24, 2017
f4ec3d2
Merge pull request #28 from arc12012/John's-Branch
clj13001 Feb 24, 2017
44bb506
Image functionality fixed on Device Listing
clj13001 Feb 24, 2017
8a971dd
Autofill correctly parses phone number and location
arc12012 Feb 27, 2017
e2b5cf5
Initial commit
clj13001 Mar 1, 2017
0454577
Forgot the most important part!
clj13001 Mar 1, 2017
8e9343c
Commas added in places.
clj13001 Mar 2, 2017
9d531f9
THINGS RETURN
clj13001 Mar 2, 2017
b7de000
Navbar generation was missing on the Completion page.
clj13001 Mar 3, 2017
20d27ab
nonfunctional commit because last time I changed branches without com…
arc12012 Mar 3, 2017
884e613
availability done, most local code removed
jic13003 Mar 3, 2017
2c43d0b
the listing page filtering works, shoutouts to adam for the help
jic13003 Mar 6, 2017
b7bddb4
New text fields for address. Ticket generation is very close to worki…
arc12012 Mar 15, 2017
8b3cc0b
Autofill updated for new address filds and location dropdown.
arc12012 Mar 17, 2017
58f881b
Added calendar selector-that was easier than I thought.
arc12012 Mar 17, 2017
9847360
Should now be generating a new location if needed-database needs adju…
arc12012 Mar 18, 2017
c5339d6
Location Admin Page Complete
clj13001 Mar 21, 2017
2b31f6a
Database changes
Mar 22, 2017
14a49ee
New location from order form now 'works'
Mar 23, 2017
d9b7509
Ticket generation incorporates return date
Mar 23, 2017
316f9ad
Login Page Stuffs with Cookies
Mar 23, 2017
00e01db
Conflict fix on MySQLAccess
clj13001 Mar 23, 2017
0b38350
Merge pull request #31 from arc12012/BriBranch
clj13001 Mar 23, 2017
cf6a423
request page done, localstorage issue fixed
jic13003 Mar 23, 2017
74a2129
merge conflict fixed
jic13003 Mar 23, 2017
cf16ef8
Merge pull request #32 from arc12012/John's-Super-Fun-Branch
jic13003 Mar 23, 2017
c725b69
Merge pull request #33 from arc12012/Connor-Branch
clj13001 Mar 23, 2017
0d0c471
I dunno why this wasn't committed
Mar 23, 2017
4c816e1
Large conflict resolved
clj13001 Mar 24, 2017
08176ab
Merge pull request #30 from arc12012/Client
clj13001 Mar 24, 2017
0a91d1b
Multiple Important Changes
clj13001 Mar 24, 2017
d983b8d
Cookies, yay!
arc12012 Mar 30, 2017
9bcea10
removed debug alert
arc12012 Mar 30, 2017
1e34125
Shopping cart locations properly make use of employee flags when read…
arc12012 Mar 30, 2017
af11bb7
Shoppingcart popop has a functionless location name field and date in…
arc12012 Mar 30, 2017
f75d22c
Loc name autofills now
arc12012 Mar 30, 2017
bc2bd0c
And now location names from the name field are stored! That's it for …
arc12012 Mar 30, 2017
e76b5f9
Quick Fixes to Admin Location Stylings
clj13001 Mar 30, 2017
330020e
Merge remote-tracking branch 'refs/remotes/origin/master' into Jcoona…
clj13001 Mar 30, 2017
f256d44
New files
clj13001 Mar 30, 2017
e8e507c
Working off of One Device Class
clj13001 Mar 30, 2017
3dc05cc
Switching Branch
clj13001 Mar 31, 2017
7b24880
So much refactoring
arc12012 Apr 1, 2017
4ac508d
Merge branch 'master' of https://github.uconn.edu/arc12012/2017-CSE-S…
arc12012 Apr 1, 2017
d91a2ae
Device Settings Update
clj13001 Apr 1, 2017
9c166a8
Merge remote-tracking branch 'refs/remotes/origin/master' into Jcoona…
clj13001 Apr 1, 2017
f397ee9
Device Settings Page Now Works.
clj13001 Apr 1, 2017
580244e
Listing page internal filtering reorganized somewhat in preperation f…
arc12012 Apr 4, 2017
0455983
Search works, horray! (only for device names right now)
arc12012 Apr 4, 2017
991fb38
Fixed 'other' filter bug on listing page
arc12012 Apr 4, 2017
a588daa
Search feature introduced to request page
arc12012 Apr 4, 2017
0e5d59b
Merge remote-tracking branch 'refs/remotes/origin/master' into Jcoona…
clj13001 Apr 5, 2017
8b460df
A couple adjusting changes
clj13001 Apr 5, 2017
f93a61c
Merge pull request #76 from arc12012/JcoonaBranch
clj13001 Apr 5, 2017
1843b38
Shoopingcart order popup-location name field hidden instead of disabled
arc12012 Apr 5, 2017
d112d8c
Merge branch 'master' of https://github.uconn.edu/arc12012/2017-CSE-S…
arc12012 Apr 5, 2017
8e8baf3
Search feature introduced to adimin device edit page-currently search…
arc12012 Apr 5, 2017
eeb1fcd
Bug pushes
clj13001 Apr 6, 2017
523a88e
Search works across multiple fields, hooray!
arc12012 Apr 6, 2017
8a01c2c
More bug fixes
clj13001 Apr 6, 2017
5590ded
Enhancements and Bug Fixes
clj13001 Apr 6, 2017
a3dbda4
Admin device search now indexes serial number
arc12012 Apr 6, 2017
8449075
Accept Tickets -- tickets still need to be viewable
Apr 6, 2017
f295c71
Approval Page Works
clj13001 Apr 7, 2017
70f9441
Merge pull request #83 from arc12012/ApproveRejectTickets
clj13001 Apr 7, 2017
36ab9f9
Quickfix
clj13001 Apr 7, 2017
b56d511
Merge Resolution
clj13001 Apr 7, 2017
86a6a38
Quick fix
clj13001 Apr 7, 2017
7b2f796
BETA IS READY
clj13001 Apr 7, 2017
627c3c7
Merge pull request #84 from arc12012/bug
clj13001 Apr 7, 2017
8c4f20b
Quick Formatting Updates For Tomorrow's Showoff
clj13001 Apr 7, 2017
7324e4e
OK, I lied. THIS is ready for beta.
clj13001 Apr 7, 2017
0963edf
Recovering Files
clj13001 Apr 7, 2017
79f8a7f
Fixed servlet-api.jar problem
clj13001 Apr 7, 2017
2313810
bar graph added, edits to pie chart
jic13003 Apr 7, 2017
4da198f
Profile Settings Page now Updates
clj13001 Apr 11, 2017
66dd230
User Automatic Logout
clj13001 Apr 11, 2017
0a919e1
Shopping cart form should be better now
arc12012 Apr 11, 2017
31dc822
Update CREDITS.md
clj13001 Apr 12, 2017
9efc228
Error Page Exists Now
clj13001 Apr 12, 2017
bdf9cd4
Merge remote-tracking branch 'refs/remotes/origin/master' into bugs
clj13001 Apr 12, 2017
cb9e346
Doesn't Force Login If You're Already Logged In
clj13001 Apr 12, 2017
22b7d3d
Update CREDITS.md
clj13001 Apr 12, 2017
f6a8c2e
Handling MySQL Errors
clj13001 Apr 12, 2017
8bfbed6
Merge remote-tracking branch 'refs/remotes/origin/master' into bugs
clj13001 Apr 12, 2017
2afb2eb
Enhancements annd Bugs
clj13001 Apr 12, 2017
2dbdb55
Color changes
clj13001 Apr 12, 2017
7535ac3
Merge pull request #111 from arc12012/bugs
clj13001 Apr 13, 2017
c4c90bc
just saving progress
arc12012 Apr 13, 2017
8da70d8
Redirect wasn't quite working
clj13001 Apr 13, 2017
6fd0ac4
Merge remote-tracking branch 'refs/remotes/origin/master' into bugs
clj13001 Apr 13, 2017
f22f1a4
Merge pull request #112 from arc12012/bugs
clj13001 Apr 13, 2017
3a6b8ae
Merge branch 'master' of https://github.uconn.edu/arc12012/2017-CSE-S…
arc12012 Apr 13, 2017
f75fc9a
Merge branch 'master' of https://github.uconn.edu/arc12012/2017-CSE-S…
arc12012 Apr 13, 2017
21cf687
I'm just testing something
arc12012 Apr 13, 2017
f9919e9
Testing a diff tool...
arc12012 Apr 13, 2017
630efae
Merge branch 'master' into email
arc12012 Apr 13, 2017
3de6d7c
still testing
arc12012 Apr 13, 2017
6b8d995
test
arc12012 Apr 13, 2017
da57b00
test
arc12012 Apr 13, 2017
7db2471
Merge remote-tracking branch 'refs/remotes/origin/master' into bugs
clj13001 Apr 13, 2017
146a0b6
Removing buggy script
clj13001 Apr 13, 2017
6c94b95
Merge branch 'search' into email
arc12012 Apr 13, 2017
fb62bfc
Formatting of Statistics Page
clj13001 Apr 13, 2017
722b0ba
Merging Support
clj13001 Apr 13, 2017
383bda4
Merge pull request #113 from arc12012/John's-Branch
clj13001 Apr 13, 2017
875b24f
Merge branch 'master' of https://github.uconn.edu/arc12012/2017-CSE-S…
arc12012 Apr 13, 2017
f9938ca
Text Edits
clj13001 Apr 13, 2017
5aaf946
Merge branch 'master' of https://github.uconn.edu/arc12012/2017-CSE-S…
arc12012 Apr 13, 2017
d655898
Another... text ... fix
clj13001 Apr 13, 2017
92401ab
Added Mail class which can send an email from my gmail account
arc12012 Apr 13, 2017
fb495d4
Merge branch 'master' of https://github.uconn.edu/arc12012/2017-CSE-S…
arc12012 Apr 13, 2017
ab2b332
Merge branch 'email'
arc12012 Apr 13, 2017
99edea5
Merge remote-tracking branch 'refs/remotes/origin/master' into bugs
clj13001 Apr 13, 2017
a792c6f
Logout Button Is Functional
clj13001 Apr 13, 2017
fd8abc7
Merge remote-tracking branch 'refs/remotes/origin/master' into bugs
clj13001 Apr 13, 2017
87230c7
Switch branches
clj13001 Apr 13, 2017
c4ec0a7
Quick fix
clj13001 Apr 13, 2017
2b0ecdc
Merge remote-tracking branch 'refs/remotes/origin/master' into bugs
clj13001 Apr 13, 2017
2a37d1e
Admins are now forced to change their password upon first login
clj13001 Apr 14, 2017
924f70e
These got missed in the last commit
clj13001 Apr 14, 2017
9323536
Merge pull request #122 from arc12012/bugs
clj13001 Apr 14, 2017
6ccd07a
Adds logout feature. Users must now input a 9 digit SSO number.
Apr 14, 2017
1d19e52
This page needs to be updated.
Apr 14, 2017
0a58ded
Merge remote-tracking branch 'refs/remotes/origin/master' into bugs
clj13001 Apr 14, 2017
ffe983b
MD5 Hash added for admin passwords
Apr 14, 2017
76ba1c7
Merge remote-tracking branch 'refs/remotes/origin/master' into John's…
clj13001 Apr 14, 2017
410de8b
Conflict resolution
clj13001 Apr 14, 2017
048eabc
Website Reorganization
clj13001 Apr 15, 2017
b77ee75
Merge pull request #125 from arc12012/loginbugs
clj13001 Apr 15, 2017
367c4d9
fixed pie chart to show umbrella terms
jic13003 Apr 16, 2017
20f7ba5
Restructured Mail.java a bit and added ticket confirmation email temp…
arc12012 Apr 16, 2017
488daa8
Merge branch 'master' of https://github.uconn.edu/arc12012/2017-CSE-S…
arc12012 Apr 16, 2017
e6c1f94
A messege is constructed and sent to the client (still through gmail)…
arc12012 Apr 16, 2017
3b4e711
Made a Notification settings form on the profile page, which doesn't …
arc12012 Apr 17, 2017
1d04f5a
fixed up statistics to match changes mentioned by zach
jic13003 Apr 17, 2017
467eeaf
Modified return, request, and listing to support mouseover
jic13003 Apr 17, 2017
6cb7e19
fixed a problem with other manufacturer in request, fixed listing popup
jic13003 Apr 17, 2017
f3f5b1c
Quick fix
clj13001 Apr 17, 2017
b473947
Introducing the notification queue
arc12012 Apr 17, 2017
8663d5d
Merge branch 'master' of https://github.uconn.edu/arc12012/2017-CSE-S…
arc12012 Apr 17, 2017
d2f31f3
Couple temp fixes
clj13001 Apr 17, 2017
ff35a4c
Committing to get to master.
clj13001 Apr 17, 2017
bc54fee
merging
clj13001 Apr 17, 2017
8dda270
Merge pull request #132 from arc12012/John's-Branch
clj13001 Apr 17, 2017
dd292c9
Merge remote-tracking branch 'refs/remotes/origin/master' into bugs
clj13001 Apr 17, 2017
b33a427
Device Hub now supports some extra fields
clj13001 Apr 17, 2017
734d223
Replaced my personal email with a dummy email so everyone can get ema…
arc12012 Apr 18, 2017
a8b1ed8
Latitude and Longitude Support
clj13001 Apr 18, 2017
bb2dd4a
Merge pull request #135 from arc12012/bugs
clj13001 Apr 18, 2017
1592e3f
Extremely Important Bug Fixes
clj13001 Apr 19, 2017
28ea1d8
Merge remote-tracking branch 'refs/remotes/origin/master' into bugs
clj13001 Apr 19, 2017
c57bb5b
Merge pull request #138 from arc12012/bugs
clj13001 Apr 19, 2017
a043509
Device Redirect fix and database sql file
arc12012 Apr 19, 2017
791e43d
Fixed a properties error I caused eariler
arc12012 Apr 19, 2017
c474ccc
max_user_questions. Guess I'm done for tonight.
arc12012 Apr 19, 2017
58df8d6
More bug fixes
clj13001 Apr 19, 2017
af9ba3d
Merge remote-tracking branch 'refs/remotes/origin/master' into bugs
clj13001 Apr 19, 2017
16d0493
Reducing queries via navbar
clj13001 Apr 19, 2017
d7bbcda
Merge pull request #140 from arc12012/bugs
clj13001 Apr 19, 2017
0ec07ba
Merge remote-tracking branch 'refs/remotes/origin/master' into bugs
clj13001 Apr 19, 2017
1cc8784
New Users Can Be Created Now
clj13001 Apr 19, 2017
49d3dbe
Merge pull request #142 from arc12012/bugs
clj13001 Apr 19, 2017
c77c2df
The notification queue works!!!!
arc12012 Apr 19, 2017
ef21eba
Merge branch 'email'
arc12012 Apr 19, 2017
55c5997
site change
clj13001 Apr 19, 2017
9dc2fc1
Merge remote-tracking branch 'refs/remotes/origin/master' into bugs
clj13001 Apr 19, 2017
ba78b24
Introduced notification settings display bug
arc12012 Apr 20, 2017
64ae85a
Fixed bugs from previous commit. Notification preferences work now, j…
arc12012 Apr 20, 2017
5e8ed1e
Ticket rejection emails have been implemented. Client email notificat…
arc12012 Apr 20, 2017
08d3858
Buggy admin ticket search bar; pushing to debug on desktop
arc12012 Apr 20, 2017
d937b87
Bug Fixes
clj13001 Apr 21, 2017
260aad7
Merge branch 'master' into bugs
clj13001 Apr 21, 2017
30999b4
Merge
clj13001 Apr 21, 2017
e7b6682
Merge pull request #150 from arc12012/bugs
clj13001 Apr 21, 2017
7e61ec8
Update README.md
clj13001 Apr 21, 2017
49c6fbf
Obliterating Rented Device
clj13001 Apr 21, 2017
1f3595a
Merge remote-tracking branch 'refs/remotes/origin/master' into bugs
clj13001 Apr 21, 2017
684f004
I have learned to hate JSON.
clj13001 Apr 21, 2017
b9d4c85
Ticket page search bar
arc12012 Apr 21, 2017
186a6b1
Merge branch 'search'
arc12012 Apr 21, 2017
c1fe6d4
Made device search rainbow
arc12012 Apr 21, 2017
fc200b4
Password Reset Functionality
clj13001 Apr 21, 2017
f0aaa51
Merge
clj13001 Apr 21, 2017
527cd32
Merge pull request #153 from arc12012/bugs
clj13001 Apr 21, 2017
e024559
Merge remote-tracking branch 'refs/remotes/origin/master' into bugs
clj13001 Apr 21, 2017
1f32fe9
Device description and admin comments are no longer indexed by search…
arc12012 Apr 22, 2017
409d23f
Mail method for sending new passwords, untested
arc12012 Apr 22, 2017
2f8dd73
Password Reset
clj13001 Apr 22, 2017
2e0a4eb
Merge remote-tracking branch 'refs/remotes/origin/master' into bugs
clj13001 Apr 22, 2017
d9c38d7
Push
clj13001 Apr 22, 2017
d04db29
Included WAR file in project
arc12012 Apr 22, 2017
16cb3b3
Merge pull request #160 from arc12012/bugs
clj13001 Apr 22, 2017
b91d55f
Merge branch 'master' of https://github.uconn.edu/arc12012/2017-CSE-S…
arc12012 Apr 22, 2017
c3315bb
Updated WAR
arc12012 Apr 22, 2017
180e81a
Quick fix
clj13001 Apr 22, 2017
6341267
Error happened! :(
clj13001 Apr 22, 2017
c3a9998
Updated WAR file
arc12012 Apr 22, 2017
09a0749
Updated WAR file
arc12012 Apr 22, 2017
1621de4
quick fix ... again
clj13001 Apr 22, 2017
cab1517
Merge branch 'master' of https://github.uconn.edu/arc12012/2017-CSE-S…
arc12012 Apr 22, 2017
1a3e3d4
Updated WAR file
arc12012 Apr 22, 2017
4e02bc4
Merge remote-tracking branch 'refs/remotes/origin/master' into bugs
clj13001 Apr 23, 2017
a8fac9c
All Tickets Page Added
clj13001 Apr 23, 2017
abe4856
Shopping cart touch ups
arc12012 Apr 23, 2017
5493da4
Merge branch 'bugs' of https://github.uconn.edu/arc12012/2017-CSE-Sen…
arc12012 Apr 23, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 23 additions & 3 deletions .classpath
Expand Up @@ -12,14 +12,34 @@
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="con" path="org.eclipse.jst.server.core.container/org.cloudfoundry.appcloudserver.classPathProvider/Cloud Foundry">
<classpathentry kind="lib" path="lib/servlet-api.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="lib/activation.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="lib/mail.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value=""/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="lib/smtp.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value=""/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v9.0">
<attributes>
<attribute name="owner.project.facets" value="jst.web"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre1.8.0_121">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="owner.project.facets" value="java"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
Expand Down
20 changes: 10 additions & 10 deletions .metadata/.log
@@ -1,10 +1,10 @@
!SESSION 2016-11-12 15:28:17.844 -----------------------------------------------
eclipse.buildId=4.6.1.M20160907-1200
java.version=1.8.0_60
java.vendor=Oracle Corporation
BootLoader constants: OS=macosx, ARCH=x86_64, WS=cocoa, NL=en_US
Framework arguments: -product org.eclipse.epp.package.java.product
Command-line arguments: -os macosx -ws cocoa -arch x86_64 -product org.eclipse.epp.package.java.product

!ENTRY org.eclipse.core.net 1 0 2016-11-12 15:28:54.631
!MESSAGE System property http.nonProxyHosts has been set to local|*.local|169.254/16|*.169.254/16 by an external source. This value will be overwritten using the values from the preferences
!SESSION 2016-11-12 15:28:17.844 -----------------------------------------------
eclipse.buildId=4.6.1.M20160907-1200
java.version=1.8.0_60
java.vendor=Oracle Corporation
BootLoader constants: OS=macosx, ARCH=x86_64, WS=cocoa, NL=en_US
Framework arguments: -product org.eclipse.epp.package.java.product
Command-line arguments: -os macosx -ws cocoa -arch x86_64 -product org.eclipse.epp.package.java.product
!ENTRY org.eclipse.core.net 1 0 2016-11-12 15:28:54.631
!MESSAGE System property http.nonProxyHosts has been set to local|*.local|169.254/16|*.169.254/16 by an external source. This value will be overwritten using the values from the preferences
@@ -1,2 +1,2 @@
eclipse.preferences.version=1
version=1
eclipse.preferences.version=1
version=1
@@ -1,13 +1,13 @@
content_assist_proposals_background=255,255,255
content_assist_proposals_foreground=0,0,0
eclipse.preferences.version=1
fontPropagated=true
org.eclipse.jdt.ui.editor.tab.width=
org.eclipse.jdt.ui.formatterprofiles.version=12
org.eclipse.jdt.ui.javadoclocations.migrated=true
org.eclipse.jface.textfont=1|Monaco|11.0|0|COCOA|1|;
proposalOrderMigrated=true
spelling_locale_initialized=true
tabWidthPropagated=true
useAnnotationsPrefPage=true
useQuickDiffPrefPage=true
content_assist_proposals_background=255,255,255
content_assist_proposals_foreground=0,0,0
eclipse.preferences.version=1
fontPropagated=true
org.eclipse.jdt.ui.editor.tab.width=
org.eclipse.jdt.ui.formatterprofiles.version=12
org.eclipse.jdt.ui.javadoclocations.migrated=true
org.eclipse.jface.textfont=1|Monaco|11.0|0|COCOA|1|;
proposalOrderMigrated=true
spelling_locale_initialized=true
tabWidthPropagated=true
useAnnotationsPrefPage=true
useQuickDiffPrefPage=true
@@ -1,2 +1,2 @@
eclipse.preferences.version=1
org.eclipse.m2e.discovery.pref.projects=
eclipse.preferences.version=1
org.eclipse.m2e.discovery.pref.projects=
@@ -1,2 +1,2 @@
eclipse.preferences.version=1
mylyn.attention.migrated=true
eclipse.preferences.version=1
mylyn.attention.migrated=true
@@ -1,2 +1,2 @@
eclipse.preferences.version=1
org.eclipse.mylyn.monitor.activity.tracking.enabled.checked=true
eclipse.preferences.version=1
org.eclipse.mylyn.monitor.activity.tracking.enabled.checked=true
@@ -1,5 +1,5 @@
eclipse.preferences.version=1
migrated.task.repositories.secure.store=true
org.eclipse.mylyn.tasks.ui.filters.nonmatching=true
org.eclipse.mylyn.tasks.ui.filters.nonmatching.encouraged=true
org.eclipse.mylyn.tasks.ui.welcome.message=true
eclipse.preferences.version=1
migrated.task.repositories.secure.store=true
org.eclipse.mylyn.tasks.ui.filters.nonmatching=true
org.eclipse.mylyn.tasks.ui.filters.nonmatching.encouraged=true
org.eclipse.mylyn.tasks.ui.welcome.message=true
@@ -1,2 +1,2 @@
eclipse.preferences.version=1
org.eclipse.team.ui.first_time=false
eclipse.preferences.version=1
org.eclipse.team.ui.first_time=false
@@ -1,2 +1,2 @@
eclipse.preferences.version=1
overviewRuler_migration=migrated_3.1
eclipse.preferences.version=1
overviewRuler_migration=migrated_3.1
@@ -1,5 +1,5 @@
PROBLEMS_FILTERS_MIGRATE=true
eclipse.preferences.version=1
platformState=1478982499589
quickStart=false
tipsAndTricks=true
PROBLEMS_FILTERS_MIGRATE=true
eclipse.preferences.version=1
platformState=1478982499589
quickStart=false
tipsAndTricks=true
@@ -1,3 +1,3 @@
//org.eclipse.ui.commands/state/org.eclipse.ui.navigator.resources.nested.changeProjectPresentation/org.eclipse.ui.commands.radioState=false
PLUGINS_NOT_ACTIVATED_ON_STARTUP=org.eclipse.m2e.discovery;
eclipse.preferences.version=1
//org.eclipse.ui.commands/state/org.eclipse.ui.navigator.resources.nested.changeProjectPresentation/org.eclipse.ui.commands.radioState=false
PLUGINS_NOT_ACTIVATED_ON_STARTUP=org.eclipse.m2e.discovery;
eclipse.preferences.version=1