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
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
f093c99b96
Remove deprecated background dropbox polling logic
2014-08-21 13:01:27 +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
d0eee7a1e5
Refactor template settings
2014-08-20 14:47:27 +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
Henry Oswald
aa4f748608
Merge branch 'master' into i18n
2014-08-14 15:42:54 +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
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
2222b32321
added message at top of page offering redirect to local lng
2014-08-13 12:31:14 +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
b7ed3bab8f
Merge branch 'redis-queue'
2014-08-11 12:10:25 +01:00
Henry Oswald
4c073ff285
render template name in CanonicalPage
2014-08-08 14:43:07 +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
66ba6e612d
Revert "send 401 when login fails"
...
This reverts commit fb901c6365d37654ba9058f57a71a4e60366688e.
2014-08-08 10:21:17 +01:00
Henry Oswald
7976f2f0fe
send 401 when login fails
2014-08-07 16:28:00 +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
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
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
673def4f90
added different lang links to head for google
2014-08-06 15:05:13 +01:00
James Allen
a7cf8d6b0a
Sort out title of wiki
2014-08-05 17:08:38 +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
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
James Allen
55ad2ce78d
Include contents page down side of wiki
2014-07-31 16:26:02 +01:00
James Allen
13c6fcb8d9
Handle encoded parameters in request URL to wiki
2014-07-31 13:12:24 +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
bdf1fed462
jquery translations work
2014-07-30 14:22:36 +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
Henry Oswald
f906d63067
added some logging around dropbox update
2014-07-29 10:32:11 +01:00
