github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity
2894 commits 3 branches 7 tags 206 MiB
Commit graph

951 commits

Author SHA1 Message Date
Henry Oswald
5a15e826a7 moved mathjax to be served locally 2015-01-29 18:29:53 +00:00
James Allen
3731c62e17 Get validation working with address fields and Angular digest loop 2015-01-29 14:22:57 +00:00
James Allen
2a78a7843a Allow subscriptions with no free plans, and adjust styles 2015-01-29 14:11:25 +00:00
Henry Oswald
b06c9f509e if chat errors don't keep trying to get more chat messages 
causes loop which is why we have so many sentury errors
 2015-01-26 15:36:34 +00:00
Henry Oswald
90bb12db40 added state to payment form 2015-01-19 20:27:01 +00:00
Henry Oswald
208dfea5c8 pull right the total prices on the payment page 2015-01-19 15:35:05 +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
Henry Oswald
5d6a96ba4f made form thinner 2015-01-07 14:51:54 +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
1716b16fb0 added placeholder info to address 2014-12-28 22:03:12 +00:00
Henry Oswald
afab06bcac removed safe message from payment form. 2014-12-28 21:56:17 +00:00
Henry Oswald
1a4825a47b pulled total price down a little 2014-12-28 19:08:36 +00:00
Henry Oswald
0efb1bba5b adjusted post code and country field sizes 2014-12-28 19:06:01 +00:00
Henry Oswald
2d03e0532f adjusted style of payment options 2014-12-28 19:04:47 +00:00
Henry Oswald
40aeed74ce added little ssl secure message 2014-12-28 18:55:29 +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
9d57288809 centered the billing forms 2014-12-28 18:23:08 +00:00
Henry Oswald
236d4d7ab3 made the fields smaller and pushed plan name to header 2014-12-28 18:16:55 +00:00
Henry Oswald
137b9c1077 removed some labels and added paypal/credit card logos 2014-12-28 17:59:29 +00:00
Henry Oswald
baa0a42825 coupon field is shown if query string scf is shown 2014-12-28 17:51:36 +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
12a28d91f2 removed month names 2014-12-23 12:00:41 +00:00
Henry Oswald
74347611e9 don't show the form until we have some data from recurly 2014-12-23 11:44:42 +00:00
Henry Oswald
03311311dd added translations in 2014-12-23 11:42:56 +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
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
Brian Gough
505675803b increase sentry sample rate to 100% 2014-12-18 09:31:38 +00:00
Brian Gough
7429e7845d add sentry exclusion list and set logging sample rate to 1% 2014-12-16 11:34:48 +00:00
Brian Gough
419d84564c add support for client-side error logging using sentry 2014-12-12 13:58:07 +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
b388c587e5 remove debugging log for pdf featureswitch 2014-12-04 16:42:28 +00:00
James Allen
4020c2f760 Update wrong synctex tooltip 2014-12-03 11:01:41 +00:00
James Allen
31ee8eea8b Show sync panel for everyone except anonymous users 2014-12-03 10:09:40 +00:00
Brian Gough
5053536fff load the compatibility library from the correct version of pdf.js 2014-12-01 15:41:17 +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
3fd8bfb221 make the pdf viewer directive conditional depending on user feature switch 2014-12-01 11:47:56 +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
James Allen
793763f206 Merge pull request #120 from watercrossing/POSTFix 
Declare forms to use method="POST" explicitly
 2014-11-28 11:11:18 +00:00
Henry Oswald
fa755c6521 added project to long check from clsi2 (bit of a punt) 2014-11-27 15:42:37 +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
Ingolf Becker
9d71073a5c Added more POST declarations 2014-11-17 15:19:11 +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
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
22f5c5dcb9 Keep spacing consistent 2014-11-03 14:25:53 +00:00
James Allen
1d6647e67d Add in github to plans page 2014-11-03 14:23:12 +00:00
Henry Oswald
fab0dc5cbc change button to a 2014-10-23 11:51:35 +01:00
Henry Oswald
b067e0d0a4 fixed email us button on templates 2014-10-23 11:18:04 +01:00
Henry Oswald
8097e6ad71 made 7 day free trial the default 2014-10-21 13:48:46 +01:00
Henry Oswald
36136a99ca fixed escaping of html 2014-10-20 15:46:42 +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
Henry Oswald
fc4bc08fc2 added upgrade to get faster compiles message to timeout 2014-10-17 16:01:26 +01:00
Henry Oswald
750b050358 added ab test in for multi currency 2014-10-15 16:21:45 +01:00
Henry Oswald
e443809206 free trial length is show correctly at bottom of plans page 2014-10-15 11:49:20 +01:00
James Allen
fd8991f62e Sort out responsive flow 2014-10-15 10:23:08 +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
b2b13ef9a7 pass plan to payment page to get the number of collaborators 2014-10-14 12:14:24 +01:00
Henry Oswald
2538d16e63 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2014-10-14 11:50:10 +01:00
Henry Oswald
3382c5bb17 added blurb to payment page 2014-10-13 17:51:59 +01:00
Henry Oswald
5a0d74753f plans page will auto redirect to best guess currency 2014-10-13 17:39:44 +01:00
Henry Oswald
52c54e7300 added ability to change currency on payment page 2014-10-13 17:28:00 +01:00
Henry Oswald
58f6ae323b fix which plan is "your plan" on dashboard 2014-10-13 16:33:01 +01:00
Henry Oswald
2bbdea3433 renamed change currency function and sorted out recommended currency 2014-10-13 16:27:27 +01:00
James Allen
cfb3969b88 Fix alignment in left menu 2014-10-13 14:45:45 +01:00
Henry Oswald
36264706f6 hooked the plans page up to the geo ip lookup 2014-10-13 14:10:15 +01:00
Henry Oswald
b90003b11e added custom user dashboard page 2014-10-10 15:44:53 +01:00
Henry Oswald
9924882b59 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2014-10-09 16:45:26 +01:00
Henry Oswald
9803f8bd70 changed uni page holder and footer 2014-10-09 16:45:04 +01:00
Henry Oswald
c2c29bb282 university site renders via prozy ok 2014-10-08 16:07:44 +01:00
James Allen
8f7dff1518 Don't show empty sync menu list for collaborators 2014-10-08 15:57:56 +01:00
James Allen
3a9d8c2b31 Make Dropbox unlinking consistent with github 2014-10-08 14:02:37 +01:00
James Allen
128c672edd Merge branch 'github-sync' 
Conflicts:
	package.json
 2014-10-08 12:13:37 +01:00
