1
0
mirror of https://github.com/ascribe/onion.git synced 2024-12-22 09:23:13 +01:00

Commit Graph

  • 6c746d09f7 Merge remote-tracking branch 'remotes/origin/AD-479-piece-registration-in-new-fronten' into AD-416-account-settings-page-navbar ddejongh 2015-06-19 10:53:56 +0200
  • b4c2cd73a5 Merge remote-tracking branch 'remotes/origin/master' into AD-416-account-settings-page-navbar ddejongh 2015-06-19 09:52:27 +0200
  • e369eac889 submodules ddejongh 2015-06-18 19:48:31 +0200
  • dda8c91db9 submodules ddejongh 2015-06-18 19:41:47 +0200
  • ec6cd38709 test submodules ddejongh 2015-06-18 19:36:17 +0200
  • de6f5a41e0 settings ddejongh 2015-06-18 19:26:20 +0200
  • c2d8b78136 settings ddejongh 2015-06-18 19:03:03 +0200
  • 9b3c7e9f21 CC google tag manager ddejongh 2015-06-18 10:35:36 +0200
  • a4389ce985 git-submodule-workflow.md edited online with Bitbucket TimDaubenschuetz 2015-06-17 19:52:52 +0000
  • 3a8efb3dd6 Dimi and Tim styling action Tim Daubenschütz 2015-06-17 19:50:52 +0200
  • cd9c561ddf boilerplate for piece registration Tim Daubenschütz 2015-06-17 17:48:52 +0200
  • fabff2922c account settings ddejongh 2015-06-17 17:48:23 +0200
  • 8a0ac74da0 transfer refactor todo list from gdrive to repo Tim Daubenschütz 2015-06-17 17:18:59 +0200
  • 2f1d7bc010 add git submodule workflow documentation Tim Daubenschütz 2015-06-17 17:15:21 +0200
  • 82ceba614e finish including react-s3-fineuploader as a git submodule Tim Daubenschütz 2015-06-17 16:52:40 +0200
  • 4b7ce61d6d add react-s3-fineuploader as git submodule Tim Daubenschütz 2015-06-17 15:50:07 +0200
  • e139fd4208 remove submodule Tim Daubenschütz 2015-06-17 15:45:43 +0200
  • 1eb85786fe Merge remote-tracking branches 'remotes/origin/AD-44-in-piece-detail-support-public-not' and 'remotes/origin/master' into AD-416-account-settings-page-navbar ddejongh 2015-06-17 15:42:00 +0200
  • 3538585448 Merge branch 'master' of bitbucket.org:ascribe/onion Tim Daubenschütz 2015-06-17 15:40:26 +0200
  • 5c01a14524 add react fineuploader as a git submoduke Tim Daubenschütz 2015-06-17 15:40:01 +0200
  • 41b0a33d93 Merge branch 'master' into AD-44-in-piece-detail-support-public-not vrde 2015-06-17 10:46:31 +0200
  • 5165fa6c8c Fix https schema for jquery vrde 2015-06-17 10:16:28 +0200
  • ab8f4cb6aa Rebuild vrde 2015-06-16 23:32:14 +0200
  • d7f5496a1e Rebuild vrde 2015-06-16 22:13:21 +0200
  • 37dfde83b0 Merge remote-tracking branch 'remotes/origin/master' into AD-44-in-piece-detail-support-public-not ddejongh 2015-06-16 20:37:01 +0200
  • d50b3ca14d fixed logout ddejongh 2015-06-16 20:35:19 +0200
  • bd2be63341 Fix empty X-CSRFToken bug vrde 2015-06-16 19:28:21 +0200
  • ff12048c10 edition note ddejongh 2015-06-16 16:38:22 +0200
  • 9cf060fdc4 csrf subdomain ddejongh 2015-06-16 14:49:00 +0200
  • dfd4435e27 Fix baseUrl to load shmui vrde 2015-06-16 14:42:36 +0200
  • 309248d157 Merge branch 'master' of bitbucket.org:ascribe/onion vrde 2015-06-16 14:24:19 +0200
  • 6b2f5ed094 Empty commit to please the Heroku Gods vrde 2015-06-16 14:22:02 +0200
  • 8846a11e00 Merged in AD-44-in-piece-detail-support-public-not (pull request #2) diminator 2015-06-16 14:18:15 +0200
  • 1ecd579718 Merge remote-tracking branch 'remotes/origin/master' into AD-44-in-piece-detail-support-public-not ddejongh 2015-06-16 14:06:35 +0200
  • 8d73e4a77b edit acl editionnote ddejongh 2015-06-16 14:01:53 +0200
  • 03f09b8c83 Rename fetch to requests to avoid name clashing vrde 2015-06-16 13:48:48 +0200
  • ed3adf8f67 Rename fetch to requests to avoid name clashing vrde 2015-06-16 13:48:33 +0200
  • a247e111c0 Merge branch 'AD-421-add-signup-functionality' vrde 2015-06-16 10:58:41 +0200
  • 3784d53609 code review ddejongh 2015-06-16 10:02:55 +0200
  • 1c8ac24127 replace amazon links Tim Daubenschütz 2015-06-16 09:59:09 +0200
  • e2997891df loading icon for piece list Tim Daubenschütz 2015-06-16 09:57:14 +0200
  • 1ce9b90fff Fix pagination on search bug Tim Daubenschütz 2015-06-16 09:27:04 +0200
  • 7910384d99 solve merge conflicts Tim Daubenschütz 2015-06-16 09:02:48 +0200
  • cf3b7f234d password reset ok ddejongh 2015-06-15 16:56:17 +0200
  • 8ceabda1c5 add queryparams modal Tim Daubenschütz 2015-06-15 15:46:33 +0200
  • 56d32efcc0 password reset modal switch problems ddejongh 2015-06-15 15:28:53 +0200
  • 66f8a6a1ca login/logout functional ddejongh 2015-06-15 12:36:27 +0200
  • 07686f514f Fix (hopefully) CORS vrde 2015-06-15 11:55:50 +0200
  • aac8ae2a9e merged master ddejongh 2015-06-15 11:02:49 +0200
  • 4e1ef9fc72 Merge remote-tracking branch 'remotes/origin/master' into AD-43-in-piece_detail-add-generic-field- ddejongh 2015-06-15 09:59:53 +0200
  • 6e7037e5f2 Finish implementing refactor for open and close for edition lists Tim Daubenschütz 2015-06-15 09:29:34 +0200
  • 989b121678 Fix mangling issue Tim Daubenschütz 2015-06-15 08:44:44 +0200
  • 9cc70dc4c9 refactor open state of edition table first cut root 2015-06-12 17:18:40 +0200
  • d41f5df3ee separat ascribe-table css Tim Daubenschütz 2015-06-12 15:42:43 +0200
  • 2bb004d2fb remove edition list count in table Tim Daubenschütz 2015-06-12 15:00:26 +0200
  • 87bc6b3559 fix checkbox in edition list Tim Daubenschütz 2015-06-12 13:41:15 +0200
  • dcd770ab5f readd sourcemaps Tim Daubenschütz 2015-06-12 13:36:55 +0200
  • 7d5780d62a add another troubleshooting section Tim Daubenschütz 2015-06-12 10:14:34 +0200
  • 6ef233e43d Merge remote-tracking branch 'origin/AD-43-in-piece_detail-add-generic-field-' into AD-43-in-piece_detail-add-generic-field- ddejongh 2015-06-11 17:22:27 +0200
  • 0f1108b14e form password + signup ddejongh 2015-06-11 17:22:11 +0200
  • 79f437179d Merge branch 'AD-43-in-piece_detail-add-generic-field-' of bitbucket.org:ascribe/onion into AD-43-in-piece_detail-add-generic-field- vrde 2015-06-11 17:10:17 +0200
  • fa97470e21 Enable CORS on the frontend vrde 2015-06-11 17:07:27 +0200
  • 5e746295bc application constants ddejongh 2015-06-11 16:24:37 +0200
  • 5e7f7983e1 application constants ddejongh 2015-06-11 15:57:19 +0200
  • f4c6e025ae Merge remote-tracking branch 'remotes/origin/master' into AD-43-in-piece_detail-add-generic-field- ddejongh 2015-06-11 15:54:50 +0200
  • 4f5e7a0821 login form ddejongh 2015-06-11 15:35:18 +0200
  • bf0a2aeefb consign unconsign requests async emails ddejongh 2015-06-11 15:03:55 +0200
  • 05b9792d3f Add some new constants to the app vrde 2015-06-10 17:28:36 +0200
  • af71196dfd delete function for multi editions ddejongh 2015-06-10 15:49:46 +0200
  • 7aca8ba0fc Merge branch 'master' into AD-436-route-to-django-or-jsapp vrde 2015-06-10 15:43:04 +0200
  • 4ada116585 Add missing semicolon vrde 2015-06-10 15:42:35 +0200
  • f91b27d2a8 FFFUUUUU I cannot markdown vrde 2015-06-10 15:37:42 +0200
  • 49d458d304 Fix README.md vrde 2015-06-10 15:35:24 +0200
  • b9c8002495 Add ENV variable to handle BASE_URL vrde 2015-06-09 17:53:44 +0200
  • 9241d3e38f further details functional / unstyled ddejongh 2015-06-09 17:24:06 +0200
  • 509aa111ab Merge remote-tracking branch 'remotes/origin/master' into AD-43-in-piece_detail-add-generic-field- ddejongh 2015-06-09 16:10:38 +0200
  • 5445698eea [wip] add temporary base url vrde 2015-06-09 16:10:25 +0200
  • 30ee436f4c Merge remote-tracking branch 'remotes/origin/master' into AD-43-in-piece_detail-add-generic-field- ddejongh 2015-06-09 16:09:59 +0200
  • 669f2b3ae7 resolve merge conflict Tim Daubenschütz 2015-06-09 13:38:01 +0200
  • 296176572e add different kinds of notifications Tim Daubenschütz 2015-06-09 13:36:09 +0200
  • 6563bf97b0 toggable textarea ddejongh 2015-06-09 13:29:22 +0200
  • d3fc902411 add que functionality to globalnotification Tim Daubenschütz 2015-06-09 12:08:14 +0200
  • e0e75151e0 add first working prototype Tim Daubenschütz 2015-06-08 18:14:25 +0200
  • f732cec523 Merge branch 'AD-432-put-onion-online' vrde 2015-06-08 18:00:17 +0200
  • 38a476f7e8 Enable compression vrde 2015-06-08 17:26:27 +0200
  • 798fa1c38a disable compression vrde 2015-06-08 17:23:10 +0200
  • c4fee2880f Enable compression vrde 2015-06-08 17:20:08 +0200
  • 54b996db90 Move build dep form "defDependencies" to "dependencies" vrde 2015-06-08 15:50:47 +0200
  • 9f2019e168 Add tasks to put code in production vrde 2015-06-08 15:42:28 +0200
  • a1bfbb8f86 [wip] add server to serve app vrde 2015-06-08 15:24:58 +0200
  • b49f3fe9f2 set state bug fix Tim Daubenschütz 2015-06-08 14:51:13 +0200
  • 8a17208643 fix bulk modal bug Tim Daubenschütz 2015-06-08 14:23:19 +0200
  • 98d26f5ed7 fix minor checkbox bug Tim Daubenschütz 2015-06-08 14:13:35 +0200
  • b2241c0551 fix bulk action modal formating Tim Daubenschütz 2015-06-08 14:01:47 +0200
  • 1b52864f3e remove testing from watch process Tim Daubenschütz 2015-06-08 13:55:55 +0200
  • 6d337890d0 merge conflict Tim Daubenschütz 2015-06-08 13:47:24 +0200
  • cea111c25e solve conflict Tim Daubenschütz 2015-06-08 11:51:49 +0200
  • e2ab0c1a5c format stuff Tim Daubenschütz 2015-06-08 11:50:40 +0200
  • 793e1a78ca add tests for generalutils Tim Daubenschütz 2015-06-08 11:19:18 +0200
  • 38ab68b599 Merge branch 'master' of bitbucket.org:ascribe/onion vrde 2015-06-08 10:14:14 +0200