Commit graph

917 commits

Author SHA1 Message Date
Brian Gough
441bc63935 use setTimeout instead of $timeout in pdf scrollhandler 2015-01-20 16:20:38 +00:00
Brian Gough
591498a056 fix dom position calculation in pdf viewer 2015-01-20 16:20:19 +00:00
Brian
53e9086094 remove useless scope.$apply in pdf scrollhandler 2015-01-20 15:37:11 +00:00
Brian
721843695b avoid using jquery in pdf scrollhandler to improve peformance 2015-01-20 15:36:52 +00:00
Brian Gough
96af4e0b4a fix selection of prerender pages in pdf viewer 2015-01-20 14:28:43 +00:00
Brian Gough
f18f862be2 handle different page size in pdf viewer 2015-01-20 14:28:14 +00:00
Brian Gough
c9e019b4a7 clean up calculation of visible pdf pages and display on redraw 2015-01-20 11:06:40 +00:00
metbosch
43d723bcfb Allowed scroll on binary-file container
Set overflow in auto mode to allow large images.
2015-01-19 23:34:49 +01:00
Henry Oswald
90bb12db40 added state to payment form 2015-01-19 20:27:01 +00:00
Brian Gough
776535f9f3 move pdf page visibility calculation up into pdfViewer directive
removes per-page watch for visibility
2015-01-19 16:55:44 +00:00
Brian Gough
2e021b64d8 remove per-page $watch on default page size in pdf viewer 2015-01-19 14:36:20 +00:00
Brian Gough
906c9114cd replace per-page pdf highlight $watch with highlight event 2015-01-19 14:26:14 +00:00
Brian Gough
adab8c6769 delay pdf spinner by 100ms 2015-01-19 14:24:52 +00:00
Henry Oswald
00810eaf21 Merge branch 'recurlyv3' 2015-01-19 13:51:02 +00:00
Brian
06330e6506 add pdfng scroll handler using requestAnimationFrame 2015-01-16 15:51:22 +00:00
Brian Gough
4e31833131 Merge pull request #138 from sharelatex/pdfng-use-browser-fonts
use font-face for pdfjs rendering
2015-01-16 14:31:37 +00:00
Brian Gough
751166d987 Merge branch 'master' into fix-pdfng-progress-bar
Conflicts:
	public/coffee/ide/pdfng/directives/pdfRenderer.coffee
	public/coffee/ide/pdfng/directives/pdfViewer.coffee
