Commit graph

  • 949ee20a8a updated ungleich Tomislav R 2016-04-03 11:46:25 +02:00
  • 24badb1a9c updated ungleich Tomislav R 2016-04-03 11:46:25 +02:00
  • a4de615301 Merge pull request #15 from tmslav/master tmslav 2016-04-01 12:38:25 +02:00
  • 4061cd70ec Merge pull request #15 from tmslav/master tmslav 2016-04-01 12:38:25 +02:00
  • 1d18894b60 updated main pages links Tomislav R 2016-04-01 12:37:01 +02:00
  • 5fd4275046 updated main pages links Tomislav R 2016-04-01 12:37:01 +02:00
  • 7b0f0db338 Merge pull request #14 from ungleich/master tmslav 2016-03-31 20:31:46 +02:00
  • 29f95e753c Merge pull request #14 from ungleich/master tmslav 2016-03-31 20:31:46 +02:00
  • eb9df736bb Merge pull request #13 from tmslav/master tmslav 2016-03-31 18:16:50 +02:00
  • 5bf93d597e Merge pull request #13 from tmslav/master tmslav 2016-03-31 18:16:50 +02:00
  • 40cdf8a11f removed Tomislav R 2016-03-31 18:15:37 +02:00
  • d29902c676 removed Tomislav R 2016-03-31 18:15:37 +02:00
  • 2d2f7ca6f4 Merge pull request #11 from tmslav/master tmslav 2016-03-26 17:33:09 +01:00
  • 9100b988bc Merge pull request #11 from tmslav/master tmslav 2016-03-26 17:33:09 +01:00
  • e13947df8d added media Tomislav R 2016-03-25 19:39:50 +01:00
  • 0e7662dad9 added media Tomislav R 2016-03-25 19:39:50 +01:00
  • e78fe3ca01 Merge pull request #10 from tmslav/master tmslav 2016-03-25 19:36:38 +01:00
  • e2d5ca5c1b Merge pull request #10 from tmslav/master tmslav 2016-03-25 19:36:38 +01:00
  • c77f80dc45 added db Tomislav R 2016-03-25 19:35:52 +01:00
  • 8bc0a7d84b added db Tomislav R 2016-03-25 19:35:52 +01:00
  • fb539cbe92 Merge pull request #9 from tmslav/master tmslav 2016-03-25 19:22:04 +01:00
  • b0a636b0fb Merge pull request #9 from tmslav/master tmslav 2016-03-25 19:22:04 +01:00
  • 26de99e773 fixed orphaned plugins and add post functionality Tomislav R 2016-03-25 19:18:07 +01:00
  • ddb4de2954 fixed orphaned plugins and add post functionality Tomislav R 2016-03-25 19:18:07 +01:00
  • 17a9245d21 calendar added Sanghee Kim 2016-03-23 18:25:49 +01:00
  • 7b12f11f7d calendar added design_membership Sanghee Kim 2016-03-23 18:25:49 +01:00
  • f5ece43b25 added missing blog templates Tomislav R 2016-03-23 14:25:15 +01:00
  • 78e66862bf added missing blog templates Tomislav R 2016-03-23 14:25:15 +01:00
  • 28df2526a8 update django settings for local and production Tomislav R 2016-03-22 22:09:22 +01:00
  • 105dad3b9f update django settings for local and production Tomislav R 2016-03-22 22:09:22 +01:00
  • 1f2c94a053 removed duplicated djangocms Tomislav R 2016-03-22 21:09:59 +01:00
  • 18c75cf00e removed duplicated djangocms Tomislav R 2016-03-22 21:09:59 +01:00
  • 1ce3f4bbac resolve merge conflict Your Name 2016-03-22 15:16:21 +00:00
  • 08e47294cd resolve merge conflict Your Name 2016-03-22 15:16:21 +00:00
  • 767d24adb7 resolve merge conflict Your Name 2016-03-22 15:12:47 +00:00
  • d57fc21784 resolve merge conflict Your Name 2016-03-22 15:12:47 +00:00
  • d56bbd5eab Merge pull request #8 from tmslav/blog_fix tmslav 2016-03-22 01:23:02 +01:00
  • 006d49d7db Merge pull request #8 from tmslav/blog_fix tmslav 2016-03-22 01:23:02 +01:00
  • 6b78bac53b Blog update Tomislav R 2016-03-22 01:21:50 +01:00
  • ca033be061 Blog update Tomislav R 2016-03-22 01:21:50 +01:00
  • 0d04a18a0d server push Raul Ascencio 2016-03-19 21:28:58 +01:00
  • 039399b95b server push Raul Ascencio 2016-03-19 21:28:58 +01:00
  • 0f3ebfdbba settings difference push Raul Ascencio 2016-03-16 15:23:15 +01:00
  • b7b0be4497 settings difference push Raul Ascencio 2016-03-16 15:23:15 +01:00
  • 3d23db0c73 Merge pull request #7 from tmslav/membership_payment tmslav 2016-03-16 15:16:11 +01:00
  • 47f24df349 Merge pull request #7 from tmslav/membership_payment tmslav 2016-03-16 15:16:11 +01:00
  • 6319515bb4 fixed new user registration Tomislav R 2016-03-16 15:10:48 +01:00
  • 0a7dd2fa3d fixed new user registration Tomislav R 2016-03-16 15:10:48 +01:00
  • ff9a6e1b2b fixed requirements Tomislav R 2016-03-16 00:26:49 +01:00
  • baef7e4aa8 fixed requirements Tomislav R 2016-03-16 00:26:49 +01:00
  • 2013317420 Add new files for design jiyounyoon 2016-03-14 14:13:31 -07:00
  • 28a50b9002 Add new files for design jiyounyoon 2016-03-14 14:13:31 -07:00
  • e5d2d74450 payment app Tomislav R 2016-03-11 19:42:45 +01:00
  • 6223f4a1ef payment app Tomislav R 2016-03-11 19:42:45 +01:00
  • 3ca9ef5900 fixed login Tomislav R 2016-03-07 19:25:01 +01:00
  • b14b3d2803 fixed login Tomislav R 2016-03-07 19:25:01 +01:00
  • 2477fbc11b update req file and update directory structure Tomislav R 2016-03-07 19:19:25 +01:00
  • f82e0604ca update req file and update directory structure Tomislav R 2016-03-07 19:19:25 +01:00
  • b8824b3f46 fixed CustomUser Tomislav R 2016-03-07 18:39:24 +01:00
  • 5c6e0cf7c6 fixed CustomUser Tomislav R 2016-03-07 18:39:24 +01:00
  • 3157db235a test Tomislav R 2016-03-07 17:49:02 +01:00
  • e7f11e9556 test Tomislav R 2016-03-07 17:49:02 +01:00
  • 268c3ebdbb Merge branch 'master' of https://github.com/ungleich/dynamicweb Your Name 2016-03-05 20:15:44 +00:00
  • 3d34acc884 Merge branch 'master' of https://github.com/ungleich/dynamicweb Your Name 2016-03-05 20:15:44 +00:00
  • 8f4dd038bd Merge remote-tracking branch 'refs/remotes/origin/master' Your Name 2016-03-05 19:57:41 +00:00
  • de875f80de Merge remote-tracking branch 'refs/remotes/origin/master' Your Name 2016-03-05 19:57:41 +00:00
  • 958ed9572b added python path Your Name 2016-03-05 19:49:22 +00:00
  • b3c40bd20d added python path Your Name 2016-03-05 19:49:22 +00:00
  • ec789b625e changes on prod - master Your Name 2016-03-05 19:46:46 +00:00
  • e99f23551b changes on prod - master changes-settings Your Name 2016-03-05 19:46:46 +00:00
  • 530ca19556 Import cal + css from Jiyoun Sanghee Kim 2016-03-04 21:15:48 +01:00
  • ba554deca1 Import cal + css from Jiyoun Sanghee Kim 2016-03-04 21:15:48 +01:00
  • 3ec565c178 Merge pull request #6 from tmslav/update_django_version Raul Ascencio 2016-03-04 13:06:43 -06:00
  • 062afb392f Merge pull request #6 from tmslav/update_django_version Raul Ascencio 2016-03-04 13:06:43 -06:00
  • 9f944ca1ed init membership Tomislav R 2016-03-03 22:55:23 +01:00
  • 6bb092a101 init membership Tomislav R 2016-03-03 22:55:23 +01:00
  • 9eed348b62 Merge branch 'master' into update_django_version Tomislav R 2016-03-03 22:32:36 +01:00
  • 88a5825c8c Merge branch 'master' into update_django_version Tomislav R 2016-03-03 22:32:36 +01:00
  • bfaa88e774 test Tomislav R 2016-03-03 22:22:37 +01:00
  • 850a0e7f85 test Tomislav R 2016-03-03 22:22:37 +01:00
  • c7a9eb1e59 error button added Sanghee Kim 2016-03-02 20:06:31 +01:00
  • 13be0d6d74 error button added Sanghee Kim 2016-03-02 20:06:31 +01:00
  • 5606421739 text change Sanghee Kim 2016-03-02 19:42:39 +01:00
  • b571ff834b text change Sanghee Kim 2016-03-02 19:42:39 +01:00
  • 1fef3c0b90 button color Sanghee Kim 2016-03-02 18:00:55 +01:00
  • b1d7beac15 button color Sanghee Kim 2016-03-02 18:00:55 +01:00
  • c929823c2b button color Sanghee Kim 2016-03-02 00:18:52 +01:00
  • 3f1ae15e64 button color Sanghee Kim 2016-03-02 00:18:52 +01:00
  • b2e62b1fd7 button color Sanghee Kim 2016-03-02 00:16:00 +01:00
  • fcd0754506 button color Sanghee Kim 2016-03-02 00:16:00 +01:00
  • fa5c914c40 button color Sanghee Kim 2016-03-02 00:09:14 +01:00
  • 618121641e button color Sanghee Kim 2016-03-02 00:09:14 +01:00
  • 6cd443c568 color changes 상희 김 2016-03-01 21:52:04 +01:00
  • 3c4f646d5e color changes 상희 김 2016-03-01 21:52:04 +01:00
  • 5fbde4878d update Tomislav R 2016-03-01 21:24:51 +01:00
  • 7936e5dfe5 update Tomislav R 2016-03-01 21:24:51 +01:00
  • abbc2982e3 django version update #3 Tomislav R 2016-02-29 23:28:31 +01:00
  • 0558d6e396 django version update #3 Tomislav R 2016-02-29 23:28:31 +01:00
  • 66d042dbe7 one column supporters rscnt 2016-02-14 11:52:05 -06:00
  • ed8a8c96e1 one column supporters rscnt 2016-02-14 11:52:05 -06:00