James Allen
|
8320970a29
|
ngcloak template button while loading
|
2014-08-08 14:05:40 +01:00 |
|
James Allen
|
2ada8076d1
|
Merge branch 'master' of github.com:sharelatex/web-sharelatex
|
2014-08-08 14:02:22 +01:00 |
|
James Allen
|
7e24972b46
|
Fix off by one error in track changes highlights
|
2014-08-08 14:01:30 +01:00 |
|
Henry Oswald
|
b41256b599
|
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
|
2014-08-08 13:15:03 +01:00 |
|
Henry Oswald
|
b48ca2c7ed
|
fixed smoke test breaking on title, removed "the" as its not great for SEO (i think)
|
2014-08-08 13:11:49 +01:00 |
|
James Allen
|
b20934e579
|
Merge branch 'master' of github.com:sharelatex/web-sharelatex
|
2014-08-08 11:42:02 +01:00 |
|
James Allen
|
10021986c5
|
Don't error on password reset if no email found, and translate error messages
|
2014-08-08 11:41:54 +01:00 |
|
Henry Oswald
|
b8c7163800
|
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
|
2014-08-08 10:27:43 +01:00 |
|
Henry Oswald
|
66ba6e612d
|
Revert "send 401 when login fails"
This reverts commit fb901c6365d37654ba9058f57a71a4e60366688e.
|
2014-08-08 10:21:17 +01:00 |
|
James Allen
|
5ec1c59a31
|
Add in i18n defaults
|
2014-08-07 17:03:47 +01:00 |
|
James Allen
|
2730a2e73c
|
Merge branch 'master' of github.com:sharelatex/web-sharelatex
|
2014-08-07 16:53:07 +01:00 |
|
James Allen
|
af1f0994af
|
Remove priority title stuff again
|
2014-08-07 16:53:01 +01:00 |
|
Henry Oswald
|
7976f2f0fe
|
send 401 when login fails
|
2014-08-07 16:28:00 +01:00 |
|
James Allen
|
31e3c4ac06
|
Merge branch 'master' of github.com:sharelatex/web-sharelatex
|
2014-08-07 16:12:11 +01:00 |
|
Henry Oswald
|
da307318d9
|
fixed unescaped content
|
2014-08-07 16:11:43 +01:00 |
|
James Allen
|
240dae0cff
|
Provide template description as meta tag
Conflicts:
app/views/layout.jade
|
2014-08-07 16:11:32 +01:00 |
|
James Allen
|
b367c4a968
|
Show group subscription status on subscription dashboard page
Conflicts:
app/views/subscriptions/dashboard.jade
|
2014-08-07 15:51:43 +01:00 |
|
Henry Oswald
|
06c83dfcfa
|
fixed missing title val
|
2014-08-07 15:15:07 +01:00 |
|
Henry Oswald
|
9c6f0faff6
|
Merge branch 'i18n'
Conflicts:
app/coffee/Features/User/UserPagesController.coffee
app/views/layout.jade
app/views/project/editor/dropbox.jade
app/views/project/editor/file-tree.jade
app/views/project/editor/pdf.jade
app/views/project/list/project-list.jade
app/views/user/settings.jade
|
2014-08-07 14:46:17 +01:00 |
|
Henry Oswald
|
a337b8e848
|
fixed jade error in track changes
|
2014-08-07 14:31:03 +01:00 |
|
Henry Oswald
|
ecd5d5274c
|
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
|
2014-08-07 13:56:17 +01:00 |
|
Henry Oswald
|
c961cea514
|
fixed some bits
|
2014-08-07 13:56:04 +01:00 |
|
James Allen
|
0a44aa9e71
|
Push into doc updater queue rather than pub/sub for updates
|
2014-08-07 13:19:10 +01:00 |
|
James Allen
|
d0e51fb637
|
Fix context menu in firefox on windows
|
2014-08-06 15:49:40 +01:00 |
|
Henry Oswald
|
01b7f61e6b
|
added check if other langs are enabled for put the header rel link in
|
2014-08-06 15:35:57 +01:00 |
|
Henry Oswald
|
673def4f90
|
added different lang links to head for google
|
2014-08-06 15:05:13 +01:00 |
|
James Allen
|
dc54fe3d2e
|
Fix Smoke test to use new title
|
2014-08-06 11:50:19 +01:00 |
|
James Allen
|
07a2955341
|
Add in timeout documentation link to error message
|
2014-08-05 17:16:34 +01:00 |
|
James Allen
|
0111d699a3
|
Move sort click action to just the header text, not select all input
|
2014-08-05 17:10:24 +01:00 |
|
James Allen
|
a7cf8d6b0a
|
Sort out title of wiki
|
2014-08-05 17:08:38 +01:00 |
|
Henry Oswald
|
9baea1edc1
|
removed lang dropdown
|
2014-08-05 11:35:23 +01:00 |
|
Henry Oswald
|
90395af6b8
|
nav bar text is now translated but uses key as the string if it can't be translated
|
2014-08-05 11:24:18 +01:00 |
|
Henry Oswald
|
377acfaa56
|
added default lang of en-US and translations package does the set lang based on subdomain
|
2014-08-05 11:15:17 +01:00 |
|
Henry Oswald
|
2be22d7ca7
|
cookies work accross different subdomains, added translations middlewear into stack to render based on domain
|
2014-08-04 16:47:14 +01:00 |
|
Henry Oswald
|
1e0652888a
|
removed console.log
|
2014-08-04 12:21:38 +01:00 |
|
Henry Oswald
|
687b3f2888
|
removed external libs for i18n which we no longer need
|
2014-08-04 12:18:45 +01:00 |
|
Henry Oswald
|
9b8d77cb0f
|
removed client side i18n as we don't really need it #wasteoftime
|
2014-08-01 14:49:43 +01:00 |
|
Henry Oswald
|
03db0bc797
|
added ugly dropdown for testing
|
2014-08-01 14:43:06 +01:00 |
|
Henry Oswald
|
d047d44079
|
Changed the error messages which are sent down to the client to be translated first
fixed up tests from titles we check when rendering, deleted them as they never
catch anything important, more hastle than they are worth imo.
|
2014-08-01 14:03:38 +01:00 |
|
Henry Oswald
|
1b8c8b8c48
|
sorted out titles
|
2014-08-01 13:47:14 +01:00 |
|
Henry Oswald
|
fdc5a5154a
|
added a load more pages
|
2014-08-01 12:34:53 +01:00 |
|
James Allen
|
2ea7dee682
|
Add card around wiki content to make it stand out
|
2014-08-01 08:51:01 +01:00 |
|
Henry Oswald
|
cb685f5ea6
|
done loads of more pages
|
2014-07-31 17:07:43 +01:00 |
|
James Allen
|
55ad2ce78d
|
Include contents page down side of wiki
|
2014-07-31 16:26:02 +01:00 |
|
James Allen
|
be725c50ba
|
Make right click on menus behave like native right click
|
2014-07-31 14:20:56 +01:00 |
|
Henry Oswald
|
ab10d84f6a
|
did some of the forms
|
2014-07-31 14:01:37 +01:00 |
|
Henry Oswald
|
43750e9cb6
|
converted plans page
|
2014-07-31 13:38:24 +01:00 |
|
James Allen
|
13c6fcb8d9
|
Handle encoded parameters in request URL to wiki
|
2014-07-31 13:12:24 +01:00 |
|
James Allen
|
bc2147993a
|
Show project path in Dropbox folder
|
2014-07-31 13:04:55 +01:00 |
|
James Allen
|
e6c04bbeeb
|
Clear message from chat box immediately on pressing enter
|
2014-07-31 13:04:55 +01:00 |
|
James Allen
|
e1c14b0cf8
|
Mask iframe so resizer can go over native PDF
|
2014-07-31 13:04:55 +01:00 |
|
James Allen
|
330d4f5a16
|
Redirect to cloned project after copy
|
2014-07-31 13:04:55 +01:00 |
|
James Allen
|
f886f19429
|
Keep root doc list in sync with file tree updates
|
2014-07-31 13:04:55 +01:00 |
|
Henry Oswald
|
5f8bb9ea1f
|
converted settings page
|
2014-07-31 11:54:19 +01:00 |
|
Henry Oswald
|
42c63dd5a2
|
equals checks work, uses id now as well. Taken from:
http://blog.brunoscopelliti.com/angularjs-directive-to-check-that-passwords-match
the old one from SO does not seem to work any more
|
2014-07-31 11:16:13 +01:00 |
|
Henry Oswald
|
270c92c2a2
|
converted project list page
added missing js files
|
2014-07-30 17:18:45 +01:00 |
|
Henry Oswald
|
49c7d52208
|
i18n is cleaned and working with requirejs
|
2014-07-30 16:13:02 +01:00 |
|
Henry Oswald
|
9631d4da98
|
much simpler version of interpolation
|
2014-07-30 16:06:53 +01:00 |
|
Henry Oswald
|
7344f745e4
|
example of interpolation working
|
2014-07-30 16:04:26 +01:00 |
|
James Allen
|
94bcfc0eac
|
Only store host, not path in wiki URL setting
|
2014-07-30 15:56:27 +01:00 |
|
James Allen
|
eb483e0ecf
|
Merge branch 'master' of github.com:sharelatex/web-sharelatex
|
2014-07-30 15:45:17 +01:00 |
|
James Allen
|
49258fe3dd
|
Proxy to wiki
|
2014-07-30 15:44:03 +01:00 |
|
Henry Oswald
|
1a8c3d17b2
|
working example of directive for i18n new project button
|
2014-07-30 15:05:13 +01:00 |
|
Henry Oswald
|
bdf1fed462
|
jquery translations work
|
2014-07-30 14:22:36 +01:00 |
|
Henry Oswald
|
4160101570
|
moved got link status outside of the if so if they are not registered we can start the link process
|
2014-07-30 10:44:46 +01:00 |
|
Henry Oswald
|
48f019236e
|
added first translations
|
2014-07-29 15:33:31 +01:00 |
|
Henry Oswald
|
39173fe583
|
Merge branch 'i18n'
Conflicts:
app/coffee/infrastructure/Server.coffee
app/views/project/list.jade
package.json
|
2014-07-29 13:44:10 +01:00 |
|
James Allen
|
87aa860c87
|
Update about page css
|
2014-07-29 12:29:00 +01:00 |
|
James Allen
|
1f44cc4375
|
Fix alignment of 'view all templates'
|
2014-07-29 11:35:56 +01:00 |
|
James Allen
|
64f57562a2
|
Merge branch 'master' of github.com:sharelatex/web-sharelatex
|
2014-07-29 11:25:46 +01:00 |
|
James Allen
|
627f9e47c6
|
Bring back Prof. Lion
|
2014-07-29 11:25:34 +01:00 |
|
Henry Oswald
|
f821c38a9f
|
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
|
2014-07-29 10:55:29 +01:00 |
|
Henry Oswald
|
dff74cf5cb
|
hide dropbox in left menu if you are not the admin
|
2014-07-29 10:55:22 +01:00 |
|
James Allen
|
df85254d3c
|
Merge branch 'master' of github.com:sharelatex/web-sharelatex
|
2014-07-29 10:39:07 +01:00 |
|
James Allen
|
25205e3dda
|
Update to official mathjax cdn
|
2014-07-29 10:37:43 +01:00 |
|
Henry Oswald
|
f906d63067
|
added some logging around dropbox update
|
2014-07-29 10:32:11 +01:00 |
|
Henry Oswald
|
a62a8db0e0
|
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
|
2014-07-29 10:29:46 +01:00 |
|
Henry Oswald
|
344d32d4e8
|
fixed email logo link
|
2014-07-29 10:29:40 +01:00 |
|
James Allen
|
714266b16e
|
Fix infinite scroll
|
2014-07-28 17:28:52 +01:00 |
|
James Allen
|
fc7753d49d
|
Add in download PDF button
|
2014-07-28 17:24:43 +01:00 |
|
James Allen
|
6d9072f0e2
|
Merge branch 'master' of github.com:sharelatex/web-sharelatex
|
2014-07-28 17:16:08 +01:00 |
|
James Allen
|
9f26214142
|
Fix double context menu in FF
|
2014-07-28 17:11:15 +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
|
c5b72f5f8b
|
added font weight 300 into the open sans for home page
|
2014-07-28 17:03:54 +01:00 |
|
Henry Oswald
|
e8be248b29
|
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
|
2014-07-28 16:52:40 +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
|
9db2fc93a4
|
Add spell check underline to front marker layer
|
2014-07-28 16:28:01 +01:00 |
|
James Allen
|
d1e0849c5e
|
Merge branch 'master' of github.com:sharelatex/web-sharelatex
|
2014-07-28 16:24:28 +01:00 |
|
James Allen
|
3a3933dfe9
|
Don't immediately close context menu in Firefox
|
2014-07-28 16:23:46 +01:00 |
|
Henry Oswald
|
552cd5ddd4
|
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
|
2014-07-28 16:10:36 +01:00 |
|
Henry Oswald
|
0db45733c5
|
added -moz-osx-font-smoothing to the stylesheet which improves font rendering in firefox
|
2014-07-28 16:10:30 +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
|
2c7623d3a7
|
added the other font sizes we use into the font import, not magic fix
|
2014-07-28 14:57:06 +01:00 |
|
Henry Oswald
|
0fb1152010
|
added templates less file in, got lost somewhere
|
2014-07-28 12:54:55 +01:00 |
|
Henry Oswald
|
d4be1ba7aa
|
changed template image paths to use correct ones
|
2014-07-28 12:50:56 +01:00 |
|
James Allen
|
24f140ed8b
|
Merge branch 'master' into master-redesign
Conflicts:
public/js/ace/mode/latex.js
|
2014-07-28 10:40:35 +01:00 |
|
James Allen
|
f9b6801f32
|
Revert "added redesign is happening message on list page"
This reverts commit 9d571e83dcd08900a46bea94a5f7f8771a26e30e.
|
2014-07-28 10:38:50 +01:00 |
|
James Allen
|
06eb952994
|
Resize project list correctly on page load
|
2014-07-28 10:28:48 +01:00 |
|