Commit graph

3292 commits

Author SHA1 Message Date
Henry Oswald
0dc4b3a01b login works with curl 2014-08-19 10:54:33 +01:00
James Allen
b90c977d3d Merge pull request #99 from heukirne/template-menu
Dynamic Template Menu
2014-08-18 18:45:51 +01:00
Henrique Dias
a3f9f5a729 fix identation 2014-08-18 14:35:16 -03:00
Henrique Dias
e0e9949da5 dynamic template menu by config settings 2014-08-18 14:26:47 -03:00
Henrique Dias
acf392eb4e init chance in config 2014-08-18 13:59:34 -03:00
James Allen
02ec2bc264 Align flags on left of menu to match flag in footer 2014-08-14 16:41:48 +01:00
James Allen
ac4b3663cb CSS tweaks to i18n stuff 2014-08-14 16:33:01 +01:00
Henry Oswald
aa4f748608 Merge branch 'master' into i18n 2014-08-14 15:42:54 +01:00
Henry Oswald
f75838b353 don't show the lng select if there is only 1 lang to show 2014-08-14 15:42:31 +01:00
James Allen
9be7228247 Delay Dropbox polling by 5 seconds and dispatch only a single request 2014-08-14 13:48:23 +01:00
Henry Oswald
7c2beb5d2d added correct flags 2014-08-14 13:00:04 +01:00
James Allen
7816810249 Add in poll dropbox endpoint back into admin 2014-08-14 10:12:01 +01:00
Henry Oswald
02cdfb4d09 lng dropdown at bottom in footer works nicely, needs few style tweeks 2014-08-13 23:06:15 +01:00
James Allen
604505131b Convert integer dropbox id to string when searching mongo 2014-08-13 17:34:45 +01:00
James Allen
670e8e5cb9 Use Dropbox Real-time polling 2014-08-13 17:26:18 +01:00
Henry Oswald
7389943089 added ugly list of available subdomains 2014-08-13 16:04:49 +01:00
Henry Oswald
d033238efc forgot to commit files 2014-08-13 16:04:23 +01:00
James Allen
2a6041752d Remove unescaped strings on bonus page 2014-08-13 15:44:30 +01:00
Henry Oswald
9b2ce4860a changed cookie lib from default angular to custom one so can set expires 2014-08-13 15:02:45 +01:00
Henry Oswald
041e85b92b added local cooked option to hide notification 2014-08-13 14:14:31 +01:00
Henry Oswald
2222b32321 added message at top of page offering redirect to local lng 2014-08-13 12:31:14 +01:00
James Allen
6bfefea5cb Show PDF button in toolbar if file tree is closed in PDF flat view 2014-08-12 13:18:22 +01:00
James Allen
93f2969be5 Change style on file rename input to avoid weird Chrome behaviour 2014-08-12 12:46:05 +01:00
James Allen
f902cfdcf6 Monkey patch ace until cursor patches come from upstream 2014-08-12 12:33:12 +01:00
James Allen
5b3bf5c956 Spaces after error titles 2014-08-12 12:30:07 +01:00
James Allen
3348249dcd Download template PDF and zip file with good file names 2014-08-12 12:02:09 +01:00
James Allen
2aa421233c Add meta description for templates home page 2014-08-11 16:20:27 +01:00
James Allen
b7ed3bab8f Merge branch 'redis-queue' 2014-08-11 12:10:25 +01:00
Henry Oswald
f452f0ee19 don't escpae html on delete modal 2014-08-11 08:01:39 +01:00
Henry Oswald
cc71834e4e Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2014-08-08 14:43:14 +01:00
Henry Oswald
4c073ff285 render template name in CanonicalPage 2014-08-08 14:43:07 +01:00
James Allen
8320970a29 ngcloak template button while loading 2014-08-08 14:05:40 +01:00
James Allen
2ada8076d1 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-08-08 14:02:22 +01:00
James Allen
7e24972b46 Fix off by one error in track changes highlights 2014-08-08 14:01:30 +01:00
Henry Oswald
b41256b599 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2014-08-08 13:15:03 +01:00
Henry Oswald
b48ca2c7ed fixed smoke test breaking on title, removed "the" as its not great for SEO (i think) 2014-08-08 13:11:49 +01:00
James Allen
b20934e579 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-08-08 11:42:02 +01:00
James Allen
10021986c5 Don't error on password reset if no email found, and translate error messages 2014-08-08 11:41:54 +01:00
Henry Oswald
b8c7163800 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2014-08-08 10:27:43 +01:00
Henry Oswald
66ba6e612d Revert "send 401 when login fails"
This reverts commit fb901c6365d37654ba9058f57a71a4e60366688e.
2014-08-08 10:21:17 +01:00
James Allen
5ec1c59a31 Add in i18n defaults 2014-08-07 17:03:47 +01:00
James Allen
2730a2e73c Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-08-07 16:53:07 +01:00
James Allen
af1f0994af Remove priority title stuff again 2014-08-07 16:53:01 +01:00
Henry Oswald
7976f2f0fe send 401 when login fails 2014-08-07 16:28:00 +01:00
James Allen
31e3c4ac06 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-08-07 16:12:11 +01:00
Henry Oswald
da307318d9 fixed unescaped content 2014-08-07 16:11:43 +01:00
James Allen
240dae0cff Provide template description as meta tag
Conflicts:
	app/views/layout.jade
2014-08-07 16:11:32 +01:00
James Allen
b367c4a968 Show group subscription status on subscription dashboard page
Conflicts:
	app/views/subscriptions/dashboard.jade
2014-08-07 15:51:43 +01:00
Henry Oswald
06c83dfcfa fixed missing title val 2014-08-07 15:15:07 +01:00
Henry Oswald
9c6f0faff6 Merge branch 'i18n'
Conflicts:
	app/coffee/Features/User/UserPagesController.coffee
	app/views/layout.jade
	app/views/project/editor/dropbox.jade
	app/views/project/editor/file-tree.jade
	app/views/project/editor/pdf.jade
	app/views/project/list/project-list.jade
	app/views/user/settings.jade
2014-08-07 14:46:17 +01:00