Connor Turland
|
8e55d32146
|
Merge branch 'develop' into tvw
|
2014-10-24 12:11:24 -04:00 |
|
Connor Turland
|
cbf71ca2da
|
four little styling bugs
|
2014-10-24 12:10:56 -04:00 |
|
Connor Turland
|
75c286ecc6
|
merged develop fixes
|
2014-10-24 11:31:39 -04:00 |
|
Connor Turland
|
1aaecd0a8f
|
improved sign up error display, fixed styling for firefox, fixed page stuck on loading spinner bug
|
2014-10-24 11:30:26 -04:00 |
|
Connor Turland
|
a8fb22ee95
|
fix for allowing sign ups, and for about lightbox overflow
|
2014-10-23 20:31:57 -04:00 |
|
Connor Turland
|
2d0793c083
|
fixed broken lightbox content
|
2014-10-23 20:16:04 -04:00 |
|
Connor Turland
|
189f04780c
|
rejig urls, switch support image, add default map image
|
2014-10-23 19:54:39 -04:00 |
|
Connor Turland
|
e61a32ebaa
|
removed typekit for mooo.com, fixed topright_sprite
|
2014-10-22 21:26:37 -04:00 |
|
poietic
|
3a8e0c08a6
|
changed order of "delete, remove, hide from map"
|
2014-10-22 21:06:42 -04:00 |
|
Connor Turland
|
3d973dc7f3
|
styled homepage, made sure password forgot, and password reset pages were accessible when logged out, updated metacode images
|
2014-10-22 13:41:06 -04:00 |
|
Connor Turland
|
13937ae51d
|
merged conflicts coming from develop branch
|
2014-10-22 11:52:31 -04:00 |
|
Connor Turland
|
49c0af3add
|
Merge pull request #371 from Connoropolous/wip-MouseStuff
Changes to Mouse Functionality
|
2014-10-22 11:34:51 -04:00 |
|
Connor Turland
|
a7328526a8
|
got profile picture uploading working, as well as profile picture removing, as well as password changing
|
2014-10-21 20:31:59 -04:00 |
|
Connor Turland
|
37455abfe9
|
removed lightboxes, password protected
|
2014-10-18 19:26:34 -04:00 |
|
Raymon Johnstone
|
6840d69747
|
lightboxes and stylesheet changes
|
2014-10-18 13:56:45 -04:00 |
|
Connor Turland
|
fbfe695998
|
adding topics to map from search results happens in a spiral
|
2014-10-16 23:54:26 -04:00 |
|
Connor Turland
|
1cceaceb06
|
cannow handle multiple metacodes with same names
|
2014-10-16 21:03:11 -04:00 |
|
Connor Turland
|
0449e28177
|
right click menus position nicely
|
2014-10-15 19:32:15 -04:00 |
|
Connor Turland
|
79daaf705b
|
made metacode selecct for topic card always accessible, for when you move the card near the right or bottom of screen
|
2014-10-15 18:25:31 -04:00 |
|
Connor Turland
|
c37c846fbd
|
ensured map info box action buttons only show at proper times. enabled deletion of maps
|
2014-10-14 23:20:40 -04:00 |
|
Connor Turland
|
bfc8c796c7
|
border radius for map card images
|
2014-10-14 17:00:17 -04:00 |
|
Connor Turland
|
f9f147304f
|
styling for map info box mostly complete
|
2014-10-14 16:34:09 -04:00 |
|
Connor Turland
|
51221ee3f7
|
improvements to map info card, as well as small changes to the permission changers in the topic and synapse cards
|
2014-10-13 19:27:30 -04:00 |
|
Connor Turland
|
e17cfb4f12
|
border radius for map created prompt
|
2014-10-11 23:08:31 -04:00 |
|
Connor Turland
|
cd4474a0f0
|
created map prompt
|
2014-10-11 22:49:44 -04:00 |
|
Connor Turland
|
6eec187eee
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new
|
2014-10-07 15:19:30 -04:00 |
|
Connor Turland
|
b5068b6bc4
|
finalized uservoice config
|
2014-10-07 15:19:10 -04:00 |
|
Bashar Jabbour
|
e3c677fa5b
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002
|
2014-10-07 14:47:18 -04:00 |
|
Bashar Jabbour
|
e405cc5a5d
|
updated the noIE lightbox
|
2014-10-07 14:47:06 -04:00 |
|
Raymon Johnstone
|
fbdef0108e
|
Merge commit 'stash' into develop
|
2014-10-07 12:39:43 -04:00 |
|
Raymon Johnstone
|
3cb5c4ce3a
|
index on develop: d30417f fixed right click on topic menu, fixed synapse color when opening for synapse card, removed mCustomScrollbar
|
2014-10-07 12:39:14 -04:00 |
|
Connor Turland
|
f591baf4c9
|
ability to switch between multiple synapses between two topics
|
2014-10-05 18:39:07 -04:00 |
|
Connor Turland
|
5c05c6bb83
|
404 page updates, synapse card 90%
|
2014-10-05 13:58:05 -04:00 |
|
Connor Turland
|
fae7f9996d
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new
|
2014-10-03 11:26:49 -04:00 |
|
Bashar Jabbour
|
cad8af2c1f
|
updated the cheatsheet
|
2014-10-02 22:33:28 -04:00 |
|
Connor Turland
|
10e5228488
|
finalized cheatsheet move help button back into the corner
|
2014-10-01 23:41:39 -04:00 |
|
Bashar Jabbour
|
b70681ea6e
|
updated the 404 page
|
2014-10-01 23:21:05 -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 |
|
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
|
b577f4fd19
|
improved z-indexes
|
2014-10-01 17:15:35 -04:00 |
|
Connor Turland
|
8ef56735bf
|
switch metacode set styling complete
|
2014-10-01 16:23:59 -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
|
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
|
06f18215dd
|
bug fixes for mapping experience. able to store multiple references to synapses on each edge
|
2014-09-29 16:04:36 -04:00 |
|