James Allen
e406034ad6 Add in Dropbox description 2014-10-07 14:42:03 +01:00
James Allen
dbd85a05f1 Send user features and features switches to views where needed 2014-10-07 13:31:13 +01:00
James Allen
10732d112d Hook module system into project list page 2014-10-03 11:32:59 +01:00
Henry Oswald
b05c6bb001 fixed hiding lang popup in firefox 2014-10-02 17:27:02 +01:00
Henry Oswald
3442786930 fixed template error 2014-09-30 21:52:00 +01:00
Henry Oswald
de6135c777 added missing translations 2014-09-30 11:41:47 +01:00
Henry Oswald
9faf4771e7 added ab test controller so it is always loaded 2014-09-29 17:33:54 +01:00
Henry Oswald
a0174c649b added a couple of missing translations 2014-09-26 16:35:57 +01:00
Henry Oswald
ca4dc9bf00 added missing translation 2014-09-26 15:04:25 +01:00
Henry Oswald
21f46da08a changed ab test from 30 -> 14 to 14 -> 7 2014-09-26 10:56:45 +01:00
Henry Oswald
d5f816598d fixed incorrect message showed in pubic modal 2014-09-20 09:20:36 +01:00
Henry Oswald
583b333a73 change nexted level of templates ng-controller 2014-09-10 15:33:59 +01:00
Henry Oswald
bed78665f5 hide the currency dropdown for the moment 2014-09-10 08:17:22 +01:00
James Allen
e973a66482 Allow client side module code injection 2014-09-08 17:33:30 +01:00
James Allen
db9632f8f2 Allow modules to inject parts of views 2014-09-08 15:40:46 +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
08e61efeb6 added some whitespace betten translations 2014-09-05 13:12:23 +01:00
Henry Oswald
08cebe369d close dropdown on click 2014-09-05 12:16:02 +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
c4a379075d Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2014-09-02 10:49:43 +01:00
Henry Oswald
6a4ddd937b Merge pull request #104 from watercrossing/fixSpace 
Add missing white space
 2014-09-02 10:34:08 +01:00
watercrossing
81b543bbaa Add space at end of line 2014-09-01 20:14:49 +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
Henry Oswald
f3c04feda7 added a missing templates button back into templates index page 2014-09-01 15:13:37 +01:00
Henry Oswald
03137d4271 made more room for bottom left part of footer as it wraps some time in spanish 2014-08-29 15:29:51 +01:00
Henry Oswald
cffcdbae18 fixed formatting $ and % 2014-08-29 13:49:37 +01:00
Henry Oswald
ce3db55624 improved annual plans view 2014-08-29 13:40:35 +01:00
Henry Oswald
e67d3889f9 got better logic and copy for upgrade annual plans, needs i18n next 2014-08-29 12:36:36 +01:00
Henry Oswald
50890af0cf Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2014-08-29 12:35:37 +01:00
James Allen
d7e2b19852 Remove your card will charged message since it doesn't apply to free trials 2014-08-29 10:23:11 +01:00
Henry Oswald
350b95a0a5 annual upgrade page works, needs a bit of copy love now 2014-08-28 18:14:31 +01:00
Henry Oswald
f5618e9d9c added confirm you want to change plan modal 
added page and corisponding endpoint to migrate to annual plan
 2014-08-27 17:51:10 +01:00
