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