Commits · 6feada89e64e4f283e02a9c512995a722f0276fc · Dong Zhuang / relate · GitLab

Jan 30, 2016
- local select2 'static' resources instead of from CDN · 6feada89
  Dong Zhuang authored Jan 31, 2016
  
  6feada89
- Merge pull request #155 from dzhuang/datatable_i18n · 0d6a5ade
  Andreas Klöckner authored Jan 30, 2016
  
  l10n for DataTable.
  0d6a5ade
- Merge pull request #158 from lukeolson/fix-django-dep18-warnings · 98b73b58
  Andreas Klöckner authored Jan 30, 2016
  
  fix TEMPLATE_* warnings
  98b73b58
- missing {% load static %} · 3081064d
  Dong Zhuang authored Jan 30, 2016
  
  3081064d
- Merge branch 'master' of https://github.com/inducer/relate into datatable_i18n · e8b73360
  Dong Zhuang authored Jan 30, 2016
  
  Conflicts: relate/settings.py
  e8b73360
- using datatables-i18n project with standard ISO-639-1 language codes. · 7a3659e9
  Dong Zhuang authored Jan 30, 2016
  
  7a3659e9
- fix TEMPLATE_* warnings · d0f4a148
  lukeolson authored Jan 30, 2016
  
  this was a simple removal of TEMPLATE_*. Mostly removing redundancy that was causing the warnings.
  d0f4a148
Jan 29, 2016
- Merge branch 'uiuc-instance' · baa8b32f
  Andreas Klöckner authored Jan 29, 2016
  
  baa8b32f
- Runpy: silence matplotlib font cache warnings · b5767dc4
  Andreas Klöckner authored Jan 29, 2016
  
  b5767dc4
- Update docker image build · 19d489ab
  Andreas Klöckner authored Jan 29, 2016
  
  19d489ab
- Use updated sympy<->pymbolic import location · e1d65ebe
  Andreas Klöckner authored Jan 29, 2016
  
  e1d65ebe
- Merge branch 'uiuc-instance' · b63fd490
  Andreas Klöckner authored Jan 29, 2016
  
  b63fd490
- Merge branch 'uiuc-instance' of github.com:inducer/relate into uiuc-instance · 0efe69d6
  Andreas Klöckner authored Jan 29, 2016
  
  0efe69d6
- Merge branch 'uiuc-instance' · 404598e5
  Andreas Klöckner authored Jan 29, 2016
  
  404598e5
- Fix bytes/str bug in media: URL handler · 86746f4d
  Andreas Klöckner authored Jan 29, 2016
  
  86746f4d
- Merge branch 'uiuc-instance' of github.com:inducer/relate into uiuc-instance · af975ec6
  Andreas Klöckner authored Jan 29, 2016
  
  af975ec6
- Ignore metadata getter script · 2bb27bae
  Andreas Klöckner authored Jan 29, 2016
  
  2bb27bae
- Merge branch 'uiuc-instance' · b9ead8c4
  Andreas Klöckner authored Jan 29, 2016
  
  b9ead8c4
- Tweaks to attributes-yml file access for roles · 783740a2
  Andreas Klöckner authored Jan 29, 2016
  
  783740a2
- Implement role-based access restrictions for repo: and repocur: (patch by @lukeolson) · 558fc665
  Andreas Klöckner authored Jan 29, 2016
  
  558fc665
- Merge branch 'uiuc-instance' · 944e7c4b
  Andreas Klöckner authored Jan 29, 2016
  
  944e7c4b
- Better explain what set-up/test code are about · 74e9d100
  Andreas Klöckner authored Jan 29, 2016
  
  74e9d100
- Adjust for newer datatables and videojs bower packages (Fixes #154) · 12732008
  Andreas Klöckner authored Jan 29, 2016
  
  12732008
- l10n for DataTable. · 6788c2d5
  Dong Zhuang authored Jan 29, 2016
  
  6788c2d5
Jan 27, 2016
- Merge branch 'uiuc-instance' · 7dd42e12
  Andreas Klöckner authored Jan 27, 2016
  
  7dd42e12
- Terminology improvements (suggested by Mike Heath) · 2e6fc56c
  Andreas Klöckner authored Jan 27, 2016
  
  2e6fc56c
Jan 26, 2016
- Admin tweaks · ffcbdd61
  Andreas Klöckner authored Jan 26, 2016
  
  ffcbdd61
- Fixes to interaction between verification and user profile editing · 43d98da9
  Andreas Klöckner authored Jan 26, 2016
  
  43d98da9
- Merge branch 'master' into inst_id_in_profile_form_v2 · c910e40f
  Andreas Klöckner authored Jan 26, 2016
  
  c910e40f
- naming inst_id_locked -> inst_id_justified · e5467447
  Dong Zhuang authored Jan 26, 2016
  
  e5467447
Jan 25, 2016
- Merge branch 'uiuc-instance' · 51da8d72
  Andreas Klöckner authored Jan 25, 2016
  
  51da8d72
- Fix analytics error msg · da601005
  Andreas Klöckner authored Jan 25, 2016
  
  da601005
- Merge branch 'uiuc-instance' · 625f76f0
  Andreas Klöckner authored Jan 25, 2016
  
  625f76f0
- Analytics: Give better error if flow not found · 9e3183d7
  Andreas Klöckner authored Jan 25, 2016
  
  9e3183d7
Jan 24, 2016
- Merge branch 'uiuc-instance' · c862aabf
  Andreas Klöckner authored Jan 24, 2016
  
  c862aabf
- Add link to admin participation list · d9a104bd
  Andreas Klöckner authored Jan 24, 2016
  
  d9a104bd
- Merge branch 'uiuc-instance' · eb41f130
  Andreas Klöckner authored Jan 24, 2016
  
  eb41f130
- Merge branch 'uiuc-instance' of github.com:inducer/relate into uiuc-instance · 8a421415
  Andreas Klöckner authored Jan 24, 2016
  
  8a421415
- Tweak SAML sample settings to match UIUC config · 1ec11a20
  Andreas Klöckner authored Jan 24, 2016
  
  1ec11a20
- Merge branch 'uiuc-instance' · 272d10cc
  Andreas Klöckner authored Jan 24, 2016
  
  272d10cc