vrde
|
436ffabffb
|
Add custom buttons
|
2015-09-07 11:40:05 +02:00 |
|
vrde
|
24d5275c1a
|
Move styleguide to actual app
|
2015-09-03 14:26:25 +02:00 |
|
vrde
|
50eeafba16
|
Merge branch 'master' into AD-884-refactor-styles-for-buttons
Conflicts:
sass/main.scss
|
2015-09-03 10:40:33 +02:00 |
|
vrde
|
2f5c70eceb
|
Remove unused ButtonSubmitOrClose and styles
|
2015-09-02 17:36:01 +02:00 |
|
vrde
|
e2b2c91f8e
|
Merge branch 'exp-styleguide' into AD-884-refactor-styles-for-buttons
|
2015-09-01 15:48:48 +02:00 |
|
vrde
|
287cf09ada
|
Merge branch 'master' into AD-901-add-lint-for-scss
|
2015-09-01 14:41:52 +02:00 |
|
TimDaubenschuetz
|
c33976ad37
|
Merged in AD-875-slidecontainer-add-vendor-prefixe (pull request #41)
add vendor prefixes for slide container
|
2015-09-01 09:49:57 +02:00 |
|
Tim Daubenschütz
|
f83300e597
|
incorporate pr feedback
|
2015-09-01 09:34:29 +02:00 |
|
vrde
|
b6fc0e931d
|
Update readme with doc on how to install the linter
|
2015-08-31 19:13:09 +02:00 |
|
vrde
|
d2adc7a388
|
Merge remote-tracking branch 'origin/master' into AD-901-add-lint-for-scss
Conflicts:
sass/main.scss
|
2015-08-31 19:09:09 +02:00 |
|
vrde
|
99af814492
|
Lint scss
|
2015-08-31 19:04:47 +02:00 |
|
Tim Daubenschütz
|
abbaa80bac
|
disable browsersync ghostmode by default
|
2015-08-31 18:05:14 +02:00 |
|
Tim Daubenschütz
|
9aa47a5de4
|
open localhost.com:3000 instead of localhost:3000
|
2015-08-31 17:55:27 +02:00 |
|
TimDaubenschuetz
|
f318b6bb3e
|
Merged in AD-788-upon-filter-that-has-no-match-a-r (pull request #43)
integrate unfilteredPieceListCount into piece list store and list
|
2015-08-31 17:41:15 +02:00 |
|
Tim Daubenschütz
|
55948bc9ba
|
integrate unfilteredPieceListCount into piece list store and list
|
2015-08-31 16:57:16 +02:00 |
|
vrde
|
3f34fc680e
|
Get rid of ascribe-btn-gray
|
2015-08-28 16:40:54 +02:00 |
|
Tim Daubenschütz
|
02ed21fef5
|
fix nav links on logged out user
|
2015-08-28 15:31:12 +02:00 |
|
diminator
|
02ca36682e
|
Merged in AD-456-ikonotv-branded-page-for-registra (pull request #42)
Ad 456 ikonotv branded page for registra
|
2015-08-28 14:35:21 +02:00 |
|
Tim Daubenschütz
|
ddfc8b9621
|
minor fixes
|
2015-08-28 14:27:02 +02:00 |
|
Tim Daubenschütz
|
8e7aeab3a6
|
Merge branch 'AD-456-ikonotv-branded-page-for-registra' of bitbucket.org:ascribe/onion into AD-456-ikonotv-branded-page-for-registra
|
2015-08-28 14:08:45 +02:00 |
|
Tim Daubenschütz
|
52ae348e57
|
dynamic acl for acl_submit
|
2015-08-28 14:07:29 +02:00 |
|
diminator
|
02e105d2b8
|
text refactor
|
2015-08-28 14:00:50 +02:00 |
|
diminator
|
1b730573c7
|
ikonotv acl_submitted + refactor
|
2015-08-28 13:58:24 +02:00 |
|
diminator
|
680cc8572f
|
ikonotv acl_submit
|
2015-08-28 13:52:58 +02:00 |
|
Tim Daubenschütz
|
d40b671b45
|
remove ikonotv boilerplate landing page
|
2015-08-28 12:48:48 +02:00 |
|
Tim Daubenschütz
|
8eec5d8f38
|
Merge branch 'AD-863-acl-forms-prefil-email-address-an' into AD-456-ikonotv-branded-page-for-registra
|
2015-08-28 12:44:02 +02:00 |
|
Tim Daubenschütz
|
5219dd5cf7
|
fix bug + enable contract
|
2015-08-28 12:40:00 +02:00 |
|
Tim Daubenschütz
|
e9d0311f58
|
custom ikonotv piece page
|
2015-08-28 12:33:00 +02:00 |
|
Tim Daubenschütz
|
2c26aab8cc
|
add exception for loaning a piece for ikonotv
|
2015-08-28 12:20:36 +02:00 |
|
Tim Daubenschütz
|
89f68abcec
|
add: Loan form for Ikonotv
|
2015-08-28 12:11:29 +02:00 |
|
Tim Daubenschütz
|
9a9aa68ca9
|
fix lazy evalutaion of loan form
|
2015-08-28 11:13:28 +02:00 |
|
vrde
|
73c5ab56c3
|
playing around with the styleguide app
|
2015-08-28 11:06:25 +02:00 |
|
Tim Daubenschütz
|
8e5c04140f
|
add vendor prefixes for slide container
|
2015-08-27 18:11:47 +02:00 |
|
Tim Daubenschütz
|
86efb66663
|
add collapsible appendix to send contract form
|
2015-08-27 17:33:51 +02:00 |
|
Tim Daubenschütz
|
65148e24de
|
remove contract form from ikonotv codebase and integrate it into ascribe-core
|
2015-08-27 14:56:49 +02:00 |
|
Tim Daubenschütz
|
64d23f82df
|
refactoring of the general architecture
|
2015-08-27 14:47:33 +02:00 |
|
Tim Daubenschütz
|
9d7a9bd028
|
add router/navigation integration into whole project
|
2015-08-27 14:34:15 +02:00 |
|
Tim Daubenschütz
|
b67466d196
|
Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra
|
2015-08-27 14:05:21 +02:00 |
|
Tim Daubenschütz
|
4b2f48bc50
|
Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra
|
2015-08-27 13:48:33 +02:00 |
|
diminator
|
b229dbb79f
|
Merged in AD-661-due-1208-implement-jury-rating-an (pull request #40)
Ad 661 due 1208 implement jury rating an
|
2015-08-27 13:48:16 +02:00 |
|
diminator
|
bc28f3d8f5
|
loan request actions for multiple actions
|
2015-08-27 13:43:26 +02:00 |
|
diminator
|
79106dd106
|
loan request + answer complete
|
2015-08-27 11:38:21 +02:00 |
|
diminator
|
8406272187
|
review comments
|
2015-08-27 10:18:50 +02:00 |
|
diminator
|
33d5480f2f
|
review comments
|
2015-08-27 10:10:39 +02:00 |
|
diminator
|
11c42fc997
|
Merge remote-tracking branch 'remotes/origin/master' into AD-661-due-1208-implement-jury-rating-an
|
2015-08-27 09:38:43 +02:00 |
|
diminator
|
144b823777
|
Merge remote-tracking branch 'origin/AD-661-due-1208-implement-jury-rating-an' into AD-661-due-1208-implement-jury-rating-an
|
2015-08-27 09:22:08 +02:00 |
|
diminator
|
1f95ae3a41
|
show email of user registered on select
|
2015-08-27 09:21:48 +02:00 |
|
vrde
|
65ae11ca16
|
Merge branch 'AD-862-remove-confusion-introduced-in-prev-update'
|
2015-08-26 18:06:26 +02:00 |
|
Tim Daubenschütz
|
8cc1f91a3a
|
Merge branch 'AD-661-due-1208-implement-jury-rating-an' of bitbucket.org:ascribe/onion into AD-661-due-1208-implement-jury-rating-an
|
2015-08-26 18:05:22 +02:00 |
|
Tim Daubenschütz
|
b4f68f23e8
|
update react-datepicker DO NPM INSTALL
|
2015-08-26 18:03:58 +02:00 |
|