James Allen
6800c1a15e
Track the source of updates through the system on adding/updating of docs and files
2014-10-15 15:18:31 +01:00
James Allen
4f2ab51ebd
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-10-15 14:11:11 +01:00
James Allen
941f550d6c
Remove all traces of soa-req-id
2014-10-15 14:11:02 +01:00
Henry Oswald
af769c7871
allow ip to set via query string for plans page
2014-10-15 11:58:35 +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
19a08f82a6
default to USD if there is no match
2014-10-14 12:14:03 +01:00
Henry Oswald
4a774981cf
Merge branch 'master' into multicurrency
2014-10-14 11:52:03 +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
3bac4dc39f
increase auto compile limit
2014-10-14 11:50:06 +01:00
Henry Oswald
6437f74cd3
use req.ip not x-forwarded-for to get ip address for multi currency
2014-10-13 17:55:18 +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
Henry Oswald
2bf34bba4d
added currency to subscription view model
2014-10-13 16:14:13 +01:00
Henry Oswald
f55ef2f1b4
made what is returned for multi currency more explicit
2014-10-13 16:13:31 +01:00
James Allen
3c058edfb4
Add github feature flag to user model
2014-10-13 15:45:19 +01:00
Henry Oswald
7964616f02
changing email address should lowercase the email
2014-10-13 15:44:45 +01:00
James Allen
5edefe2498
Add in compile timeout and group feature options
2014-10-13 15:42:11 +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
3ca04e25fd
add 1 second timeout to geoiplookup
...
response times generally seem to be around 0.05s from our servers
2014-10-13 13:15:48 +01:00
Henry Oswald
2e6c2c1926
default to USD in geo ip lookup.
...
Decided to put default logic in the GeoIpLookup.getCurrencyCode as
we are going to want this default everywhere we use it.
2014-10-13 13:08:11 +01:00
Henry Oswald
e78e4d46b0
use first ip passed though in string for ip lookup
2014-10-13 13:04:20 +01:00
Henry Oswald
259871cbdd
added geoip lookup feature
2014-10-13 00:45:45 +01:00
Henry Oswald
40c3c3e1ce
added customAccount to subscription model
2014-10-10 15:57:27 +01:00
Henry Oswald
7b37bed2cd
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2014-10-10 15:45:09 +01:00
Henry Oswald
b90003b11e
added custom user dashboard page
2014-10-10 15:44:53 +01:00
Henry Oswald
3ba3a91043
if its a custom account redirect to /user/subscription/custom_account
2014-10-10 15:11:22 +01:00
James Allen
a8afe3a0d7
Improve file uploader CSS
2014-10-10 13:40:00 +01:00
Henry Oswald
c7a3cb87c2
added modules folder
2014-10-10 09:50:53 +01:00
Henry Oswald
e5ab40c911
added example session invalidation code
2014-10-09 18:10:01 +01:00
Henry Oswald
e7984a90d7
unlink dropbox when a user cancels
2014-10-09 17:05:41 +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
James Allen
4743b460f5
Only show rename or deleted message once
2014-10-09 09:13:38 +01:00
James Allen
bc94ea56cb
Add projects to tag after creating the tag
2014-10-09 08:39:15 +01:00
James Allen
3bf7948510
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-10-08 17:18:57 +01:00
James Allen
accd8207b2
Show password reset expired message rather than server error if that's what has happened
2014-10-08 17:18:24 +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
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
Mick O'Brien
72fc630e81
Added keyboard shortcuts to bold and italicise text
2014-10-08 15:44:01 +01:00
James Allen
3a9d8c2b31
Make Dropbox unlinking consistent with github
2014-10-08 14:02:37 +01:00
James Allen
82dc3cf654
Don't reload module views each request by default
2014-10-08 12:39:36 +01:00
James Allen
b62fb3960c
Fix javascript compiling when there are no modules
2014-10-08 12:22:04 +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
Henry Oswald
8789a4bde1
server rejects rename of entitys over 150 chars
2014-10-07 11:16:26 +01:00
Henry Oswald
b01b05e49b
server rejects project names over 150 chars
2014-10-07 11:14:02 +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
6c7c09075c
Treat paths properly in project content update methods
2014-10-03 11:33:18 +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
James Allen
13a96c925b
Add in endpoints to allow updating project files when the project id is know
2014-10-02 14:15:30 +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
e35a32d7d7
take minor versions of redis-sharelatex
2014-09-29 12:48:26 +01:00
Henry Oswald
2375dbb851
run succesful login before each smoke test to avoid any rate limit issues
2014-09-29 11:45:34 +01:00
Henry Oswald
7f2df4bbd3
renamed rate limiter tests
2014-09-29 11:42:46 +01:00
Henry Oswald
49e7777b6d
bumped redis-sharelatex
2014-09-29 11:42:28 +01:00
Henry Oswald
0d056434e6
fixed tests
2014-09-26 17:49:31 +01:00
Henry Oswald
9a97245c01
Merge branch 'redis-sentinal'
2014-09-26 17:40:53 +01:00
Henry Oswald
81307324fc
v2, seems to work...
2014-09-26 17:04:33 +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
f73629f8d9
v1 of sentinal support
2014-09-26 14:52:00 +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
d5f816598d
fixed incorrect message showed in pubic modal
2014-09-20 09:20:36 +01:00
Henry Oswald
558b6cdfde
remove test which isn't really that important
2014-09-18 14:41:30 +01:00
Henry Oswald
2376d0a188
added generic error logging
2014-09-18 14:37:23 +01:00
Henry Oswald
9c98e95ca4
send cancelation email after 1 hour
2014-09-16 14:25:12 +01:00
Henry Oswald
6efda9cf1c
push currency default to seperate var
2014-09-11 11:45:00 +01:00
Henry Oswald
20f0c648e5
default to USD
2014-09-11 11:35:39 +01:00
Henry Oswald
583b333a73
change nexted level of templates ng-controller
2014-09-10 15:33:59 +01:00
Henry Oswald
1b02dc72a3
destroy session on dropbox webhook
2014-09-10 14:19:44 +01:00
Henry Oswald
c08a568664
removed session logging
2014-09-10 10:09:25 +01:00
Henry Oswald
d961b48857
imporved logging for session debug
2014-09-10 08:20:36 +01:00
Henry Oswald
bed78665f5
hide the currency dropdown for the moment
2014-09-10 08:17:22 +01:00
Henry Oswald
50ee889569
fixed template search, ng-controller was too deep
2014-09-09 16:51:52 +01:00
Henry Oswald
ca402a3061
added some logging in for sessions
2014-09-08 17:45:37 +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
James Allen
db9632f8f2
Allow modules to inject parts of views
2014-09-08 15:40:46 +01:00
James Allen
374c0f3d65
Add existence check for modules dir
2014-09-08 14:23:47 +01:00
James Allen
becb294c5c
Create basic module loading system
2014-09-08 14:19:24 +01:00
Henry Oswald
93b4c5f4f8
thank you page displays the correct currency
2014-09-08 10:59:12 +01:00
Henry Oswald
aee0dda243
added currency to signiture
2014-09-08 10:36: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
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
8762297158
touch the session rather than setting the expires, same result
2014-09-04 18:07:31 +01:00
Henry Oswald
b875864568
check for error on smoke test after
2014-09-04 18:06:24 +01:00
James Allen
971afb7342
Treat large text files as binary
2014-09-04 13:00:51 +01:00
Henry Oswald
c131a9d301
added /logout to smoke tests
2014-09-04 12:35:59 +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
5d3dacae99
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2014-09-02 13:20:06 +01:00
Henry Oswald
7fc0388003
fixed case sensitivity
2014-09-02 13:19:59 +01:00
James Allen
9d7b52ca4d
Merge pull request #105 from watercrossing/listenToHost
...
Add logic to bind the web app to a specific host
2014-09-02 12:13:50 +01:00
watercrossing
fc9b887c0b
Add ability to specify interface
2014-09-02 12:00:33 +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
c4a379075d
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2014-09-02 10:49:43 +01:00
Henry Oswald
f25dba10ea
changed label to send to GA
2014-09-02 10:47:58 +01:00
watercrossing
c30bcfce53
Add ability to specify interface
2014-09-02 10:41:48 +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
e5218af015
fix typo in settings
2014-09-01 23:15:38 +01:00
watercrossing
81b543bbaa
Add space at end of line
2014-09-01 20:14:49 +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
Henry Oswald
f3c04feda7
added a missing templates button back into templates index page
2014-09-01 15:13:37 +01:00
Henry Oswald
66e0785e59
fixed word wrapping on plans button page
2014-08-29 15:34:46 +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
e740e4913d
if user is already annual tell them so on the annual upgrade page
2014-08-29 14:13:05 +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
416f41e59d
stopped using proper settings inside of a test
2014-08-29 13:06:50 +01:00
Henry Oswald
aa83b5ca5d
fixed tests whoops
2014-08-29 12:41:42 +01:00
Henry Oswald
b951ab798c
set flag incorrectly when debugging
2014-08-29 12:37:00 +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
78d94094b4
changed moment path in libs to work locally
2014-08-27 13:22:17 +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
15e14d5bda
changed padding of perk to ork well in czech
2014-08-24 17:26:20 +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
3bd4e26956
added czech flag
2014-08-22 15:49:11 +01:00
James Allen
894024ba29
Don't allow folders to be moved into their child folders
2014-08-22 14:38:52 +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
dc5e1f71bd
Remove console.log debug line
2014-08-22 12:52:27 +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
4a19d6731a
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2014-08-21 13:03:54 +01:00
Henry Oswald
9bcf979e8a
changed title for restricted to use translations key
2014-08-21 13:03:51 +01:00
Henry Oswald
b9372e6dcd
added key for your projects
2014-08-21 13:02:28 +01:00
James Allen
e234d7831a
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-08-21 13:01:34 +01:00
James Allen
f093c99b96
Remove deprecated background dropbox polling logic
2014-08-21 13:01:27 +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
Henry Oswald
04e50f8ba6
changed cookie name from hard coded to be config option, defaults to sharelatex.sid
2014-08-20 18:01:21 +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
30a25297a0
changed translations to be back on master branch, want them to auto update. need to talk about it
2014-08-20 13:48:07 +01:00
Henry Oswald
21f288fbe5
missed off few tooltips in translation
2014-08-20 13:47:45 +01:00
Henry Oswald
b7cd4e5c79
add translations popup into editor
2014-08-20 13:03:55 +01:00
Henry Oswald
8e4974d559
fix more escaping html
2014-08-20 12:45:29 +01:00
James Allen
ab6cd36f27
Small tweaks to LaTeX mode
2014-08-20 10:02:38 +01:00
James Allen
cd51ba5f25
Merge pull request #100 from dfelder/patch-3
...
Latex mode for ace has new syntax highlighting
2014-08-20 09:45:55 +01:00
Henry Oswald
c1c46a36b9
render html of bonus page para
2014-08-20 08:14:36 +01:00
Daniel Felder
1d9e3f431c
Latex mode for ace has new syntax highlighting
...
This is an update to the latest version.
2014-08-19 22:33:09 +02:00
Henry Oswald
b5341e8a25
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2014-08-19 15:35:38 +01:00
Henry Oswald
6bb4c9867e
convert smoke cookie to be unsecure so curl will send it
2014-08-19 15:35:34 +01:00
James Allen
3d25018aa1
Release version 0.1.0
2014-08-19 14:45:24 +01:00
James Allen
00829f0fbd
Lock down module versions
2014-08-19 14:44:48 +01:00
James Allen
156c6ec4b6
Add PDF viewer label in
2014-08-19 14:40:10 +01:00
Henry Oswald
ca5b1e7422
cleaned up smoke tests
2014-08-19 14:35:20 +01:00
Henry Oswald
a082dd0f3b
use cookie domain in smoke test path
2014-08-19 12:05:07 +01:00
Henry Oswald
8895ceea35
write cookies to tmp for smoke test
2014-08-19 12:01:30 +01:00
Henry Oswald
83d8c48dc6
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2014-08-19 11:20:06 +01:00
Henry Oswald
523694c4ff
changed smoke tests to work with curl
...
this was needed as there is a bug with request/tough cookie with
multi subdomain cookies ie .sharelatex.com
https://github.com/goinstant/tough-cookie/issues/16
moving it to request in the future is probably a good idea, if we do move to
request then with the current issues we would we need to set
jar._jar.rejectPublicSuffixes = false
2014-08-19 11:17:51 +01:00
Henry Oswald
0dc4b3a01b
login works with curl
2014-08-19 10:54:33 +01:00
Henrique Dias
a3f9f5a729
fix identation
2014-08-18 14:35:16 -03:00
Henrique Dias
e0e9949da5
dynamic template menu by config settings
2014-08-18 14:26:47 -03:00
Henrique Dias
acf392eb4e
init chance in config
2014-08-18 13:59:34 -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
James Allen
9be7228247
Delay Dropbox polling by 5 seconds and dispatch only a single request
2014-08-14 13:48:23 +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
604505131b
Convert integer dropbox id to string when searching mongo
2014-08-13 17:34:45 +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
Henry Oswald
d033238efc
forgot to commit files
2014-08-13 16:04:23 +01:00
James Allen
2a6041752d
Remove unescaped strings on bonus page
2014-08-13 15:44:30 +01:00
Henry Oswald
9b2ce4860a
changed cookie lib from default angular to custom one so can set expires
2014-08-13 15:02:45 +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
f902cfdcf6
Monkey patch ace until cursor patches come from upstream
2014-08-12 12:33:12 +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
James Allen
b7ed3bab8f
Merge branch 'redis-queue'
2014-08-11 12:10:25 +01:00
Henry Oswald
f452f0ee19
don't escpae html on delete modal
2014-08-11 08:01:39 +01:00
Henry Oswald
cc71834e4e
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2014-08-08 14:43:14 +01:00
Henry Oswald
4c073ff285
render template name in CanonicalPage
2014-08-08 14:43:07 +01:00
James Allen
8320970a29
ngcloak template button while loading
2014-08-08 14:05:40 +01:00
James Allen
2ada8076d1
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-08-08 14:02:22 +01:00
James Allen
7e24972b46
Fix off by one error in track changes highlights
2014-08-08 14:01:30 +01:00
Henry Oswald
b41256b599
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2014-08-08 13:15:03 +01:00
Henry Oswald
b48ca2c7ed
fixed smoke test breaking on title, removed "the" as its not great for SEO (i think)
2014-08-08 13:11:49 +01:00
James Allen
b20934e579
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-08-08 11:42:02 +01:00
James Allen
10021986c5
Don't error on password reset if no email found, and translate error messages
2014-08-08 11:41:54 +01:00
Henry Oswald
b8c7163800
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2014-08-08 10:27:43 +01:00
Henry Oswald
66ba6e612d
Revert "send 401 when login fails"
...
This reverts commit fb901c6365d37654ba9058f57a71a4e60366688e.
2014-08-08 10:21:17 +01:00
James Allen
5ec1c59a31
Add in i18n defaults
2014-08-07 17:03:47 +01:00
James Allen
2730a2e73c
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-08-07 16:53:07 +01:00
James Allen
af1f0994af
Remove priority title stuff again
2014-08-07 16:53:01 +01:00
Henry Oswald
7976f2f0fe
send 401 when login fails
2014-08-07 16:28:00 +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
James Allen
0a44aa9e71
Push into doc updater queue rather than pub/sub for updates
2014-08-07 13:19:10 +01:00
James Allen
d0e51fb637
Fix context menu in firefox on windows
2014-08-06 15:49:40 +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
dc54fe3d2e
Fix Smoke test to use new title
2014-08-06 11:50:19 +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
377acfaa56
added default lang of en-US and translations package does the set lang based on subdomain
2014-08-05 11:15:17 +01:00
Henry Oswald
2be22d7ca7
cookies work accross different subdomains, added translations middlewear into stack to render based on domain
2014-08-04 16:47:14 +01:00
Henry Oswald
1e0652888a
removed console.log
2014-08-04 12:21:38 +01:00
Henry Oswald
687b3f2888
removed external libs for i18n which we no longer need
2014-08-04 12:18:45 +01:00
Henry Oswald
9b8d77cb0f
removed client side i18n as we don't really need it #wasteoftime
2014-08-01 14:49:43 +01:00
Henry Oswald
03db0bc797
added ugly dropdown for testing
2014-08-01 14:43:06 +01:00
Henry Oswald
d047d44079
Changed the error messages which are sent down to the client to be translated first
...
fixed up tests from titles we check when rendering, deleted them as they never
catch anything important, more hastle than they are worth imo.
2014-08-01 14:03:38 +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
13c6fcb8d9
Handle encoded parameters in request URL to wiki
2014-07-31 13:12:24 +01:00
James Allen
bc2147993a
Show project path in Dropbox folder
2014-07-31 13:04:55 +01:00
James Allen
e6c04bbeeb
Clear message from chat box immediately on pressing enter
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
James Allen
330d4f5a16
Redirect to cloned project after copy
2014-07-31 13:04:55 +01:00
James Allen
f886f19429
Keep root doc list in sync with file tree updates
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
94bcfc0eac
Only store host, not path in wiki URL setting
2014-07-30 15:56:27 +01:00
James Allen
eb483e0ecf
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-07-30 15:45:17 +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
4160101570
moved got link status outside of the if so if they are not registered we can start the link process
2014-07-30 10:44:46 +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
87aa860c87
Update about page css
2014-07-29 12:29:00 +01:00
James Allen
1f44cc4375
Fix alignment of 'view all templates'
2014-07-29 11:35:56 +01:00
James Allen
64f57562a2
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-07-29 11:25:46 +01:00
James Allen
627f9e47c6
Bring back Prof. Lion
2014-07-29 11:25:34 +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
df85254d3c
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-07-29 10:39:07 +01:00
James Allen
25205e3dda
Update to official mathjax cdn
2014-07-29 10:37:43 +01:00
Henry Oswald
f906d63067
added some logging around dropbox update
2014-07-29 10:32:11 +01:00
Henry Oswald
a62a8db0e0
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2014-07-29 10:29:46 +01:00
Henry Oswald
344d32d4e8
fixed email logo link
2014-07-29 10:29:40 +01:00