2015-01-16 14:19:59 +00:00
Brian Gough
df9cb03dcc Merge pull request #134 from sharelatex/pdfng-reload-on-error
Pdfng reload on error
2015-01-16 14:18:17 +00:00
Brian Gough
d832406923 pdfng: add comment about getDestinations vs getDestination 2015-01-16 12:50:08 +00:00
Henry Oswald
a0f5c09cb9 remove raven source map line 2015-01-15 15:22:45 +00:00
Henry Oswald
f2bc98bc3c Change debuging to stringify messages in exception message 2015-01-15 15:18:15 +00:00
Brian Gough
157424c7b6 use font-face for pdfjs rendering 2015-01-13 16:39:49 +00:00
Brian Gough
8d568d9663 increase pdfng page load/render timeouts to 1 minute 2015-01-13 16:38:40 +00:00
Brian Gough
5e06043fcb add loadedCallback to pdfng, detects when pdf is fully loaded 2015-01-13 16:28:24 +00:00
Brian Gough
953821959d hide progress bar when pdfng has loaded 2015-01-13 16:27:04 +00:00
Brian Gough
1d3d316595 capture all pdfng error callbacks with raven 2015-01-13 15:47:27 +00:00
Brian Gough
823bdcf583 fix scope error in pdf viewer 2015-01-12 17:03:03 +00:00
Brian Gough
887423f8d7 report timeout errors to sentry 2015-01-12 17:02:51 +00:00
Brian Gough
560919b78f avoid exception in pdf viewer
if file was previously bigger, current position could be greater than
the number of pages
2015-01-12 16:47:38 +00:00
Brian Gough
bf8bc27de0 catch errors in pdf viewer and reload if necessary
if more than 3 reloads, display error to the user
2015-01-12 16:46:17 +00:00
Brian Gough
7f750ae692 add an error callback to the pdf renderer
use page load and render timeouts of 30 seconds to detect hanging pages
2015-01-12 16:45:24 +00:00
Henry Oswald
7508ba6c47 improved validation so that fields recurly said are wrong get highlighted 2015-01-07 16:43:20 +00:00
Henry Oswald
f6e9c544e6 slightly improved the breakdown form. Still not very pretty. 2015-01-07 14:59:56 +00:00
James Allen
dd5562f9b6 Send more data to sentry about messages.reverse error 2015-01-07 13:16:38 +00:00
James Allen
10653c12fd Send more data to Sentry to track down error 2015-01-07 13:16:38 +00:00
James Allen
aec80fb1db Include FreeTrialModalControler in main.coffee 2015-01-07 13:16:38 +00:00
Henry Oswald
f9843b3709 tax auto updates on change of address now. Is also preset based on users ip address 2015-01-07 13:16:19 +00:00
Henry Oswald
d678af4417 only validate credit card an cvv if there is data in them 2014-12-28 22:19:15 +00:00
Henry Oswald
735dd0811c changed credit card/paypal logs from offical ones to font very good ones
upgraded fontamerican to 4.2
2014-12-28 22:14:39 +00:00
Henry Oswald
474fa5fe19 only validate expiry when both are set 2014-12-28 21:53:12 +00:00
Henry Oswald
1a4825a47b pulled total price down a little 2014-12-28 19:08:36 +00:00
Henry Oswald
2d03e0532f adjusted style of payment options 2014-12-28 19:04:47 +00:00
Henry Oswald
bd52594f23 added new official paypal logo from https://www.paypal.com/uk/webapps/mpp/logo-center 2014-12-28 18:43:53 +00:00
Henry Oswald
673140b620 got new credit card logos from https://www.mastercardbrandcenter.com/us/getourbrand/index.shtml?pageId=dl_0340&expertVisible=false 2014-12-28 18:35:44 +00:00
Henry Oswald
7f979e77db - fixed new payment page so it uses correct plan and currency
- submit button is disabled while processing
- removed test data
2014-12-28 17:16:21 +00:00
Henry Oswald
ecb71d5bbf pull recurely pub api key from settings file 2014-12-23 12:08:01 +00:00
Henry Oswald
e2819c3bc6 added generic error handling to recurly processing and required fields 2014-12-23 11:04:54 +00:00
Henry Oswald
a7eb836c79 redirect to /thank-you on success and fix broken unit test from a few commits ago 2014-12-22 16:37:09 +00:00
Henry Oswald
d0c9783718 added paypal option in, not tested as we don't have paypal in stag 2014-12-22 15:51:50 +00:00
Henry Oswald
fb0a083b36 added address 2 2014-12-22 15:19:40 +00:00
Henry Oswald
6cedfb19d9 cleaned up form and added basic validation 2014-12-22 15:07:55 +00:00
Henry Oswald
fa1ec44e22 coupons work 2014-12-22 14:06:39 +00:00
Henry Oswald
a47b25d4b2 works with multi plan and currency, auto updates view on change 2014-12-22 12:55:29 +00:00
Henry Oswald
5305cbfd3e got more correct details making it to recurly and improved form. 2014-12-19 11:17:35 +00:00
Henry Oswald
cc545db17b can add account just about into recurly 2014-12-18 18:59:29 +00:00
Henry Oswald
47fb2a0878 basic angular form which has data bound to it 2014-12-18 17:48:23 +00:00
James Allen
2a2dc458e8 Merge pull request #127 from sharelatex/pdfng-server-fixes
pdfng server fixes
2014-12-16 10:30:22 +00:00
James Allen
2819935a52 Add photo of Brian 2014-12-15 15:13:34 +00:00
Brian Gough
660bb75df4 add query string parameters for compileGroup= and pdfng=
compileGroup will  bypass mongo check for compileGroup priority
pdfng will pass pdf Range: headers through from user request to CLSI
2014-12-12 16:47:43 +00:00
Brian Gough
419d84564c add support for client-side error logging using sentry 2014-12-12 13:58:07 +00:00
Brian Gough
724116bcc1 Merge branch 'master' into pdfng 2014-12-10 13:18:02 +00:00
Brian Gough
50e03e93ba poll the element for the pdf viewer if it is zero size
avoid invisible pdf forever waiting for layout-ready event when
switching between full-screen and split-screen
2014-12-09 14:40:54 +00:00
Brian Gough
1acc924e0b comment out console.logs in pdfng 2014-12-09 14:39:58 +00:00
Brian Gough
843fa6f847 handle shutdown of pdf viewer/rendering with destroy method 2014-12-09 13:46:44 +00:00
Brian Gough
b157323eb7 defer loading of pdf destinations until required 2014-12-09 13:45:12 +00:00
Brian Gough
1e2e1ecb9c stream in the whole pdf file after loading the required page 2014-12-09 13:41:49 +00:00
Henry Oswald
268de7d739 make the user.name more robust 2014-12-09 11:11:06 +00:00
Henry Oswald
611916119a changed where online users name logic is so it catches all cases. 2014-12-08 18:56:46 +00:00
James Allen
b94a9aab0d Hide loading bar once loaded enough to render 2014-12-08 17:48:57 +00:00
James Allen
48d4e96221 Remove development styles 2014-12-08 17:39:33 +00:00
James Allen
8c40432e18 Use fixed sized spinner 2014-12-08 17:39:24 +00:00
Brian Gough
63ac1093bc keep pages visible after a recompile until they are ready to rerender 2014-12-08 17:00:43 +00:00
Brian Gough
c3569dd45f add a progress event in the pdfng viewer 2014-12-08 17:00:26 +00:00
Brian Gough
2a66651ec9 flash the pdf controls in pdfng 2014-12-08 15:32:16 +00:00
Brian Gough
863c8b9586 prevent exception when scrolling during rerender in pdfng 2014-12-08 15:32:05 +00:00
Brian Gough
206e7db144 add spinners and classes for feedback on pdfng loading and rendering 2014-12-08 14:46:59 +00:00
Brian Gough
89d63c4f44 handle fullscreen mode in pdfng
default to scale = 1 when containing div size is zero
2014-12-08 10:28:02 +00:00
Brian Gough
0ae83d9be4 rescale pdf on parent size initialisation in addition to resizes 2014-12-05 19:42:16 +00:00
Brian Gough
407cecc0d3 save the pdf state when the directive is destroyed 2014-12-05 19:40:33 +00:00
Brian Gough
5915bfd885 prevent change to navbar url in pdf viewer
return false from pdf <a> click handler
2014-12-05 14:59:00 +00:00
Brian Gough
265ad4439c Merge branch 'master' of github.com:sharelatex/web-sharelatex into pdfng 2014-12-05 14:43:01 +00:00
Brian Gough
1284ce613c support pdf double click 2014-12-05 14:33:06 +00:00
Brian Gough
4c0f3c55d7 clear the pdf renderqueue faster after the initial page has rendered 2014-12-05 12:14:40 +00:00
Brian Gough
7ea20c4266 avoid exception on pdfPage destroy 2014-12-05 12:12:17 +00:00
Brian Gough
c167e86ba5 use timeout instead of requestAnimationFrame in pdf scroll handler
for simplicity as the time delay is large compared with rAF
2014-12-05 12:12:01 +00:00
Henry Oswald
70d0af519b reset project to large state each time 2014-12-05 00:10:46 +00:00
Brian Gough
2074326237 render pdf pages in ascending order, fix bug where pages could be left unrendered 2014-12-04 16:52:11 +00:00
Brian Gough
4faac88065 handle destroy event in pdf page view and remove pending timeouts 2014-12-04 16:50:38 +00:00
Brian Gough
f8c1c5b025 avoid unnecessary retrieval of pdf viewport when rendering 2014-12-04 16:50:00 +00:00
Brian Gough
44057a9632 only check pdf page visibility on scroll every 50ms 2014-12-04 16:49:24 +00:00
Brian Gough
a15a6d877f avoid exception when elements in pdf view have been removed 2014-12-04 16:44:41 +00:00
Brian Gough
ce4fb7ec04 remove the pdf spinner, it causes unwanted reflow/repaint 2014-12-04 16:44:14 +00:00
Brian Gough
05af3573b6 try disabling pdfjs font face usage for performance
each new font face rule causes a full screen repaint
2014-12-03 15:18:58 +00:00
Brian Gough
94448ed447 comment out logs/unused code in pdf viewer 2014-12-02 11:43:14 +00:00
Brian Gough
25521d1a26 insert the pdf text and annotations after the page has been rendered 2014-12-02 11:03:07 +00:00
Brian Gough
7071ee3540 set the size of the pdf container using jquery methods 2014-12-02 11:02:09 +00:00
Brian Gough
85750dfeb6 need to set the height of the container to get the pdf spinner working 2014-12-02 11:01:45 +00:00
Brian Gough
d6e47c2701 display empty div.pdf-canvas element as a blank page while it is being rendered 2014-12-02 11:00:33 +00:00
Brian Gough
f260b141a0 use the current stable version of pdfjs - previously committed HEAD version by accident 2014-12-01 16:27:24 +00:00
Brian Gough
4888ae8766 fix infinite loop in translated coffeescript for pdfng text layer 2014-12-01 16:26:48 +00:00
Brian Gough
440c1d3987 avoid exception 2014-12-01 15:24:19 +00:00
Brian Gough
be91bc2754 disable PDF.js autofetch only when used in new pdf viewer 2014-12-01 14:35:58 +00:00
Brian Gough
25bebe1104 support old and new pdf viewers depending on feature switch 2014-12-01 14:35:12 +00:00
Brian Gough
3c05e032bd rename the new pdf directive to pdfng 2014-12-01 11:46:52 +00:00
Brian Gough
a7f9a68159 removed duplicated pdf controllers 2014-12-01 11:45:56 +00:00
Brian Gough
608e6cd0d9 remove autogenerated file 2014-12-01 10:42:57 +00:00
Brian Gough
ff04e1662a moved new pdf viewer under base App module 2014-12-01 10:42:47 +00:00
Brian Gough
175de30967 Merge branch 'master' into pdfng 2014-12-01 10:09:04 +00:00
Brian Gough
57b09e1d60 started making pdf viewer conditional - work in progress 2014-11-28 16:59:39 +00:00
Brian Gough
57f4177f30 added pdfjs-1.0.712 in a subdirectory 2014-11-28 16:01:14 +00:00
Brian Gough
f09807cf33 Revert "upgrade pdf.js to v1.0.712"
This reverts commit 1ace92f67d91395d047281047be2f0cff5ea7848.
2014-11-28 15:25:29 +00:00
Brian Gough
d8e07731e0 clean up unnecessary redraws 2014-11-28 15:08:24 +00:00
Brian Gough
7485b564bc fix off by one error in viewport retrieval 2014-11-28 14:39:17 +00:00
Brian Gough
23011cf221 convert page indices from 1-based to 0-based to match pdfListView positions 2014-11-28 14:34:05 +00:00
James Allen
175dfae085 Look up compile group and features from project owner, not current user 2014-11-28 14:26:21 +00:00
James Allen
2c5f3c728c Highlight \vref like \ref 2014-11-28 13:58:27 +00:00
James Allen
dbd7b95823 Close spell check menu on scroll so it doesn't appear in the wrong position 2014-11-28 13:27:25 +00:00
Brian Gough
f914c75712 highlights working for moving to position in pdf from source 2014-11-28 11:57:23 +00:00
Brian Gough
ea310f0248 highlights/dblclick in pdfng - work in progress 2014-11-27 16:58:38 +00:00
Henry Oswald
fa755c6521 added project to long check from clsi2 (bit of a punt) 2014-11-27 15:42:37 +00:00
Brian Gough
3694bea956 use margin for height/width in pdfng 2014-11-27 14:16:32 +00:00
Brian Gough
b8377bca7b fix offset calculation to match pdflistview 2014-11-27 13:46:22 +00:00
Brian Gough
7b4ca6501b update the margin size of pdfng 2014-11-27 13:42:05 +00:00
Brian Gough
21e5fb08cd replicate the pdflistview classes in pdfng viewer 2014-11-27 13:41:48 +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
33d94af930 Merge branch 'master' into pdfng 2014-11-26 14:17:02 +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
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
Henry Oswald
6d22bda88f added new currencies removed ab test as well 2014-11-21 13:13:53 +00:00
Henry Oswald
458e4335de added a load more currencies 2014-11-19 21:34:13 +00:00
Henry Oswald
dbb1d68b66 added SEK and CAD currencies 2014-11-19 14:52:59 +00:00
Henry Oswald
bb5ec10609 don't try and get angular min map file 2014-11-17 14:55:48 +00:00
James Allen
e559c72491 Connect to configurable websocket service 2014-11-17 13:38:44 +00:00
James Allen
f7e6b24ff6 Save template description on modal close 2014-11-07 10:26:09 +00:00
James Allen
a59a2dcf39 Make sure to send description before publishing 2014-11-07 10:20:29 +00:00
James Allen
c9e5583394 Use local versions of jquery and angular 2014-11-07 09:49:30 +00:00
James Allen
d27af25bc9 Convert template publishing to use HTTP end points 2014-11-06 14:39:40 +00:00
James Allen
7b6ec86cef Access Dropbox status via HTTP end points 2014-11-06 14:39:40 +00:00
James Allen
5c3e8e6d88 Add and remove collaborators with HTTP requests, not websockets 2014-11-06 14:39:40 +00:00
Henry Oswald
a2f99bc04f prevent spell check from running twice on doc load 2014-11-04 14:20:59 +00:00
Henry Oswald
908926a0cc compiled pdf.worker with closure compiler manually 2014-11-04 12:44:45 +00:00
Henry Oswald
05a872763e revert updated pdf worker and don't minify it
This reverts commit ffbf6f052f1800b55c7636a98e4f16fdf629c376.
2014-11-04 12:16:06 +00:00
Henry Oswald
be6f0c1ad7 updated pdf worker 2014-11-04 12:10:21 +00:00
Henry Oswald
ccae47979f added chinese flags under cn 2014-10-31 13:21:04 +00:00
Henry Oswald
4f590d7acb added chinese flags in 2014-10-30 11:52:45 +00:00
Henry Oswald
14d32af6bf allow ace to scoll off screen 2014-10-30 08:33:54 +00:00
James Allen
2a69e185ce Append spell check menu to body so it isn't hidden by PDF view resizer 2014-10-27 14:51:28 +00:00
James Allen
184189fa3f Disable hotkeys for layout panels since they interfere with text editing 2014-10-27 14:47:06 +00:00
James Allen
2debba6bbc Update PGP key 2014-10-24 11:55:30 +01:00
Henry Oswald
0f8519f619 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2014-10-21 14:57:52 +01:00
Henry Oswald
c60f11519f added ga logging of starting free trial again 2014-10-21 14:06:53 +01:00
Henry Oswald
8097e6ad71 made 7 day free trial the default 2014-10-21 13:48:46 +01:00
James Allen
281c4eb4e3 Style tweaks for uni site 2014-10-21 13:39:47 +01:00
Henry Oswald
3cf64ce34f pass new compile features to client side, don't show timeout upgrade for premium users 2014-10-20 12:21:40 +01:00
James Allen
9f1a7c7396 Send source of update to doc updater and allow external updates to be ignored in UI 2014-10-16 11:27:10 +01:00
Henry Oswald
750b050358 added ab test in for multi currency 2014-10-15 16:21:45 +01:00
James Allen
64fe2a2404 Improve CSS and layout of feature list on new subscription page 2014-10-15 10:22:03 +01:00
James Allen
b32375530c Refactor card css for use in new subscription page 2014-10-14 15:46:44 +01:00
Henry Oswald
3382c5bb17 added blurb to payment page 2014-10-13 17:51:59 +01:00
Henry Oswald
52c54e7300 added ability to change currency on payment page 2014-10-13 17:28:00 +01:00
Henry Oswald
2bbdea3433 renamed change currency function and sorted out recommended currency 2014-10-13 16:27:27 +01:00
Henry Oswald
f55ef2f1b4 made what is returned for multi currency more explicit 2014-10-13 16:13:31 +01:00
Henry Oswald
36264706f6 hooked the plans page up to the geo ip lookup 2014-10-13 14:10:15 +01:00
James Allen
a8afe3a0d7 Improve file uploader CSS 2014-10-10 13:40:00 +01:00
James Allen
bc94ea56cb Add projects to tag after creating the tag 2014-10-09 08:39:15 +01:00
Henry Oswald
1f5d7ee6a8 Merge pull request #116 from mickaobrien/keyboard-shortcuts
Added keyboard shortcuts to bold and italicise text
2014-10-08 16:56:03 +01:00
James Allen
7258fadd17 Improve styling of plan name and price on subscription form 2014-10-08 16:52:37 +01:00
Mick O'Brien
834e27f3c5 Fix indentation in italics shortcut 2014-10-08 16:34:44 +01:00
James Allen
696e8d24e1 Fix z index of more updates buttons 2014-10-08 16:32:42 +01:00
Mick O'Brien
b7db72e574 Replace $isEmpty check 2014-10-08 16:17:38 +01:00
Mick O'Brien
72fc630e81 Added keyboard shortcuts to bold and italicise text 2014-10-08 15:44:01 +01:00
James Allen
128c672edd Merge branch 'github-sync'
Conflicts:
	package.json
