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 |
|