Henry Oswald
d0d08824da modal asking users to confirm a change of plan 2014-08-27 13:21:39 +01:00
Henry Oswald
b99e933266 fixed jade formating prob causing console error 2014-08-27 11:09:22 +01:00
Henry Oswald
67fdd73472 fixed template problem with next billing details 2014-08-26 20:18:56 +01:00
Henry Oswald
3b41a6eef4 change spacing on footer due to i18n problems 2014-08-26 16:59:42 +01:00
Henry Oswald
54f083820a translate footer text 2014-08-26 12:29:27 +01:00
Henry Oswald
97b118c2ac added in couple of missing translations 2014-08-24 17:12:22 +01:00
Henry Oswald
27b9cad8ca make ga experiements per page 2014-08-24 17:07:40 +01:00
Henry Oswald
705c282b0a changed ga injection 2014-08-23 19:02:41 +01:00
Henry Oswald
c91e95d593 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2014-08-22 14:22:12 +01:00
Henry Oswald
6c131b1084 - removed free trial on annual accounts 
- added setting val for google analytics experiments to be added in head
- added 14 day free trial variation to plans page
 2014-08-22 14:20:39 +01:00
James Allen
0152f42416 Put template settings on client side 2014-08-22 13:10:32 +01:00
James Allen
c8ab1bd394 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-08-22 12:52:31 +01:00
James Allen
456d194dbb Merge branch 'james_tmp' 2014-08-22 12:51:35 +01:00
Henry Oswald
fd8221b869 make it possible to hide a lng 2014-08-21 17:58:25 +01:00
Henry Oswald
e144f9c19a changed key for profile complete 2014-08-21 12:48:55 +01:00
Henry Oswald
dd8ca9ca0e changed key Actions -> actions 2014-08-21 12:45:19 +01:00
Henry Oswald
daec56359f rename != delete tooltip 2014-08-21 04:41:06 +01:00
James Allen
c4b91de8e8 Layout templates in rows of four 2014-08-20 14:58:01 +01:00
James Allen
d0eee7a1e5 Refactor template settings 2014-08-20 14:47:27 +01:00
Henry Oswald
c51c0c1cf2 fixed misconfig translate string 2014-08-20 14:40:27 +01:00
Henry Oswald
3cd43ddd86 found sneaky missing translations 2014-08-20 14:31:44 +01:00
Henry Oswald
8d51fcc457 hide translations notification on editor page 2014-08-20 14:08:59 +01:00
Henry Oswald
21f288fbe5 missed off few tooltips in translation 2014-08-20 13:47:45 +01:00
Henry Oswald
8e4974d559 fix more escaping html 2014-08-20 12:45:29 +01:00
Henry Oswald
c1c46a36b9 render html of bonus page para 2014-08-20 08:14:36 +01:00
James Allen
156c6ec4b6 Add PDF viewer label in 2014-08-19 14:40:10 +01:00
Henrique Dias
e0e9949da5 dynamic template menu by config settings 2014-08-18 14:26:47 -03:00
James Allen
02ec2bc264 Align flags on left of menu to match flag in footer 2014-08-14 16:41:48 +01:00
James Allen
ac4b3663cb CSS tweaks to i18n stuff 2014-08-14 16:33:01 +01:00
Henry Oswald
aa4f748608 Merge branch 'master' into i18n 2014-08-14 15:42:54 +01:00
Henry Oswald
f75838b353 don't show the lng select if there is only 1 lang to show 2014-08-14 15:42:31 +01:00
Henry Oswald
7c2beb5d2d added correct flags 2014-08-14 13:00:04 +01:00
James Allen
7816810249 Add in poll dropbox endpoint back into admin 2014-08-14 10:12:01 +01:00
Henry Oswald
02cdfb4d09 lng dropdown at bottom in footer works nicely, needs few style tweeks 2014-08-13 23:06:15 +01:00
James Allen
670e8e5cb9 Use Dropbox Real-time polling 2014-08-13 17:26:18 +01:00
Henry Oswald
7389943089 added ugly list of available subdomains 2014-08-13 16:04:49 +01:00
James Allen
2a6041752d Remove unescaped strings on bonus page 2014-08-13 15:44:30 +01:00
Henry Oswald
041e85b92b added local cooked option to hide notification 2014-08-13 14:14:31 +01:00
Henry Oswald
2222b32321 added message at top of page offering redirect to local lng 2014-08-13 12:31:14 +01:00
James Allen
6bfefea5cb Show PDF button in toolbar if file tree is closed in PDF flat view 2014-08-12 13:18:22 +01:00
James Allen
93f2969be5 Change style on file rename input to avoid weird Chrome behaviour 2014-08-12 12:46:05 +01:00
James Allen
5b3bf5c956 Spaces after error titles 2014-08-12 12:30:07 +01:00
James Allen
3348249dcd Download template PDF and zip file with good file names 2014-08-12 12:02:09 +01:00
James Allen
2aa421233c Add meta description for templates home page 2014-08-11 16:20:27 +01:00
Henry Oswald
f452f0ee19 don't escpae html on delete modal 2014-08-11 08:01:39 +01:00
James Allen
8320970a29 ngcloak template button while loading 2014-08-08 14:05:40 +01:00
James Allen
af1f0994af Remove priority title stuff again 2014-08-07 16:53:01 +01:00
James Allen
31e3c4ac06 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-08-07 16:12:11 +01:00
Henry Oswald
da307318d9 fixed unescaped content 2014-08-07 16:11:43 +01:00
James Allen
240dae0cff Provide template description as meta tag 
Conflicts:
	app/views/layout.jade
 2014-08-07 16:11:32 +01:00
