Граф коммитов

178 Коммитов

Автор SHA1 Сообщение Дата
Andrew Sliwinski 5092290fa5 Merge pull request #499 from flukeout/backFix
Back button goes back to proper place from Editor screen
2014-11-14 10:29:36 -05:00
Luke Pacholski 13f88d548c Storing enteredEditorFrom as a path now 2014-11-13 14:56:22 +01:00
Andrew Sliwinski 73a1922ee9 Resolved remaining minor lint errors in components & views 2014-11-12 18:25:20 -05:00
Andrew Sliwinski 3041c48f4e Merge from upstream 2014-11-12 12:12:52 -08:00
Luke Pacholski a5810c0b97 Back button fixes for editor 2014-11-12 20:41:34 +01:00
Kate Hudson e06701c890 jscs errors 2014-11-06 19:06:44 -05:00
Andrew Sliwinski adb319c2be Resolve merge conflict in package.json 2014-11-06 15:19:13 -08:00
Kate Hudson 550432ea37 error handling login 2014-11-06 12:35:49 -05:00
Andrew Sliwinski 917470ad26 Fix indent in package.json 2014-11-05 09:31:09 -08:00
Andrew Sliwinski 9b3ffa35cd Merge branch 'master' of git://github.com/InTradeSysTeam/webmaker-app into data 2014-11-04 16:35:54 -08:00
Kate Hudson 80dd33f96d [fix #453] Disable install button, add share 2014-11-04 14:16:49 -05:00
David Humphrey (:humph) david.humphrey@senecacollege.ca 569788e1c4 Fix #439 - add .jshintrc, make jshint failures fatal, fix current issues 2014-10-30 14:35:23 -04:00
Timm Haucke ce4fb2827c add a basic animated loading indicator component 2014-10-28 16:12:05 +01:00
Timm Haucke 8e9d00a07f [#160,161]clean up html and vertical align the "no-data-available" hint and the loading indicator vertically 2014-10-28 16:10:45 +01:00
Timm Haucke 131781d55d [#161]change to reset initialDataLoaded when ready 2014-10-28 16:05:10 +01:00
Tim 9e7e000b1e added delete function to data layer 2014-10-24 18:20:47 +02:00
Timm Haucke 4b6974909f Merge branch 'master' of github.com:InTradeSysTeam/webmaker-app 2014-10-24 17:52:01 +02:00
Timm Haucke 7402125eba [#161]add basic loading indicator component and include it in the data view 2014-10-24 17:50:28 +02:00
Tim 7910aaafa2 added firebase to data brick 2014-10-24 17:23:46 +02:00
Tim b2b28cf349 added firebase to data layer 2014-10-24 17:01:45 +02:00
Timm Haucke 6137aa0b1d fix dataRepresentations action button positioning 2014-10-24 15:46:08 +02:00
Timm Haucke fb85624654 remove unnecessary keyframes and animations 2014-10-24 15:13:04 +02:00
Timm Haucke 437c726fec remove less variable 2014-10-24 13:56:49 +02:00
Timm Haucke fbac7a666b [#218]add vendor prefixes for webkit browsers ;( 2014-10-24 12:43:13 +02:00
Timm Haucke f6baf5894d [#218]make remove tips and their animations prettier 2014-10-24 12:31:07 +02:00
Timm Haucke 76f0615509 replace missing variable 2014-10-24 11:45:51 +02:00
Tim 4d34c8a5cc merge upstream/master 2014-10-24 11:30:45 +02:00
Kate Hudson 9e60259911 lint 2014-10-24 01:16:40 -04:00
Kate Hudson 19c5c4c20e install to homescreen in publishing 2014-10-24 01:14:44 -04:00
Kate Hudson dec4f3c945 Use back and publish on edit/play instead of done/cancel 2014-10-24 00:06:07 -04:00
Kate Hudson 9b0f38fef9 disable done if conditions not met 2014-10-23 23:29:37 -04:00
Kate Hudson c060bc304b Fixed some issues with assertions timing out 2014-10-23 22:15:26 -04:00
Kate Hudson 6b62f6f276 abstract createApp 2014-10-23 19:41:48 -04:00
Kate Hudson 11559a8600 App cell truncating and centering 2014-10-23 19:41:48 -04:00
Kate Hudson 0d8690f859 Merge pull request #408 from flukeout/editMode
Picking a template lands you on /edit view instead of /play
2014-10-23 12:54:55 -04:00
Tim f7b21a27fe fixed bug in list-editor
fixed bug which cause display issues when adding elements after an
empty element
2014-10-23 14:54:26 +02:00
Tim 3ead1e843f fixed height of data view 2014-10-23 14:05:12 +02:00
Luke Pacholski 34f8c0bd2d Picking a template lands you on /edit view instead of /play 2014-10-23 12:23:14 +01:00
Tim 6b055ee0a4 Merge remote-tracking branch 'upstream/master' 2014-10-23 11:19:37 +02:00
Andrew Sliwinski 2103664081 Fix alignment of 'bigButton' in tab bar 2014-10-23 02:30:59 +01:00
Kate Hudson 521dad5fe1 Merge pull request #399 from kevin000/issue#394
issue#394 - resolve issue#394's 1&2 ticket
2014-10-22 17:26:22 -04:00
Kate Hudson edef0891aa [#402] Improved jittery scroll 2014-10-22 16:17:22 -04:00
Shuming Lin 316e118416 issue#394 - resolve issue#394's 1&2 ticket 2014-10-22 15:30:09 -04:00
Luke Pacholski d66543d55d Templates page fixes from QA ticket 2014-10-22 19:22:02 +01:00
Tim d01c7ebf9c added element to show that there is no data avaiable 2014-10-22 18:56:50 +02:00
Timm Haucke ed55817190 change the remove tips in the list editor to use font awesome and adjust the general tips style accordingly 2014-10-22 18:22:49 +02:00
Timm Haucke 9c6a577560 fix switch and table spacing in dataRepresentation component 2014-10-22 18:11:22 +02:00
Timm Haucke acf70920d1 [#161]add switch to select how to sort the data 2014-10-22 18:02:57 +02:00
Timm Haucke 9bf5937a9c fix and complete computed properties, adjust the select tips to use font awesome css classes and adjust the "remove-button" to act also as a share button 2014-10-22 17:52:27 +02:00
Tim 64c37f9908 Merge remote-tracking branch 'upstream/master'
Conflicts (resolved):
	lib/view.js
	static/styles/common.less
2014-10-22 11:43:18 +02:00