Connor Turland
|
f62efa0d68
|
fixed terms of service link for live site
|
2014-11-30 14:06:59 -05:00 |
|
Connor Turland
|
7548c1953f
|
Merge branch 'develop' of github.com:metamaps/metamaps_gen002 into develop
|
2014-11-30 13:52:32 -05:00 |
|
Connor Turland
|
ce7bec98ed
|
fixed wrong notify message bug. fixed firefox z-index issue. moved fork on github link and pointed to new metamaps repo
|
2014-11-30 13:47:41 -05:00 |
|
Bashar Jabbour
|
0e3486ddc5
|
make topic card mapper icon link to mapper profile
|
2014-11-29 16:27:43 -05:00 |
|
Bashar Jabbour
|
ce3ab9903a
|
make map contributor list dropdown into links to profiles
|
2014-11-29 15:56:38 -05:00 |
|
Connor Turland
|
f938ffade3
|
homepage changes
|
2014-11-29 12:25:11 -05:00 |
|
Connor Turland
|
f9d3292891
|
Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop
|
2014-11-29 11:17:33 -05:00 |
|
Connor Turland
|
f02aa53637
|
fixed feedback tab, added support us button
|
2014-11-29 11:17:11 -05:00 |
|
poietic
|
99b0fa0c68
|
links in light boxes
|
2014-11-29 08:06:12 -08:00 |
|
Connor Turland
|
cb3db06406
|
switched home page to active maps instead of my maps
|
2014-11-29 01:37:06 -05:00 |
|
Connor Turland
|
870b4e2829
|
hid elements from homepage
|
2014-11-27 21:45:04 -05:00 |
|
Connor Turland
|
0e3393e1b5
|
fixed metacode select lists to be flexible to metacodes
|
2014-11-27 18:10:17 -05:00 |
|
Connor Turland
|
caa80c067b
|
links to maps go through without refresh from topic card.
|
2014-11-27 17:27:22 -05:00 |
|
Bashar Jabbour
|
a284889593
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002
|
2014-11-27 15:02:58 -05:00 |
|
Bashar Jabbour
|
78743fbba5
|
updated the tooltip of maps topic appears in
|
2014-11-27 15:02:44 -05:00 |
|
Connor Turland
|
2829005d4e
|
Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop
|
2014-11-26 16:37:50 -05:00 |
|
Connor Turland
|
377138c483
|
fixed up search results some. colophon links open in new tab. updated homepage bg image. fixed topic carousel dimensions
|
2014-11-26 16:37:13 -05:00 |
|
Bashar Jabbour
|
363ca365c1
|
added tooltip to see topics synapses
|
2014-11-26 15:23:32 -05:00 |
|
Connor Turland
|
ab53e996d4
|
Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop
|
2014-11-26 14:49:16 -05:00 |
|
Connor Turland
|
36aeead2aa
|
homepage updates. updated the 'last updated' text. fixed map cards
|
2014-11-26 14:49:01 -05:00 |
|
Bashar Jabbour
|
814a804dd8
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002
|
2014-11-26 14:44:42 -05:00 |
|
Bashar Jabbour
|
085bf78b0e
|
added tooltip for maps that topic appears in
|
2014-11-26 14:44:31 -05:00 |
|
Connor Turland
|
a003e203af
|
big home change revisions. not 100% complete
|
2014-11-26 12:58:20 -05:00 |
|
Connor Turland
|
dbf4152a81
|
updated map delete sprite
|
2014-11-26 10:51:05 -05:00 |
|
Connor Turland
|
d08774d8bc
|
changed user image settings. added mapper profile page
|
2014-11-25 15:06:30 -05:00 |
|
Connor Turland
|
e9114a309f
|
fixed up map info box issues, finished up search tooltips
|
2014-11-23 22:28:29 -05:00 |
|
Bashar Jabbour
|
5725007e78
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002
|
2014-11-22 19:35:15 -05:00 |
|
Bashar Jabbour
|
23510f2f87
|
added user image stack for map search results and associated tooltip
|
2014-11-22 19:35:03 -05:00 |
|
Connor Turland
|
a9e488d9cb
|
NOTE: rake db:migrate required. added generation column to users
|
2014-11-21 16:50:42 -05:00 |
|
Connor Turland
|
0ebc3dbc37
|
filter and realtime button active states. zoomExtents excludes filtered topics
|
2014-11-21 15:45:44 -05:00 |
|
Connor Turland
|
a20f6b760f
|
finished up map info box in terms of dynamically switching pages to other maps. styled other tips.
|
2014-11-19 22:42:14 -05:00 |
|
Bashar Jabbour
|
c4de02a958
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002
|
2014-11-18 14:50:17 -05:00 |
|
Bashar Jabbour
|
818042aeae
|
added tooltip of map contributors in mapinfo lightbox
|
2014-11-18 14:48:50 -05:00 |
|
Connor Turland
|
fe5d682fc2
|
finished synapse autocomplete styling
|
2014-11-16 15:17:32 -05:00 |
|
Connor Turland
|
2cf91d39b4
|
another test for uservoice auto signout. this time with iframe and json
|
2014-11-14 21:19:14 -05:00 |
|
Connor Turland
|
beb05f1f39
|
another test for uservoice auto signout. this time with iframe
|
2014-11-14 21:11:51 -05:00 |
|
Connor Turland
|
dc37b280e1
|
another test for uservoice auto signout
|
2014-11-14 21:03:24 -05:00 |
|
Connor Turland
|
e0c9aba857
|
auto sign out of uservoice
|
2014-11-14 20:54:51 -05:00 |
|
Connor Turland
|
4e8dabba36
|
removed worker from heroku deploy. styled lightboxes. made form for new user able to populate with code
|
2014-11-14 20:21:16 -05:00 |
|
Connor Turland
|
ac40c0af48
|
touched up tooltips
|
2014-11-14 08:21:09 -05:00 |
|
Bashar Jabbour
|
78455c6a35
|
Added capture screenshot tooltip
|
2014-11-12 13:40:00 -05:00 |
|
Bashar Jabbour
|
02d49c166a
|
upated tooltips
|
2014-11-12 13:36:41 -05:00 |
|
Metamaps
|
842313bb07
|
updated the tooltips
|
2014-11-12 13:31:15 -05:00 |
|
Connor Turland
|
534bdae495
|
little lightbox fix
|
2014-11-11 02:27:34 -05:00 |
|
Connor Turland
|
7a9f737fdb
|
Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop
|
2014-11-11 02:23:48 -05:00 |
|
Connor Turland
|
9b0304c403
|
added filtering back to topic view
|
2014-11-11 02:23:39 -05:00 |
|
poietic
|
c285f53a57
|
added link to our collaborative spaces
|
2014-11-10 18:27:38 -08:00 |
|
poietic
|
cfe2ef9adb
|
couple more tweaks.
|
2014-11-10 17:05:37 -08:00 |
|
poietic
|
1658c5fb5d
|
lightbox content tweaks
|
2014-11-10 17:02:07 -08:00 |
|
Connor Turland
|
44923eb660
|
added new map screenshot capture method
|
2014-11-09 22:10:13 -05:00 |
|
Connor Turland
|
d73fa37f57
|
tweaked donate and get involved html
|
2014-11-08 15:00:12 -05:00 |
|
poietic
|
ea689f182c
|
added Donate lightbox! more content changes
of about, get involved sections
|
2014-11-06 12:42:26 -08:00 |
|
Connor Turland
|
c5907914e3
|
fixed user images, set up map updates for realtime
|
2014-11-04 12:37:17 -05:00 |
|
Connor Turland
|
6a052f9ea1
|
added loading icon to account page while image uploads
|
2014-11-03 21:59:15 -05:00 |
|
Connor Turland
|
ee1ca7853f
|
removed embed. fixed switch metacode set lightbox overflow. disabled topic creation and topic deletion from public maps by non-owner
|
2014-11-03 08:46:22 -05:00 |
|
Connor Turland
|
2a9a27c6c5
|
stops user from creating map with empty name, or topic with empty name. sets max length on topic name. allows enter key to create map
|
2014-11-02 16:04:53 -05:00 |
|
Connor Turland
|
7805871ec2
|
made IE lightbox auto display when on IE
|
2014-11-02 14:32:42 -05:00 |
|
Connor Turland
|
12e65c638b
|
changes for reset password form
|
2014-10-27 18:24:30 -04:00 |
|
Connor Turland
|
33202b5243
|
checking cheatsheet content
|
2014-10-27 17:37:42 -04:00 |
|
Connor Turland
|
8b97c098f7
|
Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop
|
2014-10-27 17:34:28 -04:00 |
|
Connor Turland
|
c35174a99e
|
removed extraneous typekit codes
|
2014-10-27 17:34:15 -04:00 |
|
poietic
|
ad2a02bb8c
|
removed extra div
|
2014-10-27 13:43:06 -04:00 |
|
poietic
|
e898633d69
|
updated shortcuts + user actions.
|
2014-10-27 13:42:15 -04:00 |
|
Connor Turland
|
cbf71ca2da
|
four little styling bugs
|
2014-10-24 12:10:56 -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
|
c6195956ca
|
fixed topright sprite and fixed typekits for develop
|
2014-10-22 21:32:38 -04:00 |
|
Connor Turland
|
fdfa720849
|
fixed ga code, and updated topright_sprite image with one that doesn't have littl glitches
|
2014-10-22 21:04:28 -04:00 |
|
poietic
|
89b6305be8
|
updated bitcoin widget with correct wallet info
|
2014-10-22 17:07:41 -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 |
|
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
|
86bd12ca09
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into phantom
|
2014-10-14 23:20:46 -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 |
|
Raymon Johnstone
|
a9414c29d2
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into develop
|
2014-10-14 23:20:20 -04:00 |
|
Raymon Johnstone
|
3c7db77395
|
backing up bitcoin
|
2014-10-14 23:19:58 -04:00 |
|
Connor Turland
|
0ebb02bc0b
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into phantom
|
2014-10-14 16:34:26 -04:00 |
|
Connor Turland
|
f9f147304f
|
styling for map info box mostly complete
|
2014-10-14 16:34:09 -04:00 |
|
Raymon Johnstone
|
0e5e814065
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into develop
|
2014-10-13 23:21:53 -04:00 |
|
Raymon Johnstone
|
b1ae75a896
|
updates to all walkthroughs about the fact that we now use rails 2.1.2 as well as a couple changes to the get involved lightbox
|
2014-10-13 23:18:25 -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
|
fcdc6d57b2
|
setup for automatic config for urls
|
2014-10-10 21:24:31 -04:00 |
|
Connor Turland
|
cde771e007
|
got map screenshot working decent
|
2014-10-08 00:07:54 -04:00 |
|
Connor Turland
|
db3a4b66ad
|
fixed issue that others might end up having with sso_key
|
2014-10-07 19:14:25 -04:00 |
|
Connor Turland
|
d4c481aac0
|
internet explorer get browser links open in new tabs
|
2014-10-07 17:57:12 -04:00 |
|
Connor Turland
|
e756b29baa
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new
|
2014-10-07 17:46:34 -04:00 |
|
Connor Turland
|
629a6a4172
|
fixed sign in redirects
|
2014-10-07 17:46:09 -04:00 |
|
Bashar Jabbour
|
c8bda1bdf1
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002
|
2014-10-07 16:14:14 -04:00 |
|
Bashar Jabbour
|
8a70d209d1
|
fixed the links in noIE lightbox
|
2014-10-07 16:14:00 -04:00 |
|
Connor Turland
|
9ba6daec90
|
further fixed uservoice to identify user
|
2014-10-07 15:39:11 -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
|
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
|
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
|
80221f1dd4
|
small updates to colophone
|
2014-10-01 23:25:49 -04:00 |
|
Shai Mor
|
1a4330ec19
|
metamaps support resources links
|
2014-10-01 22:55:59 -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
|
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
|
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 |
|
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
|
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
|
2b16123a4f
|
fixed field type error on user edit form
|
2014-09-29 10:45:08 -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
|
c2340301fd
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new
|
2014-09-22 23:42:37 -04:00 |
|
Connor Turland
|
aaf2e4c521
|
right click styling
|
2014-09-22 23:42:26 -04:00 |
|
Bashar
|
5e76b44b80
|
centered reset password box
|
2014-09-21 20:47:09 -04:00 |
|
Connor Turland
|
ff6eef7807
|
synapse form styling and positioning
|
2014-09-21 01:02:21 -04:00 |
|
Connor Turland
|
90e974164d
|
added more resources into help lightbox
|
2014-09-20 15:11:58 -04:00 |
|
Connor Turland
|
683b459eeb
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new
|
2014-09-18 02:33:44 -04:00 |
|
Connor Turland
|
af5560b495
|
updates to metacode select within topic card
|
2014-09-18 02:33:38 -04:00 |
|
Shai Mor
|
0bf28410e6
|
switch metaset view changes
|
2014-09-17 10:59:36 -04:00 |
|
Connor Turland
|
b6893d8f92
|
fixed admin panels
|
2014-09-15 21:57:34 -04:00 |
|
Connor Turland
|
6fe8cf4b88
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new
|
2014-09-12 15:07:52 -04:00 |
|
Shai Mor
|
b722dc911b
|
help qr tutorials
|
2014-09-12 11:45:53 -04:00 |
|
Connor Turland
|
0941b43391
|
fixed spacing on abuot lightbox
|
2014-09-11 08:39:56 -04:00 |
|
Shai Mor
|
f49f45e856
|
about, invite, getInvolved
|
2014-09-10 18:12:21 -04:00 |
|
Shai Mor
|
23385a946e
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into develop
|
2014-09-10 16:32:36 -04:00 |
|
Shai Mor
|
f91728cdb6
|
get involved lightbox styling
|
2014-09-10 16:32:18 -04:00 |
|
Connor Turland
|
3a7501cc7a
|
merge shai's changes
|
2014-09-09 18:20:17 -04:00 |
|
Connor Turland
|
d2760b8688
|
change in embedly
|
2014-09-09 18:17:39 -04:00 |
|
Shai Mor
|
d18806bb18
|
merge in connors css
|
2014-09-09 15:17:49 -04:00 |
|
Shai Mor
|
4f85055c74
|
styled create map forms
|
2014-09-09 15:13:53 -04:00 |
|
Connor Turland
|
eedd3736cf
|
realtime and filter box styling
|
2014-09-03 19:05:25 -04:00 |
|
Connor Turland
|
fdf0c28daf
|
sprites
|
2014-08-26 22:51:50 -04:00 |
|
Connor Turland
|
f6245df997
|
added 20 at a time loading for explore maps pages
|
2014-08-20 15:37:18 -04:00 |
|
Connor Turland
|
2d338bb785
|
fixed right click menu and also added change metacodes to it
|
2014-08-19 14:13:45 -04:00 |
|
Connor Turland
|
45828d048e
|
added some of the icons
|
2014-08-17 14:46:07 -04:00 |
|
Connor Turland
|
6eca81487a
|
started styling of map cards and topic card, removed new maps section
|
2014-08-15 18:04:22 -04:00 |
|
Connor Turland
|
46380a17e0
|
got maps wrapper working
|
2014-08-12 19:20:46 -04:00 |
|
Connor Turland
|
6422b54dc0
|
clickable map cards
|
2014-08-12 18:14:04 -04:00 |
|
Connor Turland
|
c989b321c1
|
switched filter box to be by who added something to the map, not who created the topic or synapse
|
2014-08-12 13:22:29 -04:00 |
|
Connor Turland
|
e1fb72c2df
|
fixed user model and map models up
|
2014-08-12 11:09:53 -04:00 |
|
Shai Mor
|
65c8cb2ea7
|
embed attachments
|
2014-08-11 21:59:02 -04:00 |
|
Shai Mor
|
3be9dcfd74
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into shai
|
2014-08-11 18:59:27 -04:00 |
|
Connor Turland
|
bbc50d1305
|
got radial view working
|
2014-08-11 18:57:34 -04:00 |
|
Shai Mor
|
4541196ffe
|
part way through add links to topic cards
|
2014-08-11 18:56:03 -04:00 |
|
Shai Mor
|
85bfce0237
|
part way through add links to topic cards
|
2014-08-11 18:55:53 -04:00 |
|
Connor Turland
|
b596228782
|
restructuring for famous
|
2014-08-10 19:35:18 -04:00 |
|
Connor Turland
|
465b95753c
|
reorganize for functional famous operation
|
2014-08-10 19:24:39 -04:00 |
|
Connor Turland
|
341f9b9bdd
|
home page styling
|
2014-08-10 19:13:25 -04:00 |
|
Shai
|
6182ba4e14
|
data validation
|
2014-08-10 16:52:49 -04:00 |
|
Connor Turland
|
06b35e550d
|
first draft of explore maps working
|
2014-08-10 13:06:58 -04:00 |
|
Connor Turland
|
e9863c0192
|
merge with Robs changes
|
2014-08-06 10:14:17 -04:00 |
|
Connor Turland
|
e7a445423d
|
work in progress on explore maps pages
|
2014-08-06 10:09:01 -04:00 |
|
Robert Best
|
f75c2c1f8a
|
Added Recenter map, zoom in, zoom out, Zoom to extents and buttons for each. Also, renamed selection function to just SelectWithBox()
|
2014-08-06 04:22:06 -04:00 |
|
Tadasu85
|
e76d780335
|
Filter box coding changes, Full implementgit add .
|
2014-08-04 12:20:16 -04:00 |
|
Tadasu85
|
581ba8b78f
|
Merge remote-tracking branch 'origin/develop' into new
|
2014-08-02 13:51:54 -04:00 |
|
Tadasu85
|
2b267ea0c6
|
filterbox progress
|
2014-08-02 13:49:51 -04:00 |
|
Connor Turland
|
0a29bed856
|
fixed topics and synapses placing on map issue
|
2014-08-02 13:48:41 -04:00 |
|
Connor Turland
|
e08c702494
|
introduced the metamaps.router
|
2014-08-01 22:50:23 -04:00 |
|
Connor Turland
|
3476d0126c
|
got rgraph working again
|
2014-07-30 21:10:10 -04:00 |
|
Connor Turland
|
9dec959aee
|
more restructuring. reorganizing views files to make more sense, be grouped logically
|
2014-07-30 01:02:47 -04:00 |
|
Connor Turland
|
f817ce772c
|
changed approach to map creation. reorganized code to suit that.
|
2014-07-29 23:18:43 -04:00 |
|
Connor Turland
|
ae8c711d27
|
major code refactor
|
2014-07-29 13:34:10 -04:00 |
|
Connor Turland
|
de2c7372fd
|
removed extra files
|
2014-07-27 15:59:02 -04:00 |
|
Connor Turland
|
b06f5cae35
|
huge refactor 75% done
|
2014-07-27 15:57:35 -04:00 |
|
Connor Turland
|
aa5e3d522b
|
set proper socket for heroku
|
2014-07-07 21:08:14 -04:00 |
|
Connor Turland
|
96197130e1
|
added rmagick and ruby number for heroku
|
2014-07-07 21:02:43 -04:00 |
|
Connor Turland
|
e5ba207711
|
Merge branch 'master' of github.com:Connoropolous/metamaps_gen002
|
2014-06-15 14:41:11 -04:00 |
|
Connor Turland
|
9027cd6d2e
|
closes #352 size of cheatsheet window, closes #351 remove topic and synapse create from cheatsheet on topic pages, closes #348 enter key creating undesirable line break
|
2014-06-15 14:39:42 -04:00 |
|
poietic
|
a0cdad2138
|
Update _cheatsheet.html.erb
a couple of small switches
|
2014-06-15 10:52:38 -04:00 |
|
Connor Turland
|
0982916e10
|
hid topic view tab which was mistakenly showing
|
2014-06-14 18:25:37 -04:00 |
|
Connor Turland
|
bffda35686
|
updated cheatsheet to be tabbed
|
2014-06-14 18:21:54 -04:00 |
|
Connor Turland
|
2bb5c7a6bd
|
added homepage image
|
2014-06-11 22:38:48 -04:00 |
|
Connor Turland
|
0a3f83ade9
|
added realtime box
|
2014-06-11 16:47:46 -04:00 |
|
Connor Turland
|
5dd848abcf
|
fixed scrolling on home page
|
2014-06-11 10:38:08 -04:00 |
|
Connor Turland
|
140a526226
|
changed home page card styling
|
2014-06-11 10:25:33 -04:00 |
|
Connor Turland
|
820096e853
|
merged raymons changes
|
2014-06-11 08:42:12 -04:00 |
|
Connor Turland
|
3625a750fd
|
fixed metacode sets page styling issue
|
2014-06-10 20:22:35 -04:00 |
|
Connor Turland
|
c567f07a50
|
closes #338 ugly text labels. fixes error when trying to load topic page with a metacode set selected
|
2014-06-10 18:49:06 -04:00 |
|
Connor Turland
|
bfa25bc604
|
sped up scroll bars
|
2014-06-10 13:34:39 -04:00 |
|
Connor Turland
|
b7703e2a0f
|
improved metacode set switcher styling
|
2014-06-10 13:13:21 -04:00 |
|
Connor Turland
|
35985aecaa
|
fixed styling of many of the user forms
|
2014-06-10 12:59:19 -04:00 |
|
Connor Turland
|
f8a8f119aa
|
for stagin
|
2014-06-09 16:38:29 -04:00 |
|
Connor Turland
|
8760cf0280
|
added new images and made realtime send more relevant messages including one when someone turns on realtime
|
2014-06-09 16:37:09 -04:00 |
|
Connor Turland
|
2f969bb29e
|
for staging
|
2014-06-09 13:37:16 -04:00 |
|
Connor Turland
|
31817d31a5
|
closes #202, closes #301, closes #320, closes #337
|
2014-06-09 13:36:23 -04:00 |
|
Connor Turland
|
6f0150cca1
|
switched for production (realtime)
|
2014-06-08 16:27:16 -04:00 |
|
Connor Turland
|
2820f57a9f
|
added metacode background bar set to match metacode color
|
2014-06-08 16:26:25 -04:00 |
|
Connor Turland
|
f30904d828
|
fixed lightbox hiding
|
2014-06-04 16:41:02 -04:00 |
|