James Allen
b367c4a968 Show group subscription status on subscription dashboard page 
Conflicts:
	app/views/subscriptions/dashboard.jade
 2014-08-07 15:51:43 +01:00
Henry Oswald
06c83dfcfa fixed missing title val 2014-08-07 15:15:07 +01:00
Henry Oswald
9c6f0faff6 Merge branch 'i18n' 
Conflicts:
	app/coffee/Features/User/UserPagesController.coffee
	app/views/layout.jade
	app/views/project/editor/dropbox.jade
	app/views/project/editor/file-tree.jade
	app/views/project/editor/pdf.jade
	app/views/project/list/project-list.jade
	app/views/user/settings.jade
 2014-08-07 14:46:17 +01:00
Henry Oswald
a337b8e848 fixed jade error in track changes 2014-08-07 14:31:03 +01:00
Henry Oswald
ecd5d5274c Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2014-08-07 13:56:17 +01:00
Henry Oswald
c961cea514 fixed some bits 2014-08-07 13:56:04 +01:00
Henry Oswald
01b7f61e6b added check if other langs are enabled for put the header rel link in 2014-08-06 15:35:57 +01:00
Henry Oswald
673def4f90 added different lang links to head for google 2014-08-06 15:05:13 +01:00
James Allen
07a2955341 Add in timeout documentation link to error message 2014-08-05 17:16:34 +01:00
James Allen
0111d699a3 Move sort click action to just the header text, not select all input 2014-08-05 17:10:24 +01:00
James Allen
a7cf8d6b0a Sort out title of wiki 2014-08-05 17:08:38 +01:00
Henry Oswald
9baea1edc1 removed lang dropdown 2014-08-05 11:35:23 +01:00
Henry Oswald
90395af6b8 nav bar text is now translated but uses key as the string if it can't be translated 2014-08-05 11:24:18 +01:00
Henry Oswald
03db0bc797 added ugly dropdown for testing 2014-08-01 14:43:06 +01:00
Henry Oswald
1b8c8b8c48 sorted out titles 2014-08-01 13:47:14 +01:00
Henry Oswald
fdc5a5154a added a load more pages 2014-08-01 12:34:53 +01:00
James Allen
2ea7dee682 Add card around wiki content to make it stand out 2014-08-01 08:51:01 +01:00
Henry Oswald
cb685f5ea6 done loads of more pages 2014-07-31 17:07:43 +01:00
James Allen
55ad2ce78d Include contents page down side of wiki 2014-07-31 16:26:02 +01:00
James Allen
be725c50ba Make right click on menus behave like native right click 2014-07-31 14:20:56 +01:00
Henry Oswald
ab10d84f6a did some of the forms 2014-07-31 14:01:37 +01:00
Henry Oswald
43750e9cb6 converted plans page 2014-07-31 13:38:24 +01:00
James Allen
bc2147993a Show project path in Dropbox folder 2014-07-31 13:04:55 +01:00
James Allen
e1c14b0cf8 Mask iframe so resizer can go over native PDF 2014-07-31 13:04:55 +01:00
Henry Oswald
5f8bb9ea1f converted settings page 2014-07-31 11:54:19 +01:00
Henry Oswald
42c63dd5a2 equals checks work, uses id now as well. Taken from: 
http://blog.brunoscopelliti.com/angularjs-directive-to-check-that-passwords-match
the old one from SO does not seem to work any more
 2014-07-31 11:16:13 +01:00
Henry Oswald
270c92c2a2 converted project list page 
added missing js files
 2014-07-30 17:18:45 +01:00
Henry Oswald
49c7d52208 i18n is cleaned and working with requirejs 2014-07-30 16:13:02 +01:00
Henry Oswald
9631d4da98 much simpler version of interpolation 2014-07-30 16:06:53 +01:00
Henry Oswald
7344f745e4 example of interpolation working 2014-07-30 16:04:26 +01:00
James Allen
49258fe3dd Proxy to wiki 2014-07-30 15:44:03 +01:00
Henry Oswald
1a8c3d17b2 working example of directive for i18n new project button 2014-07-30 15:05:13 +01:00
Henry Oswald
bdf1fed462 jquery translations work 2014-07-30 14:22:36 +01:00
Henry Oswald
48f019236e added first translations 2014-07-29 15:33:31 +01:00
Henry Oswald
39173fe583 Merge branch 'i18n' 
Conflicts:
	app/coffee/infrastructure/Server.coffee
	app/views/project/list.jade
	package.json
 2014-07-29 13:44:10 +01:00
James Allen
1f44cc4375 Fix alignment of 'view all templates' 2014-07-29 11:35:56 +01:00
Henry Oswald
f821c38a9f Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2014-07-29 10:55:29 +01:00
Henry Oswald
dff74cf5cb hide dropbox in left menu if you are not the admin 2014-07-29 10:55:22 +01:00
James Allen
25205e3dda Update to official mathjax cdn 2014-07-29 10:37:43 +01:00
James Allen
fc7753d49d Add in download PDF button 2014-07-28 17:24:43 +01:00
Henry Oswald
9354d61aa3 fixed delete account validation 
not using angular equals which does not seem to work
 2014-07-28 16:52:25 +01:00
