Commit Graph

690 Commits

Author SHA1 Message Date
Julian Descottes
d909cec19d Merge pull request #126 from juliandescottes/add-grunt-task-webserver
Add grunt task webserver
2013-08-11 22:34:35 -07:00
jdescottes
628fd1625b Merge branch 'master' into feature-gif-export-panel 2013-08-12 07:32:04 +02:00
jdescottes
73b98850db Added cheap lazy templates + logic to switch between setting controllers 2013-08-12 07:31:09 +02:00
grosbouddha
b4d52cfca8 Merge pull request #125 from juliandescottes/propose-use-iframe-cheap-templates
Propose use iframe cheap templates
2013-08-11 14:47:04 -07:00
grosbouddha
879358fae4 Merge pull request #117 from juliandescottes/minify-statics
Added concat and uglify tasks to grunt.
2013-08-11 14:39:33 -07:00
Julian Descottes
5be8f7e7fb Merge pull request #121 from juliandescottes/enhance-gif-encoding-with-gif.js
Enhance gif encoding with gif.js
2013-08-11 11:55:44 -07:00
jdescottes
d8d6f27462 New grunt task : serve 2013-08-11 20:51:04 +02:00
jdescottes
03711869cd removed useless mongoose exe 2013-08-11 20:30:19 +02:00
jdescottes
6a5b3b6849 updating smoke test to parametrize delay 2013-08-11 20:09:43 +02:00
jdescottes
b3953ea9db adding precommit hook to source control 2013-08-11 20:07:45 +02:00
jdescottes
fd2907cfde Testing pre-commit hook 2013-08-11 13:37:23 +02:00
jdescottes
2e3ddd6ed1 Updating list name in index.html as well. Also fixed indentation in smoke_test.js 2013-08-11 10:45:56 +02:00
jdescottes
750f2fb7b5 darn it man, forgot to update Gruntfile.js with the new script list filename. 2013-08-11 10:31:24 +02:00
jdescottes
9ef22f646e removed renamed script-load-list.js and rolled back useless change in js/Constants.js 2013-08-11 10:04:35 +02:00
jdescottes
2299f35977 Introducing iframe based templates 2013-08-11 01:26:38 +02:00
jdescottes
36c247cb04 Worker blob loader is not working on IE ... 2013-08-11 01:25:18 +02:00
jdescottes
e6080c781b Preload worker in a blob to avoid any subsequent call to server 2013-08-10 18:06:57 +02:00
jdescottes
39287e3400 Switched to gif.js library. It's awesome 1 2013-08-10 17:35:36 +02:00
jdescottes
c23de31e07 Merge from master + bugfixing on b64 2013-08-10 14:47:26 +02:00
Julian Descottes
509571314a Merge pull request #118 from juliandescottes/fix-size-bugs
Fixed size related issues. Selection Manager no longer depends on the fr...
2013-08-10 05:30:12 -07:00
jdescottes
f468790baa Merge from master + added more jshint checks (undef and latedef). Very helpful to catch post merge issues. 2013-08-10 14:28:10 +02:00
grosbouddha
0c2cdc02ae Merge pull request #120 from juliandescottes/add-grunt-leading-indent
Dev environment:force indentation to 2 spaces.
2013-08-10 03:23:28 -07:00
jdescottes
87a68bfe21 Dev environment:force indentation to 2 spaces. Added new grunt module, grunt-leading-indent to check space consistency, and modified jshint options to enforce 2 spaces 2013-08-10 12:11:16 +02:00
jdescottes
dc557bdba8 Fixed png preview orientation when saving 2013-08-06 23:38:56 +02:00
jdescottes
2deaf00911 Additional fix to be inline with what APP Engine expects 2013-08-05 23:57:51 +02:00
jdescottes
21172249a3 Added fix for PreviewFilmController for very big piskels : limit DPI to 1 2013-08-05 23:55:19 +02:00
jdescottes
1977141076 Fixed size related issues. Selection Manager no longer depends on the frameoverlay which is now only manipulated by the tools 2013-08-05 23:34:11 +02:00
jdescottes
b42f896584 Adaptations for APP Engine compatibility 2013-08-04 22:15:45 +02:00
jdescottes
02e261880a Removing built files again 2013-08-04 21:55:47 +02:00
jdescottes
f89cb8146d Trying to get the travis build to pass 2013-08-04 21:47:17 +02:00
jdescottes
54ea427dce Trying to get the travis build to pass 2013-08-04 21:37:07 +02:00
jdescottes
a16e1bab09 added Function.prototype.bind polyfill for PhantomJS. Make Casper happy. 2013-08-04 21:20:25 +02:00
jdescottes
8acd91b4d9 updated smoke test URL to point to debug version 2013-08-04 18:36:43 +02:00
jdescottes
91bacd1dd9 Added concat and uglify tasks to grunt. Piskel on master will only be able to work in debug mode, by passing ?debug in URL. The minified version is built in /build, which has been added to .gitignore 2013-08-04 18:27:32 +02:00
grosbouddha
9a68da8bda Merge pull request #116 from juliandescottes/merge-piskelapp-changes
Merge piskelapp changes
2013-07-18 16:39:38 -07:00
jdescottes
218dbbc8b9 put appEngineToken on pskl namespace, fix private convention 2013-07-19 00:37:47 +02:00
jdescottes
e7ef8fbf5a Rolled back too many changes. some piskel.something managed to creep back in 2013-07-14 23:36:31 +02:00
jdescottes
023f9332cd added empty readonly name field to index.html for consistency 2013-07-14 23:25:12 +02:00
jdescottes
4e1deee851 Reintegrating css changes from master 2013-07-14 23:18:03 +02:00
jdescottes
032c8c4485 Added logic to switch behavior between appengine and static mode. Removed piskel on window in favor of pskl.app 2013-07-14 23:04:42 +02:00
grosbouddha
bb1672f6ab Merge pull request #115 from juliandescottes/fix-sticky-panels-renard-de-feu
Fix right sticky panels on Firefox
2013-06-23 06:57:10 -07:00
Vince
3cd2cb1c63 Fix slightly overflowing drawer (on the screen right edge) 2013-06-23 14:46:25 +02:00
Vince
e1e7dbf2e1 Fix right sticky panel on FF
width can't be force on a display:table element in firefox.
I added a level of wrappers to workaround.
2013-06-23 14:42:12 +02:00
Julian Descottes
66d19cf9ca Merge pull request #112 from juliandescottes/fix-canvas-size-with-grid
Fix canvas size when grid display is active
2013-06-19 22:23:55 -07:00
grosbouddha
f5335a6867 Merge pull request #113 from juliandescottes/fix-addframe-button-sortable
Exclude add-frame-button from sortable items in preview-film
2013-06-19 16:57:00 -07:00
jdescottes
a01afe2cfd Changed sortable items selector to a more robust one 2013-06-20 00:32:53 +02:00
jdescottes
07ced5a3b2 Exclude add-frame-button from sortable items in preview-film 2013-06-20 00:05:23 +02:00
Vince
4618cb643a Fix canvas size when grid display is active
- Dynamic resizing of canvas when display_grid is activated/deactivated
 - Adding a main-wrapper to get a perfect alignement at the top and
bottom the application screen
 - fix DPI update on page load (independent of grid option).
 - fix available width for DPI calculation (using margin-box, was using
only content before)
2013-06-19 19:01:12 +02:00
jdescottes
6cb145ae34 Merge branch 'master' into user-settings 2013-06-19 07:38:13 +02:00
Vince
7bbcbe1861 Review comments 2013-06-19 01:51:53 +02:00