To check out this repository please hg clone the following URL, or open the URL using EasyMercurial or your preferred Mercurial client.

Statistics Download as Zip
| Branch: | Tag: | Revision:

root / app / controllers / application_controller.rb @ 1521:2354ddf5a483

History | View | Annotate | Download (19.5 KB)

# Date Author Comment
1521:2354ddf5a483 2014-09-09 02:27 PM Chris Cannam

Fix some merge/runtime problems

1520:a1bdbf8a87d5 2014-09-09 10:02 AM Chris Cannam

Merge from branch "redmine-2.4-integration"

1518:2e8063097240 2014-09-09 09:32 AM Chris Cannam

Merge from branch redmine-2.4

1517:dffacf8a6908 2014-09-09 09:29 AM Chris Cannam

Update to Redmine SVN revision 13367 on 2.5-stable branch

1516:b450a9d58aed 2014-09-09 09:28 AM Chris Cannam

Update to Redmine SVN revision 13356 on 2.4-stable branch

1495:c86dacc2ef0a 2014-03-17 08:55 AM Chris Cannam

Merge from redmine-2.4 branch

1494:e248c7af89ec 2014-03-17 08:54 AM Chris Cannam

Update to Redmine SVN revision 12979 on 2.4-stable branch

1484:51364c0cd58f 2014-01-15 09:59 AM Chris Cannam

Merge from live branch. Still need to merge manually in files overridden by plugins.

1464:261b3d9a4903 2014-01-14 02:37 PM Chris Cannam

Update to Redmine 2.4 branch rev 12663

1339:c03a6c3c4db9 2013-06-20 02:34 PM Luis Figueira

Merge

1338:25603efa57b5 2013-06-20 01:14 PM Chris Cannam

Merge from live branch

1337:077b8890835a 2013-06-20 01:14 PM Chris Cannam

Merge from live branch

1329:b2ea0641f798 2013-06-20 08:47 AM Chris Cannam

Merge from redmine-2.2-integration branch. We're going live!

1298:4f746d8966dd 2013-06-14 09:28 AM Chris Cannam

Merge from redmine-2.3 branch to create new branch redmine-2.3-integration

1295:622f24f53b42 2013-06-14 09:02 AM Chris Cannam

Update to Redmine SVN revision 11972 on 2.3-stable branch

1116:bb32da3bea34 2013-01-07 02:41 PM Chris Cannam

Merge from live

1115:433d4f72a19b 2013-01-07 12:01 PM Chris Cannam

Update to Redmine SVN revision 11137 on 2.2-stable branch

940:9fda6880be81 2012-07-11 02:35 PM Chris Cannam

Merge from the default branch

935:fe0249c097f6 2012-07-11 01:33 PM Chris Cannam

Merge from the default branch

927:9ee5fd0b9bd3 2012-05-11 04:13 PM Luis Figueira

Merge from cannam_integration

926:b73a59a6acbd 2012-05-11 04:10 PM Luis Figueira

Merge from cannam_integration

912:5e80956cc792 2012-02-27 01:53 PM Chris Cannam

Merge from branch "redmine-1.3"

910:1f446682602c 2012-02-24 07:47 PM Chris Cannam

Merge from branch "cannam"

909:cbb26bc654de 2012-02-24 07:09 PM Chris Cannam

Update to Redmine 1.3-stable branch (Redmine SVN rev 8964)

812:b5474c68c433 2011-11-23 03:29 PM Luis Figueira

Merge from branch "live"

804:548e23d4cd71 2011-11-23 11:15 AM Chris Cannam

Merge from branch "cannam"

787:a36cce722860 2011-11-18 04:53 PM Luis Figueira

Merge from branch "cannam"

744:0c23dd3d0b71 2011-11-08 02:20 PM Chris Cannam

Merge from branch "bug_320"

743:7ded87cc4b80 2011-11-08 02:19 PM Chris Cannam

Bug #320: Offer login page instead of 404 for nonexistent project when user not logged in -- hiding the difference between existing private project and nonexistent one

524:1248a47e81b3 2011-07-25 02:39 PM Luis Figueira

Merge from branch "luisf"

523:0b6c82dead28 2011-07-25 02:23 PM Luis Figueira

Merge from branch "cannam"

514:7eba09d624db 2011-07-14 10:50 AM Chris Cannam

Merge

511:107d36338b70 2011-07-14 10:43 AM Chris Cannam

