Commit Graph
3764 Commits
Author SHA1 Message Date
Henry Oswald ca8a21c425 change async to series
no real gain from parallel, series might reduce the cpu load if it finds the doc early
2014-11-26 21:53:57 +00:00
Henry Oswald 5e570d52a0 modfied setRootDocAutomatically to work async
was causing cpu to block for along time on big projects
2014-11-26 17:19:21 +00:00
Brian Gough a15ee57d77 working on zoom/fit buttons 2014-11-26 16:52:54 +00:00
Brian Gough 6c1cee1431 save pdf position and scale 2014-11-26 16:18:59 +00:00
Brian Gough 7b66802bf5 set up pdf viewer app in base 2014-11-26 16:18:39 +00:00
Brian Gough d0fb34b2aa Merge branch 'master' into pdfng 2014-11-26 15:42:42 +00:00
Henry Oswald 393a637673 remove a couple of required coffee-scritps which are not required 2014-11-26 15:37:53 +00:00
Henry Oswald 857d867191 added locks into editor controller for new/move/deletes
filesystem import manager uses the unlocked version
2014-11-26 15:32:23 +00:00
Brian Gough 33d94af930 Merge branch 'master' into pdfng 2014-11-26 14:17:02 +00:00
Henry Oswald bd841b4795 coppied the lock manager over from doc updater 2014-11-25 16:52:27 +00:00
Brian Gough 643bda6095 add pdfng module and use it by default 2014-11-25 16:49:09 +00:00
Brian Gough 81b8594944 upgrade pdf.js to v1.0.712 2014-11-25 15:58:01 +00:00
Henry Oswald ba784c3e62 changed swiss franks to show Fr for display issues 2014-11-25 13:18:57 +00:00
Henry Oswald d070c0acd8 fixed SGD collab price 2014-11-25 13:14:38 +00:00
Henry Oswald 3bae278c92 Revert "increased timeout for geoip to 3 seconds"
This reverts commit e4c892b59734a0b6b67ad37a1d09c1618ec389d4.
2014-11-25 13:10:00 +00:00
Henry Oswald d91064a369 increased timeout for geoip to 3 seconds 2014-11-25 11:51:03 +00:00
Henry Oswald dbecadcaea Merge branch 'master' into multicurrency 2014-11-25 11:35:59 +00:00
Henry Oswald dd37436da2 delete old cookie keys 2014-11-25 11:35:46 +00:00
Henry Oswald 02ef07dca4 broken free trial func into own file. added ab test on upgrade button colour 2014-11-24 23:59:55 +00:00
Henry Oswald 6c0f03e9c7 added ab test to show collar plan to people in editor 2014-11-24 16:21:03 +00:00
James Allen afca9ba0cb Fix unit tests 2014-11-24 14:26:51 +00:00
James Allen b8fdbdb406 Handle errors in request pipes 2014-11-24 13:58:41 +00:00
James Allen 970125b7a8 Check for null project in joinProject 2014-11-24 13:43:08 +00:00
James Allen 3578e41c9c Add null check into FileTypeManager isDirectory check 2014-11-24 13:39:07 +00:00
James Allen d4af0fe36d Wrap smoke test in domain to catch errors 2014-11-24 13:36:10 +00:00
James Allen c28e09076b Add missing logger include in smoke test 2014-11-24 13:33:03 +00:00
Henry Oswald a52b91691a Merge branch 'master' into multicurrency 2014-11-21 13:16:29 +00:00
Henry Oswald 6d22bda88f added new currencies removed ab test as well 2014-11-21 13:13:53 +00:00
James Allen 485459c839 Use real-time server for websockets 2014-11-21 12:44:41 +00:00
Henry Oswald 24b3226fcf bump redis version 2014-11-20 12:50:55 +00:00
Henry Oswald 851764f269 bump package.json 2014-11-20 11:10:22 +00:00
Henry Oswald 6c746d9aec added redis health check in 2014-11-19 23:18:20 +00:00
Henry Oswald 458e4335de added a load more currencies 2014-11-19 21:34:13 +00:00
Henry Oswald 57abc2cb24 lock down the version of redis 2014-11-19 16:45:10 +00:00
Henry Oswald 9e63b6c3a1 use redis 0.0.6 2014-11-19 16:41:12 +00:00
Henry Oswald cd8c233c05 Revert robust redis connection code 2014-11-19 15:06:05 +00:00
Henry Oswald dbb1d68b66 added SEK and CAD currencies 2014-11-19 14:52:59 +00:00
James Allen 8b9a26d6f3 Add in http health check end points for redis subscription channels 2014-11-19 14:12:37 +00:00
James Allen 34e20e99f5 Pull redis from github master temporarily 2014-11-19 11:09:59 +00:00
James Allen d6532c63f8 Use new robust subscription model 2014-11-19 11:09:42 +00:00
James Allen 5ec9e587f0 Roll back real-time settings for now 2014-11-19 11:09:32 +00:00
James Allen 22346f5532 Revert "Pull redis from github master temporarily"
This reverts commit 919fbdf8945bdd2cdb5ddda5a7ac8c5b7395597b.
2014-11-18 18:01:58 +00:00
James Allen f8cbc5d51a Pull redis from github master temporarily 2014-11-18 15:55:08 +00:00
Ingolf Becker 9d71073a5c Added more POST declarations 2014-11-17 15:19:11 +00:00
Henry Oswald bb5ec10609 don't try and get angular min map file 2014-11-17 14:55:48 +00:00
Ingolf Becker fd28751db0 Change Login and Register methods to use POST rather than GET 2014-11-17 14:55:28 +00:00
James Allen e559c72491 Connect to configurable websocket service 2014-11-17 13:38:44 +00:00
Henry Oswald 804bc16bc8 redirect users to /register when coming from templates or share url
redirect to /login when going anywhere else (/project /project/1234)
2014-11-13 17:12:39 +00:00
Henry Oswald efe8667e5e changed the top level on bonus 2014-11-13 15:23:13 +00:00
Henry Oswald f5d3801bfb changed findElementByPath to not call cb more than once & deal with nulls 2014-11-11 14:44:44 +00:00