Commits · master · xiphon / CCS Frontend

29 Jan, 2019 1 commit
- fix milestones tab layout · c32e8f4a
  xiphon authored Jan 29, 2019
  
  c32e8f4a
28 Jan, 2019 4 commits
- Merge branch 'logo-update' into 'master' · 321788b2
  Diego Salazar authored Jan 28, 2019
```
Replaced Monero Logo with CCS stuff

See merge request monero-project/ccs-front!12
```
  321788b2
- Replaced Monero Logo with CCS stuff · 321f3ddb
  Diego Salazar authored Jan 27, 2019
  
  321f3ddb
- Merge branch 'remove-ffs' into 'master' · df9de35e
  Diego Salazar authored Jan 28, 2019
```
Removed all traces of "FFS" from the CCS

See merge request monero-project/ccs-front!11
```
  df9de35e
- Removed all traces of "FFS" from the CCS · a0d52075
  Diego Salazar authored Jan 27, 2019
```
- Renamed files and layouts
- Switched the jekyll stufs to pull from the correct file names now
Signed-off-by: Diego Salazar <[email protected]>
```
  a0d52075
27 Jan, 2019 8 commits
- Merge branch 'readd-sub' into 'master' · 37019334
  Diego Salazar authored Jan 27, 2019
```
Readded proposals submodule from new location

See merge request monero-project/ccs-front!10
```
  37019334
- Readded proposals submodule from new location · 07bbb470
  Diego Salazar authored Jan 27, 2019
  
  07bbb470
- Merge branch 'submodule' into 'master' · 9cfeede6
  Diego Salazar authored Jan 27, 2019
```
Submodule and Fixes

See merge request monero-project/forum-funding-system!9
```
  9cfeede6
- Removed submodule proposals temp · 75535b2d
  Diego Salazar authored Jan 27, 2019
  
  75535b2d
- Removed submodule proposals temp · c6632038
  Diego Salazar authored Jan 27, 2019
  
  c6632038
- Merge branch 'lil-updates' into 'master' · e7a46441
  Diego Salazar authored Jan 27, 2019
```
Lil updates

See merge request monero-project/forum-funding-system!8
```
  e7a46441
- Fix FR cuz I'm a loser · 52af803b
  authored Jan 27, 2019
  
  52af803b
- Updates · b36ff117
  authored Jan 27, 2019
```
- Updated Donate page and CSS for subaddresses
- Fixed bugs in Funding Required and Work in Progress
```
  b36ff117
08 Jan, 2019 2 commits
- Merge branch 'ze-updates' into 'master' · 91e624aa
  Diego Salazar authored Jan 08, 2019
```
Changed URL to Gitlab URL for ideas to direct properly

See merge request monero-project/forum-funding-system!7
```
  91e624aa
- Changed URL to Gitlab URL for ideas to direct properly · a7d1d08e
  Diego Salazar authored Jan 08, 2019
  
  a7d1d08e
21 Dec, 2018 2 commits
- Merge branch 'json' into 'master' · 6b2010d0
  Diego Salazar authored Dec 21, 2018
```
Switched YAML files to JSON.

See merge request monero-project/forum-funding-system!6
```
  6b2010d0
- Switched YAML files to JSON. · a65ed61b
  Diego Salazar authored Dec 21, 2018
  
  a65ed61b
20 Dec, 2018 5 commits
- Merge branch 'finishing-touches' into 'master' · 7f6071ae
  Diego Salazar authored Dec 20, 2018
```
Took out all static "example" content. Ready for production.

See merge request monero-project/forum-funding-system!5
```
  7f6071ae
- Took out all static "example" content. Ready for production. · 885147b1
  Diego Salazar authored Dec 20, 2018
```
- ALSO SOLVED THAT ONE THING I'VE bEEN WORKING ON FOR TWO yeARS. HAHAHA TAKE THAT JEKYLL!
```
  885147b1
- Merge branch 'proposals' into 'master' · e4735c55
  Diego Salazar authored Dec 20, 2018
```
Proposals

See merge request monero-project/forum-funding-system!4
```
  e4735c55
- Added proposals as a submodule pointing to monero-project/ffs-proposals.git · 0726e6f4
  Diego Salazar authored Dec 20, 2018
  
  0726e6f4
- Removed proposals folder with the proposals · 75485c2a
  Diego Salazar authored Dec 20, 2018
```
- Submodule will readd them
```
  75485c2a
18 Dec, 2018 9 commits
- Merge branch 'remove-site' into 'master' · 69b0ff89
  Diego Salazar authored Dec 18, 2018
```
Removed _site from git

See merge request monero-project/forum-funding-system!3
```
  69b0ff89
- Removed _site from git · 922f76a8
  Diego Salazar authored Dec 18, 2018
  
  922f76a8
- Merge branch 'more-updates' into 'master' · 9ee7d5c7
  Diego Salazar authored Dec 18, 2018
```
Removed Completed Proposals from ffs.yml for easier merging

See merge request monero-project/forum-funding-system!2
```
  9ee7d5c7
- Removed Completed Proposals from ffs.yml for easier merging · 6ed66f9a
  Diego Salazar authored Dec 18, 2018
```
- Made Completed Proposals have its own yml file
```
  6ed66f9a
- Merge branch 'cleanup' into 'master' · b15544fd
  Diego Salazar authored Dec 18, 2018
```
Cleanup

See merge request monero-project/forum-funding-system!1
```
  b15544fd
- Added .gitignore for _site changes · c96afcc0
  Diego Salazar authored Dec 18, 2018
  
  c96afcc0
- Changed donation page to a standalone page for template purposes. Not jekyll. · a0283c13
  Diego Salazar authored Dec 18, 2018
  
  a0283c13
- Removed "summary" variable from _data/ffs.yml · 953f2b2d
  Diego Salazar authored Dec 18, 2018
```
- No longer used
```
  953f2b2d
- Added initial state of FFS front end · a0072a8b
  Diego Salazar authored Dec 18, 2018
  
  a0072a8b