Merge from branch "cannam"

510:1afe06d9ba94 2011-07-14 10:42 AM Chris Cannam

Merge from branch "cannam"

508:851510f1b535 2011-07-14 10:37 AM Chris Cannam

Merge from branch "redmine-1.2"

507:0c939c159af4 2011-07-14 10:32 AM Chris Cannam

Update to Redmine 1.2.1 on 1.2-stable branch (Redmine SVN rev 6270)

476:9867ed78c4c1 2011-06-27 12:38 PM Chris Cannam

Merge

475:32dd9e02950a 2011-06-27 12:38 PM Chris Cannam

Merge

474:dff13616e464 2011-06-27 12:37 PM Chris Cannam

Avoid double-slash in path

443:350acce374a2 2011-06-06 02:55 PM Chris Cannam

Merge from branch "cannam-pre-20110113-merge"

442:753f1380d6bc 2011-06-06 02:41 PM Chris Cannam

Merge from branch "redmine-1.2"

441:cbce1fd3b1b7 2011-06-06 02:24 PM Chris Cannam

Update to Redmine 1.2-stable branch (Redmine SVN rev 6000)

370:055518fc4e4c 2011-04-01 12:14 PM Chris Cannam

Merge from branch "feature_125"

366:3e8c33cbb8e0 2011-04-01 12:13 PM Chris Cannam

Merge

365:7d8567890fa3 2011-04-01 12:11 PM Chris Cannam

Redirect to My Page instead if asked to redirect to home page

318:f7c525dc7585 2011-03-28 06:17 PM Luis Figueira

Merge from branch "live"

247:73ff0e6a11b1 2011-03-03 12:11 PM Chris Cannam
  • Merge from branch cannam-pre-20110113-merge
240:6c282df74a30 2011-02-22 04:50 PM Chris Cannam

Merge from branch "cannam-pre-20110113-merge"

239:7cec015f07ce 2011-02-22 04:48 PM Chris Cannam

Merge from branch "live"

238:83bf35c4f9d1 2011-02-18 10:02 AM Chris Cannam

Merge from branch "bug_83"

237:4b1a23d81683 2011-02-18 09:58 AM Chris Cannam

When redirecting after login, if the current request URL is an https URL, ensure the back_url is too

119:8661b858af72 2011-01-13 02:12 PM Chris Cannam
  • Update to Redmine trunk rev 4705
118:b859cc0c4fa1 2011-01-13 01:21 PM Chris Cannam

Merge from branch "redmine-1.1"

117:af80e5618e9b 2011-01-13 12:53 PM Chris Cannam
  • Update to Redmine 1.1-stable branch (Redmine SVN rev 4707)
97:5467cbbf393b 2010-12-16 01:43 PM Luis Figueira

Merge from branch "live"

85:22c68d60853d 2010-12-16 10:07 AM Chris Cannam

Merge from branch "live"

79:aea1779e6f18 2010-12-15 10:35 AM Chris Cannam

Bug #34: Add a bit more description to the "Invalid form authenticity token" error. Not exactly a fix, but it'll have to do for now.

51:371eac10df0b 2010-11-24 12:20 PM Chris Cannam
  • Merge from "cannam" branch. This includes update to Redmine trunk, plus welcome/tip-of-the-day from luisf branch.
41:7f0e922c8982 2010-11-19 02:45 PM Luis Figueira

merged with new version from trunk

38:33d69fee1d99 2010-11-19 01:41 PM Chris Cannam
  • Merge SVN update from default branch
37:94944d00e43c 2010-11-19 01:24 PM Chris Cannam
  • Update to SVN trunk rev 4411
25:9fd6221709a6 2010-09-24 03:51 PM Chris Cannam
  • Merge cannam branch
23:ca82a3468d27 2010-09-24 02:17 PM Chris Cannam
  • Merge SVN update from default
22:40f7cfd4df19 2010-09-24 02:06 PM Chris Cannam
  • Update to SVN trunk rev 4173
15:9c6c72729d91 2010-08-25 04:33 PM Chris Cannam
  • Merge from default (for SVN trunk update)
14:1d32c0a0efbf 2010-08-25 04:30 PM Chris Cannam
  • Update to SVN trunk (revisions 3892-4040)
0:513646585e45 2010-07-23 03:52 PM Chris Cannam
  • Import Redmine trunk SVN rev 3859