James Allen
a5267184ab Don't use dark theme yet 2014-07-28 15:57:06 +01:00
James Allen
db920f7aaf Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-07-28 15:06:39 +01:00
James Allen
4ff9fe33b6 Use a dark editor surround if the theme is dark 2014-07-28 15:06:26 +01:00
Henry Oswald
d4be1ba7aa changed template image paths to use correct ones 2014-07-28 12:50:56 +01:00
James Allen
ce47f75058 Show timedout errors properly 2014-07-28 10:22:27 +01:00
Henry Oswald
1603957571 Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign 2014-07-25 14:21:48 +01:00
James Allen
e8c5679954 Update styles for homepage 2014-07-25 14:14:27 +01:00
Henry Oswald
c0f5894edb Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign 2014-07-25 13:14:22 +01:00
Henry Oswald
40dbeb1fe7 fixed missing fingerprint 2014-07-25 12:52:17 +01:00
James Allen
9aa8682082 Add group plan enquiry form 2014-07-25 12:32:26 +01:00
Henry Oswald
5a336ed7ef Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign 2014-07-25 12:20:11 +01:00
Henry Oswald
d7814e354b replace underscore with space in template names 2014-07-25 12:20:08 +01:00
James Allen
cb5206a49e Convert plans page to use free trials 2014-07-25 12:10:56 +01:00
Henry Oswald
726719ce3f changed html autofocus to an angular directive 
autofocus is html5y and worked on chrome but not firefox for me.
 2014-07-24 14:57:56 +01:00
Henry Oswald
b15adefed7 Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign 2014-07-24 14:06:33 +01:00
Henry Oswald
787a3adad3 killed changelog 2014-07-24 14:05:20 +01:00
James Allen
0938186868 Don't show system messages in editor 2014-07-24 14:04:26 +01:00
James Allen
5c18f4fe02 Sexy project list resizing 2014-07-24 14:02:14 +01:00
Henry Oswald
2ffe093952 removed unused bonus jade files 2014-07-24 13:58:02 +01:00
Henry Oswald
7255231abc Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign 
updated upstream into a topic branch.
 2014-07-24 13:57:49 +01:00
James Allen
06ca7c904e Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign 2014-07-24 13:24:20 +01:00
James Allen
1128b45b17 Add in system messages 2014-07-24 13:24:08 +01:00
Henry Oswald
67cba0dfd2 killed info controller and setup features.less for dropbox and feature pages 
also moved dropbox to external pages
 2014-07-24 12:15:54 +01:00
Henry Oswald
a8deac697c Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign 2014-07-24 11:29:11 +01:00
Henry Oswald
a7b678a2c0 removed dropbox template that is not needed 2014-07-24 11:29:05 +01:00
Henry Oswald
49f356b38f removed advisor and themes page 2014-07-24 11:23:53 +01:00
James Allen
fbd36d8b07 Sort of style of admin panel and trim functionality 2014-07-24 11:22:22 +01:00
James Allen
596619633d Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign 2014-07-23 15:56:22 +01:00
James Allen
a459a178b3 Retina favicon 2014-07-23 15:56:15 +01:00
Henry Oswald
e60c67d7e4 moved the left hand pdf link to the top 2014-07-23 14:44:44 +01:00
Henry Oswald
e46bc51c67 Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign 2014-07-23 12:17:14 +01:00
Henry Oswald
83b94f987c cleaned up few small things with templates 2014-07-23 12:16:31 +01:00
James Allen
077f87f1d3 Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign 2014-07-23 12:05:31 +01:00
Henry Oswald
395b1ebf47 Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign 2014-07-23 11:29:43 +01:00
Henry Oswald
e39e6c86a1 moved where we write the window.sharelatex.x to the header as some 
times it is possible for the scripts to evaulate before those props
have been read in
 2014-07-23 11:29:04 +01:00
James Allen
2218acdc3b Add close buttons to modals 2014-07-23 11:26:45 +01:00
Henry Oswald
a9d8be8dec brought up the sections of templates to be closer to the search box 2014-07-23 11:26:17 +01:00
James Allen
bbaf024f14 Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign 2014-07-23 11:22:12 +01:00
James Allen
cca50cf64c Auto focus login, register and password fields 2014-07-23 11:18:42 +01:00
James Allen
96e99a5cc0 Minor project list tweaks 2014-07-23 11:12:12 +01:00
James Allen
532ec5e756 Make project list look better on a smaller screen 2014-07-23 11:08:55 +01:00
Henry Oswald
c6ab4c4f7b roughly styled template search results 
clear button in template search also clears results
 2014-07-22 17:43:17 +01:00
Henry Oswald
25ea01115a Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign 2014-07-22 17:24:51 +01:00
Henry Oswald
a4b02558dc 'carded' the templates page, top search area still needs doing 2014-07-22 17:24:32 +01:00
James Allen
20a5d3742a Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign 2014-07-22 17:09:52 +01:00
James Allen
dfb82015f7 Style blog and lighten text 2014-07-22 17:09:44 +01:00
Henry Oswald
a20b46c786 template page looks ok, not quite like adam did. 
Need to battle left padding still
 2014-07-22 15:56:36 +01:00
