Henry Oswald
011bdc4617
explicitly set the file types to delete
...
the wild card version can get mixed up with app.del '/project/:project_id/contents/*', httpAuth, TpdsController.deleteProjectContents
2014-10-24 12:01:52 +01:00
Henry Oswald
0a123418ac
insert ref data into uni page
2014-10-23 14:13:40 +01: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
4bd0708029
put the compile group on the session so proxied requests are sent to the correct place
...
I know this is premature optimisation however we do make a lot of requests
to the clsi for each compile and this will save mongo a lot of calls
2014-10-21 09:34:58 +01:00
Henry Oswald
fb53be7ce4
Revert "priority compiles are proxyed to the priority servers"
...
This reverts commit 5375af085a1fc20def19a858e3f63c52f3bec9b0.
2014-10-21 09:16:23 +01:00
Henry Oswald
250606472d
priority compiles are proxyed to the priority servers
2014-10-20 17:48:00 +01:00
Henry Oswald
36136a99ca
fixed escaping of html
2014-10-20 15:46:42 +01:00
Henry Oswald
9be31a2ac1
removed type: from log lines
2014-10-20 14:24:39 +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
b9d6d5bbf1
set the request timeout to a few mins for the compile
2014-10-17 13:23:29 +01:00
Henry Oswald
e7906f7018
timeout option passed to clsi
2014-10-16 18:43:48 +01:00
Henry Oswald
7293ccf06d
if user has premium compile send them to a different server set
2014-10-16 17:52:21 +01:00
Henry Oswald
5a4a90924b
added default opts for users compile features
2014-10-16 16:57:51 +01:00
Henry Oswald
1506f86a5f
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2014-10-16 16:34:25 +01:00
Henry Oswald
d97e42a959
get users features for compile options i.e. timeout and which compiler
2014-10-16 16:34:21 +01:00
James Allen
8fa8a64c6f
Update email templates
2014-10-16 12:46:38 +01:00
James Allen
f3a1ba93a4
Fix argument signature of mergeUpdate and deleteUpdate
2014-10-16 11:43:54 +01:00
James Allen
46ecaf9f6c
Fix broken argument signature of addFolder
2014-10-16 11:27:10 +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
1b893ff502
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2014-10-15 16:22:01 +01:00
Henry Oswald
750b050358
added ab test in for multi currency
2014-10-15 16:21:45 +01:00
James Allen
7e9318814d
Send source of update to doc updater on setDocument request
2014-10-15 15:36:08 +01:00
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
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
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
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
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
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
82dc3cf654
Don't reload module views each request by default
2014-10-08 12:39:36 +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
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
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
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
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
ca402a3061
added some logging in for sessions
2014-09-08 17:45:37 +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
James Allen
971afb7342
Treat large text files as binary
2014-09-04 13:00:51 +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
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
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
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
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
Henry Oswald
ca5b1e7422
cleaned up smoke tests
2014-08-19 14:35:20 +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
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
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
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
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
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
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
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
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
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
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
94bcfc0eac
Only store host, not path in wiki URL setting
2014-07-30 15:56:27 +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
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
James Allen
fc7753d49d
Add in download PDF button
2014-07-28 17:24:43 +01:00
Henry Oswald
2267a484f4
added /home so in dev can easily see home page when logged in
2014-07-28 17:04:17 +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
Henry Oswald
b7c6af1341
/home goes to home page, so can look at it when logged in
2014-07-25 14:17:40 +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
17962426ea
blog returns 404's if the page does not exist in blog
2014-07-23 12:16:52 +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
Henry Oswald
46027128a4
change notifications email top header to the grey we use on the site
2014-07-21 15:52:55 +01:00
James Allen
1d6314a2c1
add Ctrl-Enter hotkey
2014-07-21 15:39:15 +01:00
James Allen
27795c451f
Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign
2014-07-21 15:12:00 +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
1322f3e183
Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign
2014-07-21 14:18:43 +01:00
Henry Oswald
375669cd3b
changed emails to adams design. Does not render brilliantly in gmail, but overall not bad.
2014-07-21 14:18:11 +01:00
James Allen
a3a5aa1c0d
Remove server-side santization of project name, it's all escaped client side now
2014-07-21 13:34:25 +01:00
Henry Oswald
792147fb46
Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign
2014-07-21 13:25:43 +01:00
James Allen
1c68ea7328
Don't care if user key has expired when we receive a cursor update
2014-07-21 13:16:07 +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
Henry Oswald
554fd7c7d0
change client connection timeout to 15 mins expire in redis
2014-07-17 16:03:53 +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
e0f1ed3c10
Use internal url for chat
2014-07-17 11:43:12 +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
f4b0dec1b8
changed api-key to read-only-api-key for angolia
2014-07-16 16:37:58 +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
Henry Oswald
cd60817592
made getting templates details parallel
2014-07-16 11:37:17 +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
91ca726e66
get template details now includes the markdown description of the project
2014-07-16 11:27:47 +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
9f82e63a8f
changed :project_id to :Project_id
2014-07-14 22:11:41 +01:00
Henry Oswald
0aa6a206e7
added name and email to connected user data and example get request for chat
2014-07-14 16:23:31 +01:00
Henry Oswald
4a71b38721
added route for getting connected users
2014-07-14 16:16:01 +01:00
Henry Oswald
e6dfef6225
added getting connected users controller
2014-07-14 16:01:58 +01:00
Henry Oswald
b0cf0666fa
changed the redis stuf to multi
2014-07-14 15:38:55 +01:00
Henry Oswald
d13676dab2
cursor data is stored in redis
2014-07-14 15:30:55 +01:00
Henry Oswald
61b7bea203
added ttl to the users set to keep redis clean from inactive projects
2014-07-14 13:20:29 +01:00
Henry Oswald
2b2b995340
refactored updateClientPosition to use async
2014-07-14 12:58:55 +01:00
Henry Oswald
5093820a5f
Merge branch 'master-redesign' into master-redesign-templates-and-blog
2014-07-14 12:42:03 +01:00
Henry Oswald
13aaf042d9
connected user manager logic works correctly
2014-07-14 12:41:06 +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
d737197e95
marksUserAsDisconnected -> markUserAsDisconnected
2014-07-10 17:01:42 +01:00
Henry Oswald
01ad313133
hooked up editor controller to connected users manager
2014-07-10 17:01:19 +01:00
Henry Oswald
e1dd58aca8
fixed algolia settings and removed some console.logs
2014-07-10 16:05:18 +01:00
Henry Oswald
4ccc56723f
added disconnect funtion in connected users manager
2014-07-10 16:05:05 +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
16e382bef2
Update Ace and fix autocomplete
2014-07-09 17:59:04 +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
8c56a46594
Merge branch 'master' into master-redesign
2014-07-08 13:24:48 +01:00
James Allen
2553f51e44
Remove unused subscription downgrade logic
2014-07-08 12:55:29 +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
Henry Oswald
d1f907cee5
first simple version of tracking who is active in the editor
2014-07-04 16:18:46 +01:00
James Allen
773b457d24
Group messages from the same person together
2014-07-04 15:46:21 +01:00
Henry Oswald
de010cf971
added error logging
2014-07-04 13:29:59 +01:00
Henry Oswald
0d02241b46
linked chat into the editor real time contorller
2014-07-04 13:20:30 +01:00
Henry Oswald
86a9d08e5c
Merge branch 'master-redesign' into master-redesign-templates-and-blog
2014-07-04 13:06:47 +01:00
Henry Oswald
9c35cfd693
very start of chat controllers done
2014-07-04 13:05:55 +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
Henry Oswald
77246b2a07
added query string support onto get requests for limit and before
2014-07-02 17:37:30 +01:00
Henry Oswald
8670b543b9
added basic chat handler
2014-07-02 17:28:05 +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
Henry Oswald
8f6dac77d0
added asset proxying from templates in, used for old images etc which people linked to
2014-07-01 16:00:42 +01:00
James Allen
7cfbaaca36
Style settings side panel
2014-07-01 15:57:55 +01:00
Henry Oswald
978e3262b5
added redirects from config file in, used for old template paths
2014-07-01 15:44:12 +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
Henry Oswald
53fa15d3db
added basic error handling around templates rendering
2014-06-30 17:27:13 +01:00
Henry Oswald
27a97b7fa8
build titles for tempaltes page in web
2014-06-30 17:19:25 +01:00
Henry Oswald
b80f751cb2
templates works basically, needs error handling and few little improvments
2014-06-30 17:08:54 +01:00
James Allen
797dcf5c84
Jump to error when clicking on log entry
2014-06-30 13:41:32 +01:00
James Allen
8b6f962275
Allow clearing of aux files
2014-06-30 12:36:17 +01:00
James Allen
aee7b5477b
View raw log and download aux files
2014-06-30 12:05:43 +01:00
James Allen
32d1642b9e
Get basic compile/errors/autocompile working
2014-06-30 11:35:32 +01:00
James Allen
0a0719cf7b
Sort of out styling of log entries
2014-06-29 14:22:08 +01:00
James Allen
25a4be408a
Get PDF controls working
2014-06-28 15:43:44 +01:00
James Allen
9c9de35918
Set up basic PDF viewer
2014-06-28 13:25:06 +01:00
James Allen
845c4a7297
Get layout and resize logic working for PDF view
2014-06-28 12:07:18 +01:00
James Allen
3b57d62de2
Refactor project list select all to use linked directives
2014-06-27 21:19:14 +01:00
James Allen
75f1fb54b6
Allow restoring of deleted files
2014-06-27 17:11:26 +01:00
James Allen
562f28f412
Fix resizing and dragging issues
2014-06-27 15:55:08 +01:00
James Allen
b07def6901
Get infinite scroll auto-loading of track changes workikng
2014-06-27 15:45:14 +01:00
James Allen
7af839215f
Don't show cursor in track-changes diff
2014-06-27 14:46:39 +01:00
James Allen
5cbf600f05
Improve labelling of track changes diffs
2014-06-27 14:35:46 +01:00
James Allen
b7adaf9f87
Display diffs
2014-06-27 12:45:37 +01:00
James Allen
28f8c9e055
Get hover state working
2014-06-26 17:22:06 +01:00
James Allen
60e5542f35
Get basic track changes list working
2014-06-26 16:39:52 +01:00
James Allen
afb953a489
Display cursor name labels
2014-06-26 11:19:05 +01:00
James Allen
70f64ee20c
Update securty page
2014-06-26 08:52:42 +01:00
James Allen
c14774bedd
Get basic cursor updating going on
2014-06-25 18:17:17 +01:00
James Allen
703a4faa0e
Code tidy up of ace editor directive
2014-06-25 16:46:28 +01:00
James Allen
5922ed45ee
Get spell check working in new editor
2014-06-25 16:06:04 +01:00
James Allen
9dfbb36a83
Update project settings over http
2014-06-25 13:51:02 +01:00
James Allen
adcea19dca
update security page
2014-06-25 12:15:45 +01:00
James Allen
d214b5dc5e
Merge branch 'master' into master-redesign
2014-06-25 12:14:26 +01:00
James Allen
341570d85d
Be more verbose with ip debug output
2014-06-25 11:06:04 +01:00
James Allen
5aa7daa951
Fix password reset rate limit to work on ip, not email which changes every request
2014-06-25 10:46:58 +01:00
James Allen
cb682ac584
Add in more robust support for being behind a proxy
2014-06-25 10:34:23 +01:00
James Allen
d2ac9a1e9f
Add in auto complete
2014-06-24 21:09:20 +01:00
James Allen
f154f17704
Wire up fontSize and mode settings
2014-06-24 20:46:00 +01:00
James Allen
5cef41fdbd
Allow selecting of theme
2014-06-24 20:28:53 +01:00
James Allen
71ca8f63ed
Improve reconnection and loading display and logic
2014-06-24 17:44:46 +01:00
James Allen
2520651ef2
Automatically open previously open doc
2014-06-24 17:15:27 +01:00
James Allen
35c7f27788
Record last updated date for reconnecting
2014-06-24 16:56:31 +01:00
James Allen
f727bb775d
Show and preform auto-reconnect
2014-06-24 16:33:36 +01:00
James Allen
a1b715d1e9
Add in undo manager
2014-06-24 15:31:44 +01:00
James Allen
cc0d45c678
Add right click to file tree
2014-06-23 17:25:45 +01:00
James Allen
a83f0fe054
Add in dropdowns to file tree
2014-06-23 12:37:05 +01:00
James Allen
2d6816b013
Highlight name when renaming or creating new file
2014-06-23 11:25:36 +01:00
James Allen
a2663c0f32
Get drag and drop moving working
2014-06-23 10:57:31 +01:00
James Allen
84ac77795f
Delete files
2014-06-22 20:49:58 +01:00
James Allen
7556af6421
Listen for rename changes from server
2014-06-22 20:21:31 +01:00
James Allen
242a866bce
Rename files
2014-06-22 20:08:56 +01:00
James Allen
f1eee96c85
Allow uploading
2014-06-22 17:32:15 +01:00
James Allen
f931df6084
Allow creation of folders
2014-06-22 14:39:38 +01:00
James Allen
f41534ee4d
Add in creating of files to editor
2014-06-22 12:10:42 +01:00
James Allen
6d0053e709
Start rebuilding editor
2014-06-21 22:20:37 +01:00
James Allen
0d70777f7f
Fix JS errors in loading editor
2014-06-21 11:56:58 +01:00
James Allen
e5ca033538
Add in configurable headings/footers
2014-06-20 21:35:42 +01:00
James Allen
a64b9eb82e
Create and style external pages
2014-06-20 17:17:24 +01:00
James Allen
1980ffec09
Wire up delete and unsubscribe in account settings
2014-06-20 15:48:00 +01:00
James Allen
a2bb89b579
Merge branch 'master' into master-redesign
2014-06-20 11:18:43 +01:00
James Allen
81845dec32
Wire up account settings forms
2014-06-20 11:15:25 +01:00
James Allen
0ef7e54ad3
Allow partial updates to user settings
2014-06-20 09:42:43 +01:00
James Allen
63f958af07
Improve styling
2014-06-19 13:30:45 +01:00
James Allen
1bcc0a4554
Send 204 rather than redirect when leaving a project
2014-06-19 13:11:01 +01:00
James Allen
e07aa9165f
Queue up http requests so we can fire them in parallel without a problem
2014-06-19 13:03:34 +01:00
Henry Oswald
85befe0d57
listen on stdout when unzipping, unsticks some zips for some reason...
2014-06-18 18:18:49 +01:00
James Allen
70673d2881
Cloak project page while loading
2014-06-18 16:49:29 +01:00
James Allen
ad74cf2464
Add tooltips
2014-06-18 16:46:56 +01:00
James Allen
5513a0b436
Hook up front end download
2014-06-18 16:43:37 +01:00
James Allen
2b349039c3
Add in backend multiple project downloading
2014-06-18 16:37:18 +01:00
James Allen
b837a4e9f3
Merge branch 'master' into master-redesign
2014-06-18 15:26:09 +01:00
James Allen
618b6a7849
Apply form validations
2014-06-18 15:23:00 +01:00
Henry Oswald
2a6ff8cc5d
changed team@sharelatex.com to support@sharelatex.com
2014-06-18 14:47:29 +01:00
James Allen
04d3e5cfe1
Allow project search to be cleared
2014-06-18 11:53:18 +01:00
James Allen
9a03411d42
Don't show tags which are empty when loaded
2014-06-18 11:30:56 +01:00
James Allen
70c51cb947
Merge branch 'master' into master-redesign
2014-06-18 10:56:30 +01:00
Henry Oswald
e0be5ef01b
added timeouts to email and newsletter as after a few days there are a few open connections still
2014-06-17 18:18:45 +01:00
James Allen
750b524771
Don't get user id from possibly deleted session
2014-06-17 17:45:07 +01:00
James Allen
5ce319f8d9
Use ng-cloak rather than a loading spinner
2014-06-17 16:43:33 +01:00
James Allen
525581bada
Add in test loading spinner
2014-06-17 16:36:08 +01:00
Henry Oswald
426b699865
links in emails use site url
2014-06-17 16:28:52 +01:00
James Allen
aa8969c652
Merge and fix external forms
2014-06-17 16:19:40 +01:00
Henry Oswald
e1c8dc943e
added defaults of empty string into user profile, also changed account -> profile in message
2014-06-17 14:36:17 +01:00
James Allen
012371333f
Wrap project list code in require.js
2014-06-17 12:43:42 +01:00
Henry Oswald
2d55f080d6
get algolia to pull app id and api key from settings file
2014-06-17 12:25:49 +01:00
Henry Oswald
cc1b9472b2
don't show the user details area on project list if algolia instituions has not be setup
2014-06-17 11:59:57 +01:00
James Allen
c56648ab80
Merge branch 'master' into master-redesign
...
Conflicts:
app/views/project/list.jade
public/coffee/list.coffee
public/stylesheets/less/list.less
public/stylesheets/less/style.less
2014-06-17 11:54:29 +01:00
Henry Oswald
3350b99ccf
removed a couple of annoying console.log logs
2014-06-17 10:26:56 +01:00
Henry Oswald
f18172258e
focus on first element in form when showing
2014-06-16 16:22:45 +01:00
James Allen
608e9476b6
Show confirmation for deleting projects forever
2014-06-16 16:17:28 +01:00
Henry Oswald
7355a912b6
recomend roles and still show form when complete
2014-06-16 16:14:58 +01:00
James Allen
0a334939ce
Confirm deletes and leaves
2014-06-16 16:13:09 +01:00
James Allen
3a969876e0
Allow cloning of projects
2014-06-16 15:32:20 +01:00
James Allen
8bb181a465
Don't allow renaming of shared proejcts
2014-06-16 15:12:10 +01:00
James Allen
81ee0f4342
show and restore archived projects
2014-06-16 15:06:58 +01:00
Henry Oswald
a1055b226c
uses angular autocomplete modules
2014-06-16 14:49:35 +01:00
James Allen
802aae6148
Show partial folder selection state
2014-06-16 14:45:47 +01:00
James Allen
65a1f03768
Send project owner details to client
2014-06-16 13:34:38 +01:00
James Allen
9c5f63817e
Send accessLevel info to client
2014-06-16 12:47:39 +01:00
James Allen
63525a8bef
Use angular boostrap instead of vanilla bootstrap
2014-06-16 12:26:35 +01:00
James Allen
95ee8c772a
Fix modal styling
2014-06-16 11:30:54 +01:00
Henry Oswald
09f5a67f9b
got autocomplete presented correctly
2014-06-13 17:17:58 +01:00
James Allen
b9944ca2dc
Hook up file uploads
2014-06-13 17:11:36 +01:00
James Allen
8b57224267
Allow creation of projects
2014-06-13 16:05:44 +01:00
James Allen
ab5d6f82c0
Allow deleting of projects
2014-06-13 15:24:20 +01:00
James Allen
751572c977
Only show actions buttons when projects are selected
2014-06-13 14:28:16 +01:00
James Allen
db74e89f99
Add folder labels next to the project name
2014-06-13 14:14:56 +01:00
James Allen
290089407d
Allow creation of new tags
2014-06-13 13:55:55 +01:00
James Allen
5fbbf6c452
Allow filtering by folder
2014-06-12 16:21:12 +01:00
Henry Oswald
68cc7d85bf
working with requirejs
2014-06-12 15:50:00 +01:00
James Allen
6305ac16f4
Work in progress of doing project list with Angular
2014-06-12 15:22:49 +01:00
Henry Oswald
f4cecb6591
moved alert to lower level so its hidden when not needed
2014-06-12 13:42:36 +01:00
Henry Oswald
6836aabac3
fiddled with the css
2014-06-12 11:22:18 +01:00
Henry Oswald
c075716b0f
cleaned it up a touch, showed how to handle http errors
2014-06-12 10:23:42 +01:00
Henry Oswald
6dc1e54dc7
basic example using angular done
2014-06-11 17:45:09 +01:00
James Allen
067d343928
Display list of tags
2014-06-11 16:32:56 +01:00
Henry Oswald
e099a4a100
added default of empty string to user details, fixed route as well
2014-06-11 15:14:07 +01:00
James Allen
1eaba59df0
Use Ember to load project list
2014-06-11 14:52:23 +01:00
Henry Oswald
473da4fa4c
endpoint for user details is written
2014-06-11 12:46:28 +01:00
James Allen
99705ebb4f
Merge branch 'master' into master-redesign
2014-06-11 12:38:59 +01:00
Henry Oswald
3aff131428
added controller endpoint for updating user personal info
2014-06-10 22:26:43 +01:00
Henry Oswald
560288348a
moved delete project inside the editor to the http endpoint
2014-06-10 18:28:45 +01:00
Henry Oswald
dabed896be
lowercase password reset email
2014-06-10 17:54:29 +01:00
James Allen
2c73ca509b
Style account settings page (doesn't actually work yet)
2014-06-09 10:56:26 +01:00
James Allen
05b8bc36ec
Style password resets
2014-06-09 10:25:38 +01:00
James Allen
d3221f1cf1
Style login and register forms
2014-06-09 10:19:02 +01:00
James Allen
ead812eacc
Style folder list
2014-06-09 09:11:42 +01:00
James Allen
68aff781af
Sort out style of project list
2014-06-09 08:51:12 +01:00
James Allen
3cbf5fa4f4
More style tweaks to the project page
2014-06-06 19:37:04 +01:00
James Allen
ad9121f10d
More style improvements
2014-06-06 19:19:53 +01:00
James Allen
4f05926113
Get project page mostly styled
2014-06-06 17:47:52 +01:00
James Allen
0a1f1b8f38
Sort out responsive navbar
2014-06-06 16:37:59 +01:00
James Allen
b6217c401e
Merge branch 'master' into master-redesign
...
Conflicts:
public/stylesheets/less/trackchanges.less
2014-06-06 15:10:57 +01:00
James Allen
521befddd3
Merge pull request #76 from dfelder/patch-1
...
Ignore commented lines when setting root doc #52
2014-06-06 14:53:03 +01:00
James Allen
4fbebfbdc6
Tidy up styles
2014-06-06 14:43:45 +01:00
James Allen
5c27ff4430
Don't show diffs of deleted docs (much simpler)
2014-06-06 14:43:45 +01:00
James Allen
02f48be825
Allow docs to be restored
2014-06-06 14:43:45 +01:00
James Allen
cabaf1ae1a
Show deleted documents when viewing history
2014-06-06 14:43:45 +01:00
Daniel Felder
1d12b88b09
Ignore commented lines when setting root doc #52
...
Same code I used in public/coffee/pdf/CompiledView.coffee. I didn't test it locally though.
2014-06-05 18:00:07 +02:00
Henry Oswald
22c467c231
Merge pull request #75 from dfelder/master
...
compile current file if top level document #42
2014-06-05 16:42:10 +01:00
James Allen
72939e7dd8
Import new navbar design
2014-06-04 17:46:22 +01:00
James Allen
024e21e0ae
Upgrade Jade
2014-06-04 16:28:20 +01:00
James Allen
43684fda3a
Move to bootstrap 3 (site barely functional)
2014-06-04 16:14:35 +01:00
James Allen
2fb8620ba0
Allow deleting of projects forever
2014-06-04 12:45:04 +01:00
James Allen
4b8f57de80
Add in archived projects link
2014-06-04 11:58:53 +01:00
James Allen
b95c9e1d0a
Find file path and act on it one after the other to avoid race condition
2014-06-04 11:46:01 +01:00
James Allen
015fd6873f
Allow projects to be restore after being deleted
2014-06-03 17:35:44 +01:00
Daniel Felder
4320b790bd
adjusting unit tests
2014-06-01 19:26:33 +02:00
Daniel Felder
5ad0ca08f9
adjusting unit tests
2014-06-01 18:16:05 +02:00
Daniel Felder
f03b2df461
compile current file if top level document #42
2014-06-01 16:43:52 +02:00
James Allen
80c58bb718
Remove deprecated versioning code
2014-05-27 12:56:23 +01:00
James Allen
c1afbc66d9
Don't error if user is not logged in when compiling
2014-05-27 12:33:56 +01:00
James Allen
8f41c6dcb2
Don't automatically clear the cache
2014-05-21 15:20:25 +01:00
Henry Oswald
fd53cf0124
tell tpds sender to use pub url for docstore
2014-05-21 09:15:50 +01:00
James Allen
063f6c7680
Only auto clear CLSI cache on hard error, otherwise prompt user
2014-05-21 08:04:52 +01:00
Henry Oswald
57eb0e2006
Revert "Revert "changed docstore url to /raw for tpds updates""
...
This reverts commit 4af4ff34b0ebad0ce9056a1c1dd5e20f12f6096d.
2014-05-20 13:19:02 +01:00
Henry Oswald
ed9e25450a
Revert "Revert "change send doc lines using tpds to work with stream and doc store""
...
This reverts commit a41299570d07b83111b6a995902a30a67867a5c7.
2014-05-20 13:18:59 +01:00
James Allen
93d418b716
Revert "change send doc lines using tpds to work with stream and doc store"
...
This reverts commit ba37710b087b4919c01eed3d8cfeb9d61af43a4d.
2014-05-20 11:14:06 +01:00
James Allen
22c577f9b5
Revert "changed docstore url to /raw for tpds updates"
...
This reverts commit f9e60db892d270811c5e38f273d8a1b62b86eeb2.
2014-05-20 11:13:57 +01:00
Henry Oswald
2398b34f28
changed docstore url to /raw for tpds updates
2014-05-20 08:32:39 +01:00
Henry Oswald
d32fe588b7
change send doc lines using tpds to work with stream and doc store
2014-05-19 20:32:48 +01:00
James Allen
a45200dfe3
Automatically clear CLSI cache when compile fails
2014-05-19 16:10:52 +01:00
James Allen
7fed2155be
Differentiate between timeouts, server errors, and LaTeX failures in client
2014-05-19 16:10:52 +01:00
James Allen
6c5a2c2740
Reconfigure internal CLSI call to understand more than just success/failure
2014-05-19 16:10:52 +01:00
Henry Oswald
a53d767eca
changed 412 status code to 400
2014-05-19 14:02:54 +01:00
Henry Oswald
de38cbf595
destroy session when getting project details
2014-05-19 12:01:05 +01:00
Henry Oswald
af2de3cdeb
finished off change email
2014-05-19 11:50:32 +01:00
Henry Oswald
7437115967
added controler t change user email
2014-05-16 17:45:48 +01:00
Henry Oswald
c4a420bd7f
writen function to set the user email safely
2014-05-16 17:29:54 +01:00
James Allen
a62bff5052
USe parallel limit on zip file streaming
2014-05-16 11:50:15 +01:00
Henry Oswald
221c2214dd
changed class from email to password on form
2014-05-16 11:30:44 +01:00
Henry Oswald
50df82697a
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-05-16 11:27:09 +01:00
James Allen
2104c69cb9
Stream files into zip in series
2014-05-16 11:26:58 +01:00
Henry Oswald
9419d3a0e5
hooked up the frount end ui to show the email can not be found,
...
added client side valdidation on password, removed server side min
length check. Just check that it is not 0 len
2014-05-16 11:26:29 +01:00
James Allen
240dc2e319
Use crypto.randomBytes
2014-05-16 10:52:31 +01:00
Henry Oswald
9c3c57f2a8
renamed TokenGenerator to PasswordResetTokenHandler and added Expire to function name
2014-05-16 10:43:55 +01:00
Henry Oswald
bf1bb22afd
added rate limiting to password reset endpoint
2014-05-16 10:31:33 +01:00
Henry Oswald
133c4759f8
fix tests, whoops
2014-05-15 18:26:00 +01:00
Henry Oswald
e1b3f3542c
added some logging
2014-05-15 18:14:05 +01:00
Henry Oswald
24c50189b6
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-05-15 18:01:49 +01:00
Henry Oswald
f7245f32d0
cleaned up old password reset cruft
2014-05-15 18:01:43 +01:00
Henry Oswald
96d98329f1
token based reset works
2014-05-15 17:58:25 +01:00
Henry Oswald
1ffd19099b
writen getUserIdFromToken
2014-05-15 17:20:42 +01:00
Henry Oswald
9f901fb1ba
added the token generator and its getNewToken function
2014-05-15 17:16:20 +01:00
Henry Oswald
64688e661d
written password reset controller
2014-05-15 16:50:38 +01:00
James Allen
e72dd50089
Use configurable uploads folder location
2014-05-15 16:32:17 +01:00
Henry Oswald
551e1d465a
written password reset handler
2014-05-15 16:20:23 +01:00
James Allen
93883c7a03
Fix calling of updateDoc
2014-05-15 15:43:04 +01:00
James Allen
f6e85c4140
Don't proxy version number to/from docstore
2014-05-15 12:44:08 +01:00
James Allen
4a27342b01
Merge branch 'docstore_integration'
2014-05-12 14:23:41 +01:00
James Allen
0bddc5552e
Use docstore for updating documents
2014-05-08 15:47:50 +01:00
James Allen
8315de58c7
Proxy get doc requests to the docstore
2014-05-08 13:42:30 +01:00
Henry Oswald
9a81f85b41
added gauge metrics for number of open socket.io http and https
...
connections
2014-05-08 11:33:46 +01:00
Henry Oswald
a8571653db
added timeouts to filestore handler
2014-05-08 10:55:44 +01:00
James Allen
b29e94b4d5
Use new metrics package
2014-05-07 15:29:04 +01:00
James Allen
c73b7fae69
Use docstore when creating a new doc
2014-05-07 14:31:46 +01:00
James Allen
628fb65bc3
Work with ObjectId's passed to ProjectGetter
2014-05-06 13:34:37 +01:00
James Allen
2fb8b0e807
Get project without doc lines in getAllFolders
2014-05-06 13:15:18 +01:00
James Allen
6a2370b5be
Use docstore for CLSI request building
2014-05-06 12:54:26 +01:00
James Allen
ca6be52fa0
Revert "Revert "Get doclines from docstore when cloning project""
...
This reverts commit ff79e4d2e659751ec88b3791566f3de24e6b67f4.
2014-05-06 12:36:00 +01:00
James Allen
8af372aff3
Revert "Revert "Get doc lines from docstore when performing batch operations""
...
This reverts commit a700665650b5984fdb3afe5565d62ba810100ebe.
2014-05-06 12:35:27 +01:00
James Allen
9be4feaae1
Revert "Get doc lines from docstore when performing batch operations"
...
This reverts commit 9fab27158cb02b0268f8e6aec090f275f062d885.
2014-05-01 17:19:21 +01:00
James Allen
fee632cfc9
Revert "Get doclines from docstore when cloning project"
...
This reverts commit 9ab3f5b3fba8a1324c576bbdb9614f70f4c719aa.
2014-05-01 17:19:09 +01:00
James Allen
82b56d0b4f
Get doclines from docstore when cloning project
2014-04-30 16:45:53 +01:00
James Allen
465b5ca9db
Get doc lines from docstore when performing batch operations
2014-04-30 15:49:07 +01:00
Henry Oswald
3b1cc6e500
removed metrics from http logging but added key in
...
having the key in there means its easy to analyise the logs based on the
route
2014-04-30 13:14:41 +01:00
James Allen
355a5a020e
Keep reference to deleted docs and delete via docstore
2014-04-30 11:15:29 +01:00
James Allen
0c0548ea85
Don't crash when route path is a regex
2014-04-30 09:42:20 +01:00
James Allen
f8dec76464
Add DocstoreManager
2014-04-29 17:22:37 +01:00
Henry Oswald
0b93a719f0
added statsd metrics timing for each request
2014-04-29 15:20:31 +01:00
Henry Oswald
2cdadf1a4b
check for error when doing a password reset
2014-04-29 11:59:23 +01:00
Henry Oswald
8cc055422c
removed word project from the label on project actions button
2014-04-29 11:37:02 +01:00
Henry Oswald
7896a8b85c
changed order of project list button menu
2014-04-29 11:11:20 +01:00
Henry Oswald
bf2c60f84d
added rename project to list page
2014-04-28 17:47:47 +01:00
Henry Oswald
3655e83ff9
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-04-28 16:27:19 +01:00
Henry Oswald
a0fb170878
updated archive module to latest version
2014-04-28 16:27:15 +01:00
James Allen
64ab1a4f59
Remove restore warning message
2014-04-28 12:54:16 +01:00
James Allen
d528ac21a3
Mark projects as archived, but don't actually delete them
2014-04-28 12:53:43 +01:00
Yimin
295b438498
fix typo
2014-04-22 04:21:42 -05:00
Henry Oswald
0a093b779e
fixed #100 , if tags is not running you should be able to delete a project still
2014-04-16 17:44:57 +01:00
Henry Oswald
8795a8a921
if retore url is not in mongo don't blow up
2014-04-15 14:19:20 +01:00
Henry Oswald
4b11790a54
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-04-15 13:59:04 +01:00
Henry Oswald
aca2e5639e
added referal allocator to user controller
2014-04-15 13:59:00 +01:00
James Allen
c249ea91f9
Restore button doesn't work
2014-04-14 06:28:36 +01:00
James Allen
ea651ee9bd
Add in restore page
2014-04-14 06:17:07 +01:00
James Allen
6aee795e67
Add project URL to message
2014-04-14 00:03:42 +01:00
James Allen
c750797ca4
Update message
2014-04-13 23:38:44 +01:00
Henry Oswald
c2cb6e2c1f
updated wording again
2014-04-13 23:18:13 +01:00
Henry Oswald
255b932079
added message explainging potential data reverted
2014-04-13 22:59:41 +01:00
Henry Oswald
c23f9aa056
be able to get build templates from web as well as templates
2014-04-11 15:15:32 +01:00
Henry Oswald
dbe2dd3078
fix case problem with require of newsletter manager
2014-04-10 22:21:20 +01:00
Henry Oswald
51e69392a7
cleaned up and fixed problem with open user opening pojrect
2014-04-10 17:49:39 +01:00
Henry Oswald
9355632f30
deleted user controller. The end of /controllers
2014-04-10 17:29:46 +01:00
Henry Oswald
f7ea925e67
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-04-10 17:26:14 +01:00
Henry Oswald
5df01acfe1
moved reset password to new controler, not tests as it will be rewritten soon. Just want to kill off /controllers
2014-04-10 17:26:09 +01:00
Henry Oswald
5760e51d6e
moved password change to new user controller with tests
2014-04-10 17:15:18 +01:00
Henry Oswald
cc68fe443f
Moved register function into user registration handler and new user
...
controller
2014-04-10 16:32:47 +01:00
James Allen
573c877a57
Remove unneeded/broken stream.resume()
2014-04-10 12:57:49 +01:00
James Allen
049dcc2780
Split lines on Windows line endings too
2014-04-10 12:45:42 +01:00
Henry Oswald
2ca7c344a3
reformtted reg handler tests
2014-04-10 12:39:13 +01:00
Henry Oswald
b6b30c3d37
moved logout to new user controller
2014-04-09 16:59:28 +01:00
Henry Oswald
bb7025ad6e
moved user update user settings to user controller
2014-04-09 16:33:54 +01:00
Henry Oswald
bcfc1bee0c
moved unsubscribe endpoint to new user controller
2014-04-09 15:41:19 +01:00
Henry Oswald
026ad8089d
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-04-09 15:04:51 +01:00
Henry Oswald
12773c26c2
moved user settings page to the user pages controller
2014-04-09 15:04:47 +01:00
Henry Oswald
823f4a5eb9
created new UserController and put delete user in it
2014-04-09 14:50:12 +01:00
Henry Oswald
37fb959b00
renamed UserController to UserInfoController
2014-04-09 14:45:46 +01:00
Henry Oswald
c55c5032b0
moved delete user to the user controller
2014-04-09 14:43:08 +01:00
James Allen
79cb8270e5
Add in floating buttons for syncing between code and PDF
2014-04-09 12:35:33 +01:00
Henry Oswald
5f72f13528
moved password reset to user pages controller
2014-04-09 12:26:59 +01:00
Henry Oswald
434fca8874
moved login page to new user page controller
2014-04-09 12:22:57 +01:00
Henry Oswald
fa36891faf
moved register page to new UserPagesController
2014-04-09 12:17:50 +01:00
Henry Oswald
c163bba1da
populate users on a project in parallelLimit
2014-04-09 11:49:28 +01:00
Henry Oswald
47fb623c4b
dont call enable versioning on join project
2014-04-09 11:45:57 +01:00
Henry Oswald
cba3644777
updated building proj from template, no longer suport other domains and work in different envs
2014-04-09 08:24:23 +01:00
Henry Oswald
0668dec65e
killed project controller
2014-04-08 21:24:33 +01:00
Henry Oswald
5ac1b59a78
added err check to project list page
2014-04-08 21:06:01 +01:00
Henry Oswald
811859a4a1
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-04-08 20:52:06 +01:00
Henry Oswald
71af89902d
removed the buffering from update merger, shouldn't be needed in node 0.10
2014-04-08 20:52:02 +01:00
Henry Oswald
c0780f5a67
made project page load faaaaaaster
2014-04-08 18:02:16 +01:00
Henry Oswald
88ba45b9dc
moved load project from old proj controller to new one
2014-04-08 17:44:31 +01:00
Henry Oswald
a6bd916fbf
refactored project list, and updated sig for findAllUsersProjects to include err
2014-04-08 16:56:34 +01:00
James Allen
374cf99ef2
Double click on PDF syncs with code
2014-04-08 16:49:21 +01:00
Henry Oswald
0c921d9188
moved project list to new project controller and added tests
2014-04-08 16:40:12 +01:00
Henry Oswald
6b6c447901
clened up new project controller
2014-04-08 15:28:18 +01:00
Henry Oswald
15bddae931
moved new project from old proj controller to new one with test
2014-04-08 15:25:27 +01:00
Henry Oswald
6f84f4214f
moved clone project from old proj controller to new one with test
2014-04-08 14:53:33 +01:00
Henry Oswald
5b757ac7ab
moved delete project from old proj controller to new one with test
2014-04-08 14:34:03 +01:00
Henry Oswald
bc07525d71
broken dropbox endpoints for user into its own controller
2014-04-07 21:49:22 +01:00
Henry Oswald
6891d1bfb5
killed off project handler, also removed unused changeUsersPrivilegeLevel
2014-04-07 20:54:06 +01:00
Henry Oswald
248e81407a
leaving project fades it out from the list fix
2014-04-07 20:47:29 +01:00
Henry Oswald
430cf5cea8
created CollaboratorsHandler
2014-04-07 20:46:58 +01:00
Henry Oswald
ff88849444
added a change privlage level for user to new collab handler, won't work yet but is starting point
2014-04-07 16:54:51 +01:00
Henry Oswald
fa78db5c59
moved setPublicAccessLevel to project details handler
2014-04-07 16:07:44 +01:00
Henry Oswald
d229269a69
moved rename project to project details handler
2014-04-07 15:37:40 +01:00
Henry Oswald
9134fa7b4c
moved deleteProject to the project deleter
2014-04-07 13:47:10 +01:00
Henry Oswald
5378890e57
moved rename entity to proj entity handler
2014-04-07 12:18:24 +01:00
Henry Oswald
f28bd33168
remove confirmFolder from project handler, not used.
2014-04-07 12:01:10 +01:00
Henry Oswald
439d38441f
removed old getRawLogs socket.io endpoint
2014-04-07 11:59:49 +01:00
Henry Oswald
976054377d
removed unused getProject from projectHandler
2014-04-07 11:59:31 +01:00
Henry Oswald
4ff8b48d85
generate random password with uuid
2014-04-07 11:14:50 +01:00
Henry Oswald
1ce1a82617
moved admin controller into different feature
2014-04-07 11:02:12 +01:00
Henry Oswald
73bbd5b495
moved info and home controller into static page feature
2014-04-07 10:55:07 +01:00
Henry Oswald
abbbdf463f
Merge branch 'master' into i18n
...
Conflicts:
package.json
2014-04-07 09:53:03 +01:00
Henry Oswald
b36ced3058
only poll dropbox users who have the dropbox feature
2014-04-05 12:14:50 +01:00
Henry Oswald
33b6626fd9
killed CollaberationManager R.I.P
2014-04-04 17:08:14 +01:00
Henry Oswald
90eac4d52c
moved setRootDoc from collab manager to editor controller
2014-04-04 16:59:45 +01:00
Henry Oswald
7c10b5cd24
moved setPublicAccessLevel from collab manager to editor controller
2014-04-04 16:53:59 +01:00
Henry Oswald
08d1eeba78
moved renameProject from collab manager to editor controller
2014-04-04 16:49:44 +01:00
Henry Oswald
d684f04d4f
moved moveEntity from collab manager to editor controller
2014-04-04 16:40:53 +01:00
Henry Oswald
88e47bbe12
moved renameEntity from collab manager to editor controller
2014-04-04 16:35:02 +01:00
Henry Oswald
3983e77b73
move deleteProject from collab manager to editor controller
2014-04-04 16:21:30 +01:00
Henry Oswald
68271b04f9
deleted guid manager
2014-04-04 15:58:59 +01:00
Henry Oswald
615e05cb89
moved newsletter manager into its own feature
2014-04-04 15:47:27 +01:00
James Allen
e9309532d3
Make greyed out background the default track changes prompt
2014-04-04 10:39:56 +01:00
James Allen
186e39c202
Remove external ShareLaTeX pages
2014-04-03 11:43:04 +01:00
Henry Oswald
479b37a48c
null check user when getting user id from session
2014-04-02 15:56:54 +01:00
Henry Oswald
bd118a57c2
set compile throttle back to 10
2014-04-02 12:18:24 +01:00
Henry Oswald
250ce20ec0
fix wrong paths for couple of assets img -> brand
2014-04-02 12:08:54 +01:00
Henry Oswald
6c700b1b6b
updated more modules, mongojs and redis are the big ones
2014-04-01 16:23:13 +01:00
Henry Oswald
8ce13a6b1e
changed xss lib to sanitize not validator
2014-03-31 16:46:28 +01:00
Henry Oswald
077266b7c9
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-03-31 10:55:09 +01:00
Henry Oswald
cd683cc719
check user isn't null in project controller
2014-03-31 10:54:49 +01:00
James Allen
2ca70f25f6
Make track changes default with override for old history
2014-03-31 09:47:36 +01:00
James Allen
3b079cde92
Change CLSI proxy errors to warnings
2014-03-28 16:04:44 +00:00
James Allen
6318d9ace1
Return features along with project details
2014-03-28 12:47:15 +00:00
James Allen
31f39dada1
Allow multi select of users in group page
2014-03-28 12:07:30 +00:00
James Allen
cc522f5d07
Add in debug pop up
2014-03-27 17:33:07 +00:00
James Allen
767b220fab
Allow CLSI cache to be cleared from within the editor
2014-03-27 17:00:41 +00:00
James Allen
7515586f3b
Add in direct link to bonus page
2014-03-27 16:04:10 +00:00
James Allen
6c77ee4861
Highlight the changed files in the file list view
2014-03-27 12:45:11 +00:00
Henry Oswald
c718535068
use github translate-sharelatex module
2014-03-26 17:30:25 +00:00
Henry Oswald
ebacf86485
changed i18n to use seperate translate module which holds the translations
2014-03-26 16:35:13 +00:00
Henry Oswald
721eda71f3
show the publish template area to all project owners
2014-03-26 16:01:10 +00:00
Henry Oswald
fe16bea798
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-03-26 15:52:58 +00:00
James Allen
0255e08e1f
Don't show upgrade prompts for non-owners
2014-03-26 13:20:08 +00:00
James Allen
0e54c4ae49
Set up history with AB testing for different methods of upgrading
2014-03-25 16:44:30 +00:00
James Allen
fe99be48ac
Add upgrade message to history for free users
2014-03-25 16:44:30 +00:00
Henry Oswald
ba1371744b
deal with users who may have been deleted but are still inside a subscription group
2014-03-25 16:19:30 +00:00
Henry Oswald
116458671c
callback is not defined, use next when there is an error in controller
2014-03-25 14:39:51 +00:00
Henry Oswald
76f0acd49d
Merge branch 'master' of github.com:sharelatex/web-sharelatex into i18n
2014-03-25 11:27:39 +00:00
Henry Oswald
f13f036e55
add public into project public access level issue #35
2014-03-25 11:01:16 +00:00
Henry Oswald
ea9ba59371
updated google anltyics experiment code
2014-03-24 22:24:09 +00:00
Henry Oswald
a86e95c711
added bulk of translations in with qqq info about them all
2014-03-24 19:30:47 +00:00
Henry Oswald
063a583ad3
got basic i18n working in express
2014-03-24 17:18:58 +00:00
Henry Oswald
2968fbcfff
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-03-24 15:24:01 +00:00
Henry Oswald
c68f2661a8
uri encode email and project names used in shared url
2014-03-24 15:23:50 +00:00
James Allen
66eb5e22f6
Always load font-awesome
2014-03-24 13:30:56 +00:00
James Allen
8a4dbf6618
Group changes by day for more concise display
2014-03-24 12:22:54 +00:00
James Allen
dc2dfaa66c
Flush project to track changes when leaving
2014-03-22 09:34:43 +00:00
Henry Oswald
8b706d6934
added some more event tracking in for google analytics
2014-03-21 18:33:53 +00:00
Henry Oswald
af659e7690
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-03-21 17:49:25 +00:00
Henry Oswald
4988fc4136
setup second plans page with free trial using google analytics experiements
2014-03-21 17:49:20 +00:00
James Allen
2a3e7ba9f3
Move restore button and logic into diff view
2014-03-21 14:31:04 +00:00
James Allen
c0686b6592
Load entire project history into change list view
2014-03-20 16:30:52 +00:00
Henry Oswald
04bdde4d0d
added logging around publishing templates and changed another templates-api -> templates
2014-03-20 12:53:23 +00:00
Henry Oswald
3c9f6e0ce0
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-03-18 15:09:50 +00:00
Henry Oswald
87167841d0
set holding account to false when registered
2014-03-18 15:09:44 +00:00
Henry Oswald
fc2b42400f
Merge pull request #54 from cwoac/nodemailer-passthrough
...
Nodemailer passthrough
2014-03-18 13:09:14 +00:00
James Allen
ea0b0c2ec2
Fine tune logging
2014-03-17 12:50:30 +00:00
James Allen
5efd19ffc4
Update the styling and workflow around publishing a template
2014-03-14 14:42:38 +00:00
James Allen
7b2eef22a9
remove console.log debugging line
2014-03-14 12:25:25 +00:00
James Allen
498e0d4787
Fix unit tests
2014-03-14 11:56:15 +00:00
James Allen
4c76b88a2d
Log out incoming and outgoing real-time updates
2014-03-14 11:51:19 +00:00
James Allen
745d112d2b
Report client side ShareJs error back to server and log them out
2014-03-14 11:14:33 +00:00
James Allen
81fcafb476
Make track changes a feature flag
2014-03-13 13:58:57 +00:00
James Allen
7aab6c4c0b
Add in dropdown and context menu for files
2014-03-13 13:01:04 +00:00
Henry Oswald
4864eeba0a
check if files exist before fingerprinting them issue #75 on sharelatex
2014-03-13 12:38:16 +00:00
Henry Oswald
c237d04456
fingerprint brand/plans.css
2014-03-13 10:06:33 +00:00
Henry Oswald
f7545393f2
fix bad logging on email sender
2014-03-12 23:37:54 +00:00
Henry Oswald
fa6065b298
changed logging which was causing error, reading _id on null
2014-03-12 23:37:10 +00:00
Henry Oswald
b7104a82e9
added null check when filtering elements
2014-03-12 22:44:15 +00:00
Henry Oswald
d20286febd
stop response sending twice if compile takes a long time when testing
2014-03-12 21:56:58 +00:00
Henry Oswald
52cb1a4dcd
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-03-12 21:33:27 +00:00
Henry Oswald
77aadf1845
plans.css trying to fingerprint wrong file
2014-03-12 21:33:15 +00:00
Oliver Matthews
efbb17a3b9
move all parameter handling to nodemailer.
2014-03-12 15:38:40 +00:00
James Allen
be64b510e8
Support the new update format from the track changes api
2014-03-11 18:01:14 +00:00
James Allen
afb8bb6a42
Add in restore button to track changes
2014-03-11 12:14:52 +00:00
Henry Oswald
e364fd9c5f
moved id for cancel selector to correct button
2014-03-11 11:47:24 +00:00
Henry Oswald
260c5210a6
changed ga tracking created -> subscribed, fixed indentation on cancel sub events
2014-03-11 11:22:03 +00:00
James Allen
417d76ab3f
Create (hopefully) more intuitive change selector
2014-03-10 14:59:01 +00:00
Henry Oswald
21ec74e51c
hooked up the recurly config to recurly.js correctly
2014-03-09 10:23:37 +00:00
Henry Oswald
3d0bd34b50
added event tracking to subscription cretion/cancelation
2014-03-09 09:56:58 +00:00
Henry Oswald
e7602321e9
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-03-08 19:01:21 +00:00
Henry Oswald
0e7d241fcf
fixed has subscription check causing bad redirects
...
subscription != recurlySubscription
2014-03-08 19:01:00 +00:00
Henry Oswald
f2069c6208
converted all analytics to use new google analytics, removing mixpanel
...
and heap. Not tracking subscriptions or cancelations yet.
2014-03-08 19:00:26 +00:00
Henry Oswald
39cecfa5d8
fixed our -> out in about page
2014-03-08 18:09:02 +00:00
James Allen
9c20d1d604
Fix momentjs in project list view
2014-03-07 14:41:01 +00:00
Oliver Matthews
8989284e10
move from node-ses to nodemailer
2014-03-07 14:08:21 +00:00
James Allen
9851321429
Merge branch 'track_changes_integration'
2014-03-07 13:17:30 +00:00
James Allen
548d7d98a4
Allow history view to be closed
2014-03-07 13:05:59 +00:00
James Allen
ebe4e5b1d8
Show consistent colors for different users
2014-03-07 12:00:31 +00:00
James Allen
36faedeeb3
Make the history entries pretty
2014-03-07 11:24:11 +00:00
James Allen
be8035faa8
Include names in view
2014-03-06 18:13:07 +00:00
James Allen
9329213d94
Allow multiple diffs to be selected
2014-03-06 16:32:18 +00:00
Henry Oswald
7efa51fb62
Merge pull request #51 from cwoac/reduce_doclines_logging
...
don't log doc contents if file is unchanged.
2014-03-06 12:50:52 +00:00
Henry Oswald
38d3bbb556
changed underscore templating to be standard syntax thoughout fixing main.tex name inserting bug, added tests to catch it in future
2014-03-06 12:28:07 +00:00
Henry Oswald
92928c35ab
removed old email tempaltes
2014-03-06 11:53:24 +00:00
Oliver Matthews
b73d7f23c3
don't log doc contents if file is unchanged.
2014-03-06 10:53:59 +00:00
Henry Oswald
f5e802a7d1
added null check for email property #ugly
2014-03-06 09:51:19 +00:00
Henry Oswald
9ae85abb74
got my email null check the wrong way around
2014-03-05 22:57:28 +00:00
Henry Oswald
e433eca157
added null checks into email sender for from address
2014-03-05 22:37:55 +00:00
James Allen
bf21305c68
Add in basic list of changes in track changes view
2014-03-05 17:55:47 +00:00
James Allen
8bf12f3286
Wrap editor in wrapper div and remove orchard CSS
2014-03-05 16:55:03 +00:00
James Allen
0468cbc300
Add in proxy to track changes api
2014-03-05 16:31:52 +00:00
Henry Oswald
32f9e33f71
removed heap analytics for the time being
2014-03-05 15:59:48 +00:00
Henry Oswald
64257a7b2c
testing out new google analytics
2014-03-05 15:45:24 +00:00
Henry Oswald
ffe690afa3
hooked up lifetime emails
2014-03-05 14:56:52 +00:00
Henry Oswald
274682a83d
deleted email manager
2014-03-05 12:07:09 +00:00
Henry Oswald
3431cf9070
share project email uses new email sender
2014-03-05 12:06:28 +00:00
Henry Oswald
8ba1a08245
hooked up password reset to use new email sending
2014-03-05 11:57:57 +00:00
Henry Oswald
3c18cc5553
email sending options are configurable from settings
2014-03-05 11:31:40 +00:00
Henry Oswald
5bacb2d784
added settings check on sending lifcycle emails out
2014-03-05 11:22:52 +00:00
Henry Oswald
eb92e5832b
renamed email templator -> email builder
2014-03-05 11:22:34 +00:00
Henry Oswald
360fac9510
setup basic new email feature which is tested, not linked up to real
...
events yet
2014-03-04 18:10:06 +00:00
Henry Oswald
67e9d0724d
increased auto compile limits
2014-03-04 15:29:45 +00:00
Henry Oswald
149b51ddc6
put published date on template publishing area
2014-03-03 23:04:30 +00:00
Henry Oswald
413ef7440f
added a republish button to templates
2014-03-03 22:55:12 +00:00
Henry Oswald
a0805f97e0
added bulk removing of users to group admin panel
2014-03-03 17:48:48 +00:00
Henry Oswald
c991625a27
added uni message to plans page back in
2014-03-03 16:41:59 +00:00
Henry Oswald
99dc141693
deleteing user account cancels any subscription
2014-03-03 16:22:55 +00:00
Henry Oswald
dd22f1f7a1
added redis connection settings into rate limiter
2014-03-03 11:46:40 +00:00
Henry Oswald
ff8320bce0
added new rate limit file based on redback. converetd auto compile to
...
use it.
2014-02-28 17:59:54 +00:00
Henry Oswald
aa0d26d5ab
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-02-27 17:35:48 +00:00
Henry Oswald
303a0e985b
improved the publish button process so it talks to the templates-api and lets the user know what is going on
2014-02-27 17:35:35 +00:00
Henry Oswald
cfe13af6ff
Merge pull request #45 from chid/crash-fix
...
add proper error handlers to the UserController class
2014-02-26 11:21:23 +00:00
Henry Oswald
cad8e0eb1c
Update bonus.jade - remove extra comma
2014-02-26 08:52:57 +00:00
Charley Peng
fa80b0c3d2
fixing incorrectly written variable
2014-02-26 08:58:51 +11:00
James Allen
128c982ba2
Add open source banner to footer
2014-02-22 11:26:36 +00:00
James Allen
ca1ebd0413
Take default features from settings
2014-02-22 10:50:59 +00:00
Henry Oswald
029077fe6e
downloading a file now sets the filename in header correctly
2014-02-20 22:33:12 +00:00
Henry Oswald
a9c48d666d
fixed broken delete effect due to project id quotes being rendered twice for some unknow reason
2014-02-20 21:26:26 +00:00
James Allen
d249158676
Don't try to fingerprint plans.css
2014-02-18 17:37:39 +00:00
Henry Oswald
347671c89b
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-02-14 18:13:33 +00:00
Henry Oswald
65f849aad0
fixed bug where file uploader was calling cb on read stream not write stream, race condition created.
2014-02-14 18:13:22 +00:00
James Allen
fd911c278f
Move copyright images into brand directory
2014-02-14 11:44:09 +00:00
James Allen
4ec7deb7d6
Move plans.css to brand folder
2014-02-14 11:36:06 +00:00
James Allen
5ea231dea6
Sort iconshock icons into directory and add credit
2014-02-13 18:18:05 +00:00
James Allen
6eff979e2a
Move nide images into one folder
2014-02-13 15:35:44 +00:00
James Allen
7fb0dadbfd
Remove unneeded image files
2014-02-13 14:47:29 +00:00
Henry Oswald
b46f320882
linked to my twitter on about page
2014-02-13 14:32:07 +00:00
Henry Oswald
3c98dfec90
add Monendra to security acknowledgements list
2014-02-13 14:31:23 +00:00
James Allen
768fd20850
Allow NewletterManager to be called without a callback
2014-02-13 12:37:23 +00:00
James Allen
8715690ce9
Intial open source comment
2014-02-12 10:23:40 +00:00
Charley Peng
3f6e240401
adding callback on error
2007-03-01 16:53:59 +11:00