Commit graph

868 commits

Author SHA1 Message Date
Connor Turland b163442163 collab compass nowrap 2014-09-24 08:45:46 -04:00
Connor Turland 58ff70717e heroku 2014-09-23 10:37:08 -04:00
Connor Turland dd6a21191a heroku 2014-09-22 23:56:47 -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
Shai Mor 1396b02952 collabCompass img&p for content and styling 2014-09-22 11:44:09 -04:00
Shai Mor d115861584 collabCompass img and p for content and styling 2014-09-22 11:36:53 -04:00
Connor Turland fe1f35d63e Merge pull request #361 from Connoropolous/forgotpass
centered reset password box
2014-09-22 06:28:34 -04:00
Bashar 5e76b44b80 centered reset password box 2014-09-21 20:47:09 -04:00
Bashar Jabbour f0650bb16f Update MacInstallation.md 2014-09-21 19:19:19 -04:00
Bashar Jabbour 069548ef66 Update MacInstallation.md 2014-09-21 19:18:32 -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 ac867d00ab m 2014-09-18 02:39:00 -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 f62ca67d9f prevent self showing up on realtime problem 2014-09-15 22:04:44 -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
Connor Turland 30d82ba870 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new 2014-09-11 08:35:29 -04:00
Connor Turland 90f2477566 fixed map update controller 2014-09-11 08:35:16 -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 4f8a8e2fde for heroku 2014-09-10 15:18:20 -04:00
Connor Turland 3d35d44c3f realtime improvement 2014-09-10 15:17:43 -04:00
Connor Turland ac8c589a77 config for heroku 2014-09-10 15:07:34 -04:00
Connor Turland 28bfb8ac21 better architecture for entering and exiting maps from the home page 2014-09-10 15:06:39 -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 7c6b894888 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new 2014-09-03 19:07:54 -04:00
Connor Turland 901c028d52 configure for heroku 2014-09-03 19:07:45 -04:00
Connor Turland eedd3736cf realtime and filter box styling 2014-09-03 19:05:25 -04:00
Connor Turland b8794a1c59 Update README.md 2014-09-03 12:11:51 -04:00
Connor Turland d8d4a0f967 Create CHANGELOG.md 2014-09-03 12:09:57 -04:00
Connor Turland 8e7d9c80f9 Create CONTRIBUTING.md 2014-09-03 12:02:00 -04:00
Connor Turland 3afb749510 Create MacInstallation.md 2014-09-03 11:41:54 -04:00
Connor Turland 986fb0e22c Update WindowsInstallation.md 2014-09-03 11:40:35 -04:00
Connor Turland a154cb2a45 Update UbuntuInstallation.md 2014-09-03 11:40:08 -04:00
Connor Turland c407341f49 Create WindowsInstallation.md 2014-09-03 11:38:43 -04:00
Connor Turland 78b41760e1 Update UbuntuInstallation.md 2014-09-03 11:31:59 -04:00
Connor Turland c38d627de3 Update and rename Ubuntu README.rdoc to UbuntuInstallation.md 2014-09-03 11:30:29 -04:00
Connor Turland fe77897dc5 Update and rename Metamaps AGPL License.txt to LICENSE 2014-09-03 11:25:18 -04:00
Connor Turland 853c9432d3 Update and rename README.rdoc to README.md 2014-09-03 11:20:16 -04:00
Connor Turland 1ccaccdb32 small css syntax fix 2014-08-26 23:01:08 -04:00