Henry Oswald
234bc5e0e9 Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign 2014-07-22 14:56:41 +01:00
Henry Oswald
806ebc977c templates index page looks roughly correct 2014-07-22 14:56:33 +01:00
James Allen
a4209000dc Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign 2014-07-22 14:38:51 +01:00
James Allen
c099b8e9de Add hotkeys modal 2014-07-22 14:38:32 +01:00
Henry Oswald
c95730dd63 Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign 2014-07-22 13:42:37 +01:00
James Allen
688842de3c Allow full screen PDF 2014-07-22 13:33:01 +01:00
Henry Oswald
2c7d19d79b Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign 2014-07-22 12:31:34 +01:00
Henry Oswald
2246e9c934 blog looks basically like adams 2014-07-22 12:31:19 +01:00
James Allen
cb57c2f28d Tweak css and style on homepage 2014-07-22 11:50:15 +01:00
James Allen
3a13dac7ab Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign 2014-07-21 17:56:28 +01:00
Henry Oswald
aa3cd06d72 add trailing space for better spacing on register message 2014-07-21 17:32:16 +01:00
Henry Oswald
535a3c67cd added template for bonus page with html linking to us 2014-07-21 16:41:22 +01:00
James Allen
b5cfe06645 Don't show options that don't make sense for anonymous users 2014-07-21 16:10:21 +01:00
James Allen
1d6314a2c1 add Ctrl-Enter hotkey 2014-07-21 15:39:15 +01:00
James Allen
3468460ed6 Show progress before any js loads 2014-07-21 15:11:54 +01:00
James Allen
2b85ebf8ec Allow root doc to be set 2014-07-21 15:09:19 +01:00
Henry Oswald
82914b6fe5 Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign 2014-07-21 13:14:08 +01:00
James Allen
98d601fb66 Only show synctex controls when pdf layout is open 2014-07-21 12:30:34 +01:00
James Allen
1cf508356c Show 'no messages' state in chat 2014-07-21 12:19:13 +01:00
James Allen
4151f5d85f Disable chat for anonymous users 2014-07-21 11:56:49 +01:00
James Allen
6212b1c375 Append header tooltips to body 2014-07-21 11:38:19 +01:00
Henry Oswald
57ad5e4182 - migrated event tracking to new pages/angular 
- hooked up the search field on projects to search on keypress
 2014-07-21 11:35:05 +01:00
