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