2014-10-08 12:13:37 +01:00
Henry Oswald
28b1e6bfe5 added client side checks on how long project or entity names can be
150 chars should be safely under the 1024 bytes mongo index limit
2014-10-07 11:08:08 +01:00
James Allen
10732d112d Hook module system into project list page 2014-10-03 11:32:59 +01:00
Henry Oswald
ab46d6ec1a 30 != 7 days 2014-09-26 11:33:34 +01:00
Henry Oswald
b1562984c0 added tr flag 2014-09-26 11:25:29 +01:00
Henry Oswald
21f46da08a changed ab test from 30 -> 14 to 14 -> 7 2014-09-26 10:56:45 +01:00
Henry Oswald
d961b48857 imporved logging for session debug 2014-09-10 08:20:36 +01:00
Henry Oswald
50ee889569 fixed template search, ng-controller was too deep 2014-09-09 16:51:52 +01:00
Henry Oswald
187e87a978 disabled euro and pounds for the moment 2014-09-08 17:45:03 +01:00
James Allen
e973a66482 Allow client side module code injection 2014-09-08 17:33:30 +01:00
Henry Oswald
f1372fc449 moved button, not that pretty 2014-09-05 16:11:19 +01:00
Henry Oswald
ff0365c157 change plan has multi currency view 2014-09-05 15:47:08 +01:00
Henry Oswald
eeb27062a0 added currency query string param to subscribe button 2014-09-05 11:40:14 +01:00
Henry Oswald
13a667f47a v1 of multi currency 2014-09-04 19:03:04 +01:00
Henry Oswald
69eafd2a74 added more console .logs 2014-09-02 14:03:31 +01:00
Henry Oswald
137cffabec added some console.logs in 2014-09-02 13:54:09 +01:00
Henry Oswald
7fc0388003 fixed case sensitivity 2014-09-02 13:19:59 +01:00
Henry Oswald
75e570c076 fix ab cookies and send 0 event when clicking monthly free trial button on plans page 2014-09-02 11:07:21 +01:00
Henry Oswald
f25dba10ea changed label to send to GA 2014-09-02 10:47:58 +01:00
Henry Oswald
326900c467 broke project-list file down into more digestable chunks 2014-09-01 18:05:51 +01:00
Henry Oswald
54b9cdc3e4 new ab framework up and running 2014-09-01 17:48:09 +01:00
Henry Oswald
62f207c368 added basic new a/b test funnely framework 2014-09-01 15:14:08 +01:00