Bashar Jabbour
|
cad8af2c1f
|
updated the cheatsheet
|
2014-10-02 22:33:28 -04:00 |
|
|
Bashar Jabbour
|
499298613b
|
updated metacodes.yml and deleted metacode_backgrounds.css
|
2014-10-02 17:07:09 -04:00 |
|
|
Bashar Jabbour
|
6785a61fd0
|
updated 404 page
|
2014-10-02 15:55:51 -04:00 |
|
|
Bashar Jabbour
|
80221f1dd4
|
small updates to colophone
|
2014-10-01 23:25:49 -04:00 |
|
|
Bashar Jabbour
|
b70681ea6e
|
updated the 404 page
|
2014-10-01 23:21:05 -04:00 |
|
Shai Mor
|
1a4330ec19
|
metamaps support resources links
|
2014-10-01 22:55:59 -04:00 |
|
|
Bashar Jabbour
|
5b7f23a409
|
updated tracking code for google analytics
|
2014-10-01 20:57:25 -04:00 |
|
|
Bashar Jabbour
|
179cee8456
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002
|
2014-10-01 20:43:23 -04:00 |
|
|
Bashar Jabbour
|
8caabb6ce1
|
update the colophone page
|
2014-10-01 20:43:11 -04:00 |
|
Connor Turland
|
9169293323
|
small fix for minimizing search results
|
2014-10-01 20:00:03 -04:00 |
|
|
Connor Turland
|
eb57e555e9
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new
|
2014-10-01 19:52:14 -04:00 |
|
|
Connor Turland
|
b6700f77f8
|
synapse fixes
|
2014-10-01 19:52:08 -04:00 |
|
|
Shai Mor
|
ff4a64665e
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into develop
|
2014-10-01 18:09:15 -04:00 |
|
|
Shai Mor
|
4ba9a26c2b
|
style sidebar search mapper stats
|
2014-10-01 18:07:05 -04:00 |
|
|
Connor Turland
|
a1925b3573
|
heroku
|
2014-10-01 17:20:02 -04:00 |
|
|
Connor Turland
|
b577f4fd19
|
improved z-indexes
|
2014-10-01 17:15:35 -04:00 |
|
|
Connor Turland
|
999dae34ea
|
switched add link section on topic card to be without upload file for now
|
2014-10-01 16:44:11 -04:00 |
|
|
Connor Turland
|
8ef56735bf
|
switch metacode set styling complete
|
2014-10-01 16:23:59 -04:00 |
|
|
Bashar Jabbour
|
427fa99a0c
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002
|
2014-10-01 15:15:43 -04:00 |
|
|
Connor Turland
|
a382e0c35d
|
account page image border radius, fixed filters not working on first click issue
|
2014-10-01 14:07:48 -04:00 |
|
|
Connor Turland
|
031f97ba42
|
search results styling
|
2014-10-01 13:18:24 -04:00 |
|
|
Shai Mor
|
db719abf0f
|
merge with develop
|
2014-10-01 09:57:40 -04:00 |
|
|
Shai Mor
|
57fb6a15c4
|
start on search results styling, pulled in external js libraries and css
|
2014-10-01 09:54:56 -04:00 |
|
|
Connor Turland
|
eccc433627
|
fixed realtime bug where couldn't populate filters because it was missing a new mapper model that just added something
|
2014-09-30 18:13:49 -04:00 |
|
|
Connor Turland
|
81f31ea10e
|
heroku
|
2014-09-30 16:59:19 -04:00 |
|
|
Connor Turland
|
86e78919b3
|
initial code for realtime, got new topic, new synapse, and topic drag working
|
2014-09-30 16:55:25 -04:00 |
|
|
Bashar Jabbour
|
bf36c31e4d
|
Merge branch 'forgetpass' of https://github.com/Connoropolous/metamaps_gen002
|
2014-09-30 15:51:28 -04:00 |
|
|
Bashar Jabbour
|
bc59c282a7
|
fixed the google analytics tracking code
|
2014-09-30 15:34:35 -04:00 |
|
|
Connor Turland
|
b1d27d42ff
|
did one as example, need to do rest
|
2014-09-29 22:33:03 -04:00 |
|
|
Connor Turland
|
c1885615cd
|
remove tilda file
|
2014-09-29 22:26:50 -04:00 |
|
|
Connor Turland
|
2138aa89f3
|
closes #368. ability to add in metacode colors
|
2014-09-29 22:26:12 -04:00 |
|
|
Connor Turland
|
f14bdfac57
|
fixed error in _filterBox that was causing maps not to load when a synapse had a nil description. for real this time
|
2014-09-29 16:50:41 -04:00 |
|
|
Connor Turland
|
f9a24058aa
|
fixed error in _filterBox that was causing maps not to load when a synapse had a nil description
|
2014-09-29 16:45:59 -04:00 |
|
|
Connor Turland
|
2d2f98373e
|
fixed error in _filterBox that was causing maps not to load when a synapse had a nil description
|
2014-09-29 16:41:16 -04:00 |
|
|
Connor Turland
|
06f18215dd
|
bug fixes for mapping experience. able to store multiple references to synapses on each edge
|
2014-09-29 16:04:36 -04:00 |
|
|
Connor Turland
|
96d883bde7
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new
|
2014-09-29 10:45:15 -04:00 |
|
|
Connor Turland
|
2b16123a4f
|
fixed field type error on user edit form
|
2014-09-29 10:45:08 -04:00 |
|
|
Connor Turland
|
ca8794e61b
|
Merge pull request #365 from Connoropolous/wip-zoomExtents
Various changes, but mostly to Selection with box and zoom to extents
|
2014-09-29 10:38:23 -04:00 |
|
Robert Best
|
2de7167c2c
|
A bunch of fixes for selection with box, and zoom to extents
|
2014-09-28 15:29:22 -04:00 |
|
|
Robert Best
|
66ee35e364
|
Fixed merge conflicts with wip-zoomextents code
|
2014-09-26 23:34:27 -04:00 |
|
|
Robert Best
|
33fd21c216
|
removed ubuntu docs
|
2014-09-26 23:06:18 -04:00 |
|
|
Robert Best
|
0160f56238
|
partially finished fixes to zoomextents
|
2014-09-26 22:40:31 -04:00 |
|
|
Connor Turland
|
474b577d07
|
Merge pull request #362 from Connoropolous/forgetpass
Forgetpass
|
2014-09-26 22:35:41 -04:00 |
|
|
Connor Turland
|
32908c7717
|
style changes for account pages
|
2014-09-26 22:31:06 -04:00 |
|
|
BasharJabbour
|
14eb7562b1
|
fixed edit user account page
|
2014-09-26 08:42:11 -04:00 |
|
|
Connor Turland
|
c46ab1a98b
|
added hover to edit photo
|
2014-09-25 13:41:37 -04:00 |
|
|
Connor Turland
|
71247a8f04
|
fixes for account pages
|
2014-09-25 13:26:09 -04:00 |
|
|
Connor Turland
|
3f901074ec
|
Merge branch 'forgetpass' of https://github.com/Connoropolous/metamaps_gen002 into accounts
|
2014-09-25 12:31:29 -04:00 |
|
|
BasharJabbour
|
6f62d59b66
|
Sign In, Sign Up, Edit User pages have been changed. Edit User page needs lots of work still.
|
2014-09-25 12:25:46 -04:00 |
|
|
Connor Turland
|
c817622984
|
for heroku
|
2014-09-24 17:15:39 -04:00 |
|