100 Commits
Author SHA1 Message Date
Georg Fischer 7abe5438af Merge branch 'master' of github.com:snorpey/jpg-glitch 2016-10-01 12:57:35 +02:00
Georg Fischer 49a68b25c0 Merge branch 'storagemodel-error' 2016-10-01 12:57:09 +02:00
Georg Fischer 60cc31f83a small fix for wrong event name in storage model 2016-10-01 12:56:43 +02:00
georg fischerandGitHub f77b131ee9 Merge pull request #20 from snorpey/npm-scripts
add npm script support
2016-08-30 21:50:26 +02:00
Georg Fischer ec96e8335b add npm script support, update readme accordingly, update grund dependencies 2016-08-30 21:48:44 +02:00
Georg Fischer 7aee649e73 fix links in readme 2016-08-10 21:05:27 +02:00
Georg Fischer 086145cfc3 fix german language issue 2016-08-10 21:01:29 +02:00
Georg Fischer c243a635b1 Merge branch 'small-updates' 2016-08-10 20:55:01 +02:00
Georg Fischer 2f4b2cb496 update swipe threshold 2016-08-10 20:54:39 +02:00
Georg Fischer aed8bc7702 add tap highlight color 2016-08-10 20:45:13 +02:00
Georg Fischer ae4c87659c switch info and settings in nav 2016-08-10 20:40:42 +02:00
Georg Fischer 46cbcaa88e add download button to workspace 2016-08-10 20:39:23 +02:00
Georg Fischer 53a7f7a49a close webcam if users don't allow access 2016-08-10 20:12:44 +02:00
Georg Fischer 1a291349ac increase button size on touch devices
reorder share links
update imgur url
2016-08-10 20:06:55 +02:00
Georg Fischer 4828465c96 Merge branch 'bugfixes' 2016-08-09 21:50:54 +02:00
Georg Fischer 79574a3054 remove obsolete comment 2016-08-09 21:49:01 +02:00
Georg Fischer 0dd7b07ed6 fix overflow issue on edge 2016-08-09 21:43:40 +02:00
Georg Fischer 851aca495f fix setting dropdown size 2016-08-09 21:35:39 +02:00
Georg Fischer 61c9ad1f0e fix video size 2016-08-09 21:31:47 +02:00
Georg Fischer af2fe6ae6f mobile devices sometimes don't like autplaying video 2016-08-09 21:31:25 +02:00
Georg Fischer dab1a79fbb Merge branch 'css-fixes-2' 2016-08-08 21:17:30 +02:00
Georg Fischer b9fd0c75ec fix css input styles 2016-08-08 21:17:11 +02:00
Georg Fischer 62003a985f Merge branch 'css-fixes' 2016-08-08 20:22:02 +02:00
Georg Fischer 307ec7b542 fix webkit input styles 2016-08-08 20:20:30 +02:00
Georg Fischer 9296bb6a63 remove https check in javascript (github now allows to enforce https for gh-pages) 2016-06-11 11:25:00 +02:00
Georg Fischer 0845ca605a Merge branch 'translation-fix' 2016-06-11 10:33:33 +02:00
Georg Fischer d9b84bd064 update russian translation, as suggested by @STRIXVERDEN 2016-06-11 10:29:36 +02:00
georg fischer 11a5de510e Merge pull request #10 from iblech/patch-2
correct tiny typo
2016-04-06 12:27:01 +02:00
Georg Fischer 433070b103 update randomize button string in russian translation file 2016-01-14 14:30:32 +01:00
Georg Fischer d16796d0d9 whitespace 2016-01-13 17:39:08 +01:00
Georg Fischer 6e19a1030f set empty string default value 2016-01-13 17:38:56 +01:00
Georg Fischer 9e04379d9c update settings object merging 2016-01-13 17:09:54 +01:00
Georg Fischer a6ba156c38 increase indicator message display time 2016-01-13 14:38:00 +01:00
Georg Fischer 4f03e1ae46 delete WIP translation tool 2016-01-13 14:34:41 +01:00
Georg Fischer 74545db760 don't ask for translations because of missing translation tool 2016-01-13 14:34:29 +01:00
Georg Fischer 3ec6a6b64e add russian translation, translate share strings, add share to
vkontakte and update styles to account for longer texts
2016-01-13 14:32:49 +01:00
Georg Fischer eda5d0b20f split long texts in translation file into smaller chunks 2016-01-11 15:36:44 +01:00
Georg Fischer aeeaf34c49 add hint to translation tool for users with unsupported language 2016-01-06 22:00:54 +01:00
Georg Fischer fe4e5aa639 update translator styles episode ii 2016-01-06 20:27:23 +01:00
Georg Fischer 1661fb91e2 update translator styles 2016-01-06 20:24:52 +01:00
Georg Fischer 4d5fb06edc don't always hide complete button 2016-01-06 20:22:34 +01:00
Georg Fischer ec507c0006 fix translator issue 2016-01-06 20:04:51 +01:00
Georg Fischer c38482f60a add en-gb to available languages 2016-01-06 19:43:34 +01:00
Georg Fischer f361667dd9 improve language detection 2016-01-06 19:41:43 +01:00
Georg Fischer 313976e4b8 update some translator styles 2016-01-06 19:40:52 +01:00
Georg Fischer fb4147092e translation tool, send available languages in debug mode 2016-01-06 19:22:45 +01:00
Georg Fischer 1715e9ec9a update translation files, add en-GB 2016-01-02 13:26:55 +01:00
Georg Fischer 437052b318 add translation tool 2016-01-02 13:26:33 +01:00
Georg Fischer e1fcddaca7 fix typo 2015-12-31 16:54:56 +01:00
Georg Fischer c541c2aa46 typo 2015-12-30 18:20:44 +01:00
Georg Fischer 79b18e0899 Merge branch 'loading' 2015-12-30 15:21:54 +01:00
Georg Fischer 170951164b save and load language data to/from localstorage for faster load time
the second time around.
2015-12-30 15:20:38 +01:00
Georg Fischer 39a4d99aad load localforage key from config instead of passing it as an argument 2015-12-30 15:20:01 +01:00
Georg Fischer 14ec6fbd1c add localforage keys to config 2015-12-30 15:19:23 +01:00
Georg Fischer 2b1229227e fix language name in de-de 2015-12-30 15:18:48 +01:00
Georg Fischer f87c868135 move functions 2015-12-30 13:38:59 +01:00
Georg Fischer dc6a29e64e remove debug code 2015-12-30 13:38:34 +01:00
Georg Fischer dbef3acce6 rename var 2015-12-30 10:44:14 +01:00
Georg Fischer a54a42950e hide loader after language was updated 2015-12-30 10:43:58 +01:00
Georg Fischer 6828476874 Merge branch 'develop' 2015-12-23 23:29:16 +01:00
Georg Fischer ecb5d4b097 move favicon 2015-12-23 23:23:47 +01:00
Georg Fischer 2edd3e37b3 add gitignore and license to gruntfile 2015-12-23 23:18:55 +01:00
Georg Fischer 9f723a45ee Merge branch 'update' into develop 2015-12-23 23:09:43 +01:00
Georg Fischer f2e76ee1f3 update interface (fixes issue #6) 2015-12-23 23:09:12 +01:00
Georg Fischer af20f1e045 update glitch-canvas library 2015-01-23 00:51:26 +01:00
Georg Fischer 57775a7134 add webcam support 2014-12-14 18:12:48 +01:00
Georg Fischer 5922e2bea0 https 2014-09-23 20:55:42 +02:00
Georg Fischer 45373c0130 remove empty href attribute (thanks to @mc10 for pointing this out) 2014-09-23 20:53:02 +02:00
Georg Fischer 6b2229bbef Merge branch 'internetexplorer' into develop 2014-06-19 13:09:26 +02:00
Georg Fischer 98b1bef7b5 add some conditional classes and behaviour for internet explorer 2014-06-19 13:07:41 +02:00
Georg Fischer f476b76fc2 update readme 2014-04-11 21:54:15 +02:00
Georg Fischer a140553c7e use glitch-canvas as dependency since it is a separate library now 2014-04-11 21:34:16 +02:00
Georg Fischer 2e0baf1c1d update sharing links to close upon changing the controls, as rquested
by @andsynchrony
2014-04-11 21:26:50 +02:00
Georg Fischer 7610043997 Merge branch 'fixes' into develop 2013-12-16 15:43:29 +01:00
Georg Fischer 320950bacb fix intro closed intro position 2013-12-16 15:42:19 +01:00
Georg Fischer 3cdcf52f70 fix a download file name bug 2013-12-16 15:37:38 +01:00
Georg Fischer 41cff2c374 merge 2013-12-16 15:25:23 +01:00
Georg Fischer 471ce7703a update default image name 2013-12-16 15:11:12 +01:00
Georg Fischer cafb3cfcc2 change initialisation order 2013-12-16 15:10:27 +01:00
Georg Fischer 27c73b1d20 add 'glitched' to downloaded file name 2013-12-16 15:09:24 +01:00
Georg Fischer 06ea78b0d8 store name of uploaded file 2013-12-16 15:08:38 +01:00
Georg Fischer d4108d5bc2 Merge branch 'download-name' into develop 2013-12-15 20:26:03 +01:00
Georg Fischer 2e4e510341 include used options to file name. 2013-12-15 20:25:46 +01:00
Georg Fischer a2917280a9 Merge branch 'fixes' into develop 2013-11-30 20:37:34 +01:00
Georg Fischer 2a8d83252c remove obsolete comments and path variable 2013-11-30 20:37:15 +01:00
Georg Fischer 7b8087ac97 whitespace 2013-11-30 20:36:47 +01:00
Georg Fischer 0f70f6afa8 Merge branch 'changes' into develop 2013-11-30 01:09:30 +01:00
Georg Fischer 754e827a11 update index copy 2013-11-30 01:08:28 +01:00
Georg Fischer 181715935e update readme 2013-11-30 01:08:15 +01:00
Georg Fischer 40e3a6e8f4 fix imgur button 2013-11-30 00:53:29 +01:00
Georg Fischer 71241a9beb Merge branch 'fixes' into develop 2013-11-29 22:21:36 +01:00
Georg Fischer 15aea7c04d add some responsive button margin 2013-11-29 22:21:22 +01:00
Georg Fischer 48770b9021 Merge branch 'ui' into develop 2013-11-29 22:18:28 +01:00
Georg Fischer e14be9efdc remove hardcoded image url from script 2013-11-29 22:17:18 +01:00
Georg Fischer 67487ed7be ipdate intro button 2013-11-29 22:16:50 +01:00
Georg Fischer 2810d7ac76 update ui;
add open and close button to ui;
close intro when new image is uploaded;
2013-11-29 22:09:10 +01:00
Georg Fischer 6a1f4fda80 update user interface 2013-11-29 22:00:59 +01:00
Georg Fischer ee7a681d61 Merge branch 'readme' into develop 2013-11-27 22:30:26 +01:00
Georg Fischer f9f7d01763 update readme with link to glitch library 2013-11-27 22:30:00 +01:00
Georg Fischer 79d6c9fc8d Merge branch 'fixes' into develop 2013-11-02 13:03:04 +01:00