Browse Source
commit 0bd182ebb5d9da183d7d3950c77418cf02dd8706 Merge:pull/460/merge5fac3d7
dadbd0f
Author: Ruud <ruud@crashdummy.nl> Date: Thu May 31 20:21:17 2012 +0200 Merge branch 'master' of https://github.com/jallakim/CouchPotatoServer into jallakim-master Conflicts: init/freebsd commit5fac3d708d
Merge:0ba2e57
95e5282
Author: Ruud <ruud@crashdummy.nl> Date: Thu May 31 19:30:18 2012 +0200 Merge branch 'refs/heads/develop' commitdadbd0f1fd
Author: Joachim Tingvold <joachim@tingvold.com> Date: Wed May 30 22:35:27 2012 +0200 Useless Use of Cat Award (-: commit9fe11355a9
Author: Joachim Tingvold <joachim@tingvold.com> Date: Wed May 30 22:30:26 2012 +0200 Ooops. PORT and CPAPI got mixed around in FreeBSD init-script. commite39be8970c
Author: Joachim Tingvold <joachim@tingvold.com> Date: Wed May 30 22:25:46 2012 +0200 Cosmetics again. commit5cca98db31
Author: Joachim Tingvold <joachim@tingvold.com> Date: Wed May 30 22:22:54 2012 +0200 Check that settings.conf exists in FreeBSD init-script commitd1e98602d8
Author: Joachim Tingvold <joachim@tingvold.com> Date: Wed May 30 22:16:47 2012 +0200 FreeBSD init-script fetches variables from CP's settings.conf commit42dbe607cf
Author: Joachim Tingvold <joachim@tingvold.com> Date: Wed May 30 16:02:46 2012 +0200 Should work for all FreeBSD versions now. commitf0bcf6a0f5
Author: Joachim Tingvold <joachim@tingvold.com> Date: Wed May 30 15:17:53 2012 +0200 Don't 'import sys' before we need it commit8e13fcd0d1
Author: Joachim Tingvold <joachim@tingvold.com> Date: Wed May 30 15:09:58 2012 +0200 Cosmetics! (-: commit04af454c03
Author: Joachim Tingvold <joachim@tingvold.com> Date: Wed May 30 15:05:32 2012 +0200 Added /data/ to .gitignore Used as data-dir if CouchPotato is installed on FreeBSD. commit055d47d7b4
Author: Joachim Tingvold <joachim@tingvold.com> Date: Wed May 30 15:04:36 2012 +0200 Fixed getDataDir so that it works for FreeBSD9. Assumes that '/usr/local/couchpotato/' is where CouchPotato resides. commit4859f1b9f2
Author: Joachim Tingvold <joachim@tingvold.com> Date: Wed May 30 15:03:26 2012 +0200 Fixed the FreeBSD init-script. commit0ba2e579f9
Merge:fdf0d2d
a2a3896
Author: Ruud <ruud@crashdummy.nl> Date: Sun May 20 23:50:54 2012 +0200 Merge branch 'master' of github.com:RuudBurger/CouchPotatoServer commitfdf0d2d5b4
Author: Ruud Burger <ruud@crashdummy.nl> Date: Thu Apr 26 10:57:34 2012 +0300 Use master branch to update master.. commita2a3896b1f
Merge:5017b01
19640a9
Author: Ruud <ruud@crashdummy.nl> Date: Sun May 20 19:57:05 2012 +0200 Merge branch 'refs/heads/develop' commit5017b01934
Merge:d4a5483
f2f524c
Author: Ruud <ruud@crashdummy.nl> Date: Tue May 15 23:23:25 2012 +0200 Merge branch 'master' of github.com:RuudBurger/CouchPotatoServer commitd4a5483fa0
Author: Ruud Burger <ruud@crashdummy.nl> Date: Thu Apr 26 10:57:34 2012 +0300 Use master branch to update master.. commitf2f524c4e4
Merge:577aed3
edbeb02
Author: Ruud <ruud@crashdummy.nl> Date: Tue May 15 23:16:12 2012 +0200 Merge branch 'refs/heads/develop' commit577aed3a75
Merge:cb975f6
176f4b0
Author: Ruud <ruud@crashdummy.nl> Date: Mon May 14 23:36:53 2012 +0200 Merge branch 'refs/heads/develop' commitcb975f6180
Merge:3e369c5
a71fb1a
Author: Ruud <ruud@crashdummy.nl> Date: Mon May 14 20:23:05 2012 +0200 Merge branch 'refs/heads/develop' commit3e369c5838
Merge:d89130d
0847ffd
Author: Ruud <ruud@crashdummy.nl> Date: Sun May 13 12:56:37 2012 +0200 Merge branch 'refs/heads/develop' commitd89130dc30
Merge:ee5e1d1
c34f392
Author: Ruud <ruud@crashdummy.nl> Date: Sat May 12 00:36:03 2012 +0200 Merge branch 'refs/heads/develop' commitee5e1d19d1
Merge:7d2eb23
b2be9ef
Author: Ruud <ruud@crashdummy.nl> Date: Wed May 9 22:19:29 2012 +0200 Merge branch 'refs/heads/develop' commit7d2eb2376f
Merge:40ff984
ba8fef3
Author: Ruud Burger <ruud@crashdummy.nl> Date: Mon May 7 13:35:13 2012 -0700 Merge pull request #228 from sirchia/twitterDirectMessage Added support for direct messages in twitter notifications commit40ff984e19
Merge:1f3e22c
7ca509c
Author: Ruud <ruud@crashdummy.nl> Date: Mon May 7 22:26:55 2012 +0200 Merge branch 'refs/heads/develop' commitba8fef3c87
Author: Riccardo Sirchia <sirchia.r@gmail.com> Date: Sun May 6 18:02:51 2012 +0200 Added support for direct messages in twitter notifications commit1f3e22c4ed
Merge:89315cb
74226f0
Author: Ruud <ruud@crashdummy.nl> Date: Fri May 4 17:27:36 2012 +0200 Merge branch 'refs/heads/develop' commit89315cb291
Merge:829b3cf
f6de117
Author: Ruud <ruud@crashdummy.nl> Date: Fri May 4 17:27:12 2012 +0200 Merge branch 'refs/heads/develop' commit829b3cfb3b
Merge:e3cc15d
1345e98
Author: Ruud <ruud@crashdummy.nl> Date: Wed May 2 21:40:01 2012 +0200 Merge branch 'refs/heads/develop' commite3cc15d2b6
Merge:ca87f2c
c161bdd
Author: Ruud <ruud@crashdummy.nl> Date: Sun Apr 29 00:00:14 2012 +0200 Merge branch 'refs/heads/develop' commitca87f2c231
Merge:e929af7
c7bc0f4
Author: Ruud <ruud@crashdummy.nl> Date: Sat Apr 28 23:14:18 2012 +0200 Merge branch 'refs/heads/develop' commite929af76d0
Merge:b22763b
d1c2869
Author: Ruud Burger <ruud@crashdummy.nl> Date: Fri Apr 27 02:04:35 2012 -0700 Merge pull request #152 from garlandkr/master Removed group setting for init commitd1c2869f2c
Author: Ken Garland <garlandkr@gmail.com> Date: Thu Apr 26 23:30:33 2012 -0300 Removed RUN_AS for group, don't assume the default group is the same as the username. Specifying group is not needed anyways. commitb22763b37d
Author: Ruud Burger <ruud@crashdummy.nl> Date: Thu Apr 26 10:57:34 2012 +0300 Use master branch to update master..
3 changed files with 28 additions and 9 deletions
@ -1 +1,2 @@ |
|||
/_source/ |
|||
/data/ |
|||
|
Loading…
Reference in new issue