Henry Oswald
0868ce9cc7 send user details on modal dismiss. Role uses same autocomplete lib as institution 2014-07-18 14:08:53 +01:00
Henry Oswald
533b51146e Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign 2014-07-18 13:20:40 +01:00
Henry Oswald
175882dc67 changed role to datalist because im fed up of not being able to fix it. Datalist are not styled but its not that bad 2014-07-18 13:20:35 +01:00
James Allen
b532461232 Style project sorting with a cleaner look 2014-07-18 12:20:12 +01:00
James Allen
b785ab4d15 Fix broken project list page 2014-07-18 12:18:05 +01:00
James Allen
462403bb4f Finger print Ace files 2014-07-18 12:08:56 +01:00
Henry Oswald
57b461e0ff added little icons to the table for when you want to sort 2014-07-18 10:43:32 +01:00
Henry Oswald
ca6e8a7d40 basic sorting added to project list page 2014-07-17 17:34:09 +01:00
Henry Oswald
c683eab9e2 change the scribtex modal to be bootstrap3/angular, same content and same logic if it should be shown or not 2014-07-17 17:05:39 +01:00
James Allen
2cf8f8c56f Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign 2014-07-17 15:35:06 +01:00
James Allen
9ed93b3a81 Make colors consistent everywhere 2014-07-17 15:33:38 +01:00
Henry Oswald
fc02f99659 made restricted page like 404, also got dropbox progress bar going the other way 2014-07-17 15:26:31 +01:00
James Allen
37a12e88c1 Show who is online 2014-07-17 15:25:22 +01:00
Henry Oswald
c429bd1f44 improved the dropbox progress bar 2014-07-17 15:08:12 +01:00
Henry Oswald
b54c351956 Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign 2014-07-17 14:23:55 +01:00
Henry Oswald
5fa83fb2b9 added dropbox in left menu 2014-07-17 14:23:47 +01:00
James Allen
3995de3cfc Add in project cloning to editor 2014-07-17 14:04:21 +01:00
James Allen
a3faaf0c18 Add in mathjax directive 2014-07-17 13:23:43 +01:00
James Allen
d531e3b393 Fix overlapping issues when name is empty in track changes list 2014-07-17 13:03:29 +01:00
James Allen
ee7013c1ee TRack free trial clicks and redirect to subscription page 2014-07-17 12:57:17 +01:00
James Allen
05b078ec92 New File => Folder in folder modal 2014-07-17 12:03:26 +01:00
James Allen
8d946e68d2 Return better blank gravatar image 2014-07-17 11:07:34 +01:00
James Allen
c6f51cf5ac Show new chat message notification 2014-07-17 11:05:08 +01:00
James Allen
9064a9d9df Append project list tooltips to body 2014-07-16 17:04:17 +01:00
James Allen
9ce746c6c5 Tweak menu style 2014-07-16 17:01:41 +01:00
James Allen
8e1593bb96 Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign 2014-07-16 16:58:25 +01:00
James Allen
c24fe212a9 Fix PDF position tracking 2014-07-16 16:58:12 +01:00
Henry Oswald
55eb15baba changed the icon for templates in the left menu 2014-07-16 16:20:31 +01:00
Henry Oswald
4f91e40875 Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign 2014-07-16 15:53:12 +01:00
Henry Oswald
f3f53a99d0 Templates state resets on modal close so if the api comes back it will work 2014-07-16 15:50:27 +01:00
James Allen
14a9d0838e Get line wrapping of long tag names sorted 2014-07-16 15:24:30 +01:00
James Allen
1d79f3bec3 Don't close folder menu on modal pop up 2014-07-16 15:04:37 +01:00
James Allen
a924f2a928 Rephrase shared projects 2014-07-16 15:01:06 +01:00
James Allen
f34811fbf6 Add new folder link in side bar 2014-07-16 14:59:52 +01:00
Henry Oswald
735bc9e53d show message when can not talk to templates api 2014-07-16 13:36:02 +01:00
Henry Oswald
abc4306e06 merge 2014-07-16 13:35:15 +01:00
James Allen
4b3610746e Use native select box style in left menu 2014-07-16 12:09:19 +01:00
Henry Oswald
eb58bb7c5a all template buttons in editor are disabled on publish/unpublish 2014-07-16 12:04:33 +01:00
James Allen
60174ffb09 Style closed page 2014-07-16 11:59:54 +01:00
James Allen
2dc43b504c Style 404 page 2014-07-16 11:59:25 +01:00
Henry Oswald
6982ec63ae changed get template details to findOne 2014-07-16 11:56:22 +01:00
James Allen
9e0d5ff890 Use permissions.admin, not hasPermission(...) 2014-07-16 11:50:03 +01:00
James Allen
4a139949f2 Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign 2014-07-16 11:29:02 +01:00
James Allen
8f08823d34 Sort out fingerprints and pdf.js worker path 2014-07-16 11:28:52 +01:00
Henry Oswald
c8c0030b7c Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign 2014-07-16 11:02:53 +01:00
Henry Oswald
46377aea3d the template link in the left menu is only shown to owners/admins 2014-07-16 11:02:45 +01:00
James Allen
1d7a595c6c Small chat scroll tweaks 2014-07-16 10:52:06 +01:00
James Allen
e0266e309f Put project link in header 2014-07-15 20:44:13 +01:00
James Allen
7318f4c2d3 Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign 2014-07-15 18:25:29 +01:00
James Allen
b9f2b02594 Sort out scroll in chat 2014-07-15 18:25:12 +01:00
Henry Oswald
c93c8b3f7d got basic client side templates 2014-07-15 17:56:09 +01:00
Henry Oswald
ef4b7f7036 Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign 2014-07-15 12:15:15 +01:00
James Allen
cf0ff6e97a Hide chat in editor 2014-07-15 10:56:01 +01:00
Henry Oswald
5093820a5f Merge branch 'master-redesign' into master-redesign-templates-and-blog 2014-07-14 12:42:03 +01:00
James Allen
e4d9d03f55 Improve feedback on login/register forms 2014-07-11 17:08:19 +01:00
James Allen
1c5778e2c4 List number of changes in diff 2014-07-11 16:34:12 +01:00
James Allen
76415ae02b Show labels for tracked changes above and below 2014-07-11 16:17:59 +01:00
James Allen
0a2d93011f Add in restore button for diffs 2014-07-11 13:55:14 +01:00
Henry Oswald
c0a6f0b7ad Merge branch 'master-redesign' into master-redesign-templates-and-blog 
Conflicts:
	public/coffee/ide/editor/directives/aceEditor/auto-complete/AutoCompleteManager.coffee
	public/coffee/ide/editor/directives/aceEditor/cursor-position/CursorPositionManager.coffee
	public/coffee/ide/online-users/OnlineUsersManager.coffee
	public/coffee/ide/track-changes/directives/infiniteScroll.coffee
 2014-07-10 15:15:18 +01:00
Henry Oswald
025d3147ec blog intergration works 2014-07-10 14:53:53 +01:00
James Allen
1ce5062800 Add in link to go back to projects 2014-07-10 14:08:32 +01:00
Henry Oswald
5cf756969e blog wip 2014-07-09 19:49:39 +01:00
James Allen
c93902345a Remove all console.log debug statements 2014-07-09 16:18:09 +01:00
James Allen
b0f43eab19 Use events for updating cursor = big performance gain 2014-07-09 15:38:38 +01:00
James Allen
07debb2450 Fix some more project list style issues 2014-07-09 14:56:25 +01:00
James Allen
f2066e46dd Use Angular 1.30 and only update emails on blur 2014-07-09 14:53:30 +01:00
James Allen
f6c2feff2d Improve styling of project list with long titles and labels 2014-07-09 11:51:21 +01:00
James Allen
488f33d3d0 Replace slashes globally 2014-07-09 11:17:16 +01:00
James Allen
6d10c186ad Sort out escaping issues 2014-07-09 11:05:00 +01:00
James Allen
4423471b1a Auto resize project list to always fit in screen 2014-07-08 17:47:20 +01:00
James Allen
d9d1499dae Ignore external pages 2014-07-08 13:36:08 +01:00
James Allen
2f92856db4 Provide more config options for nav and footer entries 2014-07-08 12:51:11 +01:00
Henry Oswald
0080809489 merge/moving js stuff around half done 2014-07-08 12:32:50 +01:00
James Allen
b9909bbd84 Sort out front end coffee/js files and minification 2014-07-08 12:01:32 +01:00
Henry Oswald
32b5e39681 chat scoll works fairly well using scroll glue 2014-07-08 11:56:44 +01:00
Henry Oswald
6dc9d32104 Merge branch 'master-redesign' into master-redesign-templates-and-blog 
Conflicts:
	public/coffee/app/main.coffee
 2014-07-08 11:14:56 +01:00
Henry Oswald
581d9ec925 - hooked up chat throughout the stack 
- removed lots of console.logs
- working on the auto scrol, doesn't quite work yet
 2014-07-08 10:08:38 +01:00
James Allen
8525bf4a72 Get group admin page working with angular and new style 2014-07-07 18:06:12 +01:00
James Allen
c542116b41 Fix role autocomplete 2014-07-07 16:25:18 +01:00
James Allen
5d62775ab6 Fix auto complete in user profile 2014-07-07 16:22:38 +01:00
James Allen
068d88ec0b Style bonus page 2014-07-07 15:54:40 +01:00
James Allen
41ef675999 Improve UX of user profile 2014-07-07 14:58:12 +01:00
James Allen
452098ca68 Redirect to register if not registered on plans page 2014-07-07 14:05:07 +01:00
James Allen
5f48105b04 Style subscription management pages 2014-07-07 13:43:36 +01:00
James Allen
7947eb28ad Remove ab test from plans page 2014-07-07 12:30:19 +01:00
James Allen
b3bfa2dc26 Add plans page 2014-07-07 12:27:58 +01:00
Henry Oswald
34ac6b03cd Merge branch 'master-redesign' into master-redesign-templates-and-blog 2014-07-07 10:54:50 +01:00
James Allen
773b457d24 Group messages from the same person together 2014-07-04 15:46:21 +01:00
Henry Oswald
86a9d08e5c Merge branch 'master-redesign' into master-redesign-templates-and-blog 2014-07-04 13:06:47 +01:00
James Allen
ac0f05a9e4 Create binary file preview 2014-07-03 17:05:50 +01:00
James Allen
af870c8269 Style project name and allow renaming 2014-07-03 16:18:49 +01:00
James Allen
a8d371d2f6 Sort out permissions and displaying anonymous users 2014-07-03 15:05:35 +01:00
James Allen
58e4e92d84 Add in upgrade pop up to history 2014-07-03 11:18:15 +01:00
James Allen
a13ee00e91 Allow dragging into the root folder 2014-07-03 11:01:41 +01:00
James Allen
a4afc70f9b Show saving notifications 2014-07-02 17:41:07 +01:00
James Allen
b61da1a9f0 Handle out of sync errors with a pop-up 2014-07-02 17:04:29 +01:00
Henry Oswald
b81fac1cf4 Merge branch 'master-redesign' into master-redesign-templates-and-blog 2014-07-02 15:58:30 +01:00
Henry Oswald
ba4d585854 Merge branch 'master-redesign' into master-redesign-templates-and-blog 2014-07-02 15:56:22 +01:00
James Allen
f256c96195 Add in chat view with stubbed data 2014-07-02 15:56:09 +01:00
James Allen
926b31b337 Fix a few ui bugs 2014-07-02 13:29:56 +01:00
James Allen
ab09a865b8 Add in chat pane and sort out layout resizing 2014-07-02 13:23:04 +01:00
James Allen
83666be910 Disabled pdf download if not available 2014-07-02 11:06:20 +01:00
James Allen
f86c9cf853 Move all editor manager binding logic into the managers 2014-07-02 10:59:18 +01:00
Henry Oswald
55d20e8abd change format of algolia settings 2014-07-01 16:45:20 +01:00
James Allen
beae4f2424 Style settings side panel 2014-07-01 16:03:14 +01:00
James Allen
7cfbaaca36 Style settings side panel 2014-07-01 15:57:55 +01:00
Henry Oswald
000be22f16 Merge branch 'master-redesign' into master-redesign-templates-and-blog 
Conflicts:
	app/views/project/editor.jade
 2014-07-01 15:23:05 +01:00
James Allen
e1bce85933 Update style when project is public too 2014-07-01 15:17:42 +01:00
James Allen
0b0f7eab0b Stop public status looking like a table header 2014-07-01 15:15:54 +01:00
James Allen
9839f3fc62 Get public sharing modal working 2014-07-01 15:05:32 +01:00
Henry Oswald
17537b0d7a client side js for templates loads and works 2014-07-01 14:27:20 +01:00
James Allen
08f702a7c5 Get free trial button working in share modal 2014-07-01 14:16:41 +01:00
James Allen
be48ab2a30 Add in basic share modal 2014-07-01 14:12:28 +01:00
James Allen
9097fdd930 Allow switching between pdfjs and native viewer 2014-07-01 11:00:47 +01:00
James Allen
11d951f021 Get synctex working 2014-06-30 18:35:01 +01:00