coop-cloud-chaos-patchs/timeoverflow
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
370 Commits 2 Branches 0 Tags
790a4d5c051f620d17cc73d33db88bbdcceedee8
Commit Graph
370 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Patri 790a4d5c05 Inverse order for list of type of swaps 2014-07-09 20:51:04 +02:00
Patri 94f1e26946 Translations 2014-07-09 20:35:27 +02:00
Patri 14544b54ac Link new report to navbar 2014-07-09 20:35:06 +02:00
Patri 13aa473cb5 Added 'Types of swaps' to statistics 2014-07-09 20:33:31 +02:00
Patri 5c7103f329 added 'without offers' report 2014-06-19 22:20:52 +02:00
Patri 4833cf677c small fix to user the correct field last login 'current_sign_in_at' 2014-06-19 22:16:01 +02:00
Patri 7649075b8c link new report on the menu 2014-06-19 21:32:32 +02:00
Patri af766beb26 added 'last login' report 2014-06-19 21:30:08 +02:00
Patri c3f8cff403 added module trackable from devise to save the date of last login 'last_sign_in_at' 2014-06-19 21:27:45 +02:00
Patri 4dd6f097e0 fix datepicker form (not submit without ng-controller) 2014-06-19 19:19:25 +02:00
Patri cb2b00b8c3 delete the old view of statistics 2014-06-18 20:23:04 +02:00
Patri ff7f8a4086 dropdown menu for statistics 2014-06-18 20:21:57 +02:00
Patri 669117ee74 separate statistics in different views 2014-06-18 20:20:56 +02:00
Patri 61d0c476e1 Small fixes after merges 2014-06-18 19:14:12 +02:00
Patri 5eff7bf8fb Merge branch 'changes_statistics' into statistics_menu_for_admin 2014-06-18 19:09:45 +02:00
Patri e89ee85d8d Merge branch 'master' into statistics_menu_for_admin 2014-06-18 18:59:06 +02:00
Saverio Trioni 8e4ea352c2 read smtp configuration from environment 2014-05-30 21:14:15 +02:00
Patri 79ccbe2e4c bug solved (not correct form) and show 6 months by default 2014-05-30 01:06:09 +02:00
Saverio Trioni 6d01b111c7 Rework of admin. 2014-05-22 23:13:30 +02:00
Saverio Trioni 4268bb558e Update of activeadmin (1.0.rc) 
Use sass-rails git master, otherwise sass 3.3 is not supported.
 2014-05-22 21:57:31 +02:00
Saverio Trioni bba81ecf5d Added org list section for non-member users. 2014-05-22 21:10:40 +02:00
Saverio Trioni e63ba69bb8 Removed old index page. 2014-05-22 20:41:05 +02:00
Saverio Trioni 5949b7c9c1 Profile edit for non-member users 2014-05-22 20:37:57 +02:00
Saverio Trioni f9beb689a0 Simple view for non-member users. 2014-05-22 20:37:42 +02:00
Saverio Trioni 6d1f2900b3 Added high_voltage gem for super-easy-peasy static pages. 2014-05-22 20:36:54 +02:00
Saverio Trioni 058ae14512 Don't fail when the user is not a member of anything... 2014-05-22 19:21:37 +02:00
Saverio Trioni b79da56876 Post.actives is now a scope, and loads the member_id attribute in the model. 2014-05-22 10:50:59 +02:00
Saverio Trioni 2cfdd9477f Correct format for balance. 2014-05-22 09:40:55 +02:00
Patri 151a94b729 bug solved date format 2014-05-22 03:29:30 +02:00
Patri a4ce31c28b add datepicker 2014-05-22 03:25:43 +02:00
Saverio Trioni e1698d7d40 Disable rollbar if not configured. 2014-05-22 02:48:49 +02:00
Saverio Trioni 83c9534ae9 updated thin version 2014-05-22 01:44:33 +02:00
Saverio Trioni 409ef038cc Merge pull request #34 from coopdevs/sign_in_home 
redirect to users_path after sign in
 2014-05-22 01:41:09 +02:00
Saverio Trioni f23802ca07 Merge pull request #35 from coopdevs/statistics_menu_for_admin 
Statistics menu for admin
 2014-05-22 01:40:56 +02:00
Saverio Trioni 349d65bd8f A small fix in the case where balance is null... 
... and some trailing spaces removed.
 2014-05-22 01:40:36 +02:00
Saverio Trioni 089cb37e3a Merge remote-tracking branch 'timeoverflow/master' into statistics_menu_for_admin 
* timeoverflow/master: (31 commits)
  Añadido post-deploy callback para rollbar.
  added rollbar exception handler
  Whoopss.... ✂️
  Refactor.
  Whooops....
  Usa angular http y modal para los cambios de estado.
  Users helper:
  Permite a las acciones con PUT y devuelve ok si se hace en json
  Usa la función de promote en el link.
  Función 'promote', que lanza un modal de confirmación, hace la llamada y cambia el estad del usuario.
  Traducciones para usar en templates de angular
  Añadido directivas bootstrap para angular
  actions according to active/inactive user
  only list posts of active members
  inactive users only list for admins and inactive users profile marked as inactive
  activate/deactivate member with confirmation alert
  add active column to members
  correct translation promote/demote
  add link to current_organization in users index
  add new fields to views
  ...

Conflicts:
	app/views/layouts/application.html.haml
 2014-05-22 01:37:06 +02:00
Saverio Trioni 18877902d4 Merge pull request #33 from coopdevs/organization_profile 
Organization profile
 2014-05-22 01:33:36 +02:00
Saverio Trioni 13e0b381bf Merge branch 'master' into organization_profile 
* master: (24 commits)
  Añadido post-deploy callback para rollbar.
  added rollbar exception handler
  Whoopss.... ✂️
  Refactor.
  Whooops....
  Usa angular http y modal para los cambios de estado.
  Users helper:
  Permite a las acciones con PUT y devuelve ok si se hace en json
  Usa la función de promote en el link.
  Función 'promote', que lanza un modal de confirmación, hace la llamada y cambia el estad del usuario.
  Traducciones para usar en templates de angular
  Añadido directivas bootstrap para angular
  actions according to active/inactive user
  only list posts of active members
  inactive users only list for admins and inactive users profile marked as inactive
  activate/deactivate member with confirmation alert
  add active column to members
  correct translation promote/demote
  by default users sort by id asc
  keep filter to change the page and back
  ...

Conflicts:
	app/views/users/index.html.haml
	config/locales/es.yml
	db/schema.rb
 2014-05-22 01:29:34 +02:00
Saverio Trioni 721db12019 Merge branch 'sort_users_list_angularjs' 
* sort_users_list_angularjs: (21 commits)
  Whoopss.... ✂️
  Refactor.
  Whooops....
  Usa angular http y modal para los cambios de estado.
  Users helper:
  Permite a las acciones con PUT y devuelve ok si se hace en json
  Usa la función de promote en el link.
  Función 'promote', que lanza un modal de confirmación, hace la llamada y cambia el estad del usuario.
  Traducciones para usar en templates de angular
  Añadido directivas bootstrap para angular
  actions according to active/inactive user
  only list posts of active members
  inactive users only list for admins and inactive users profile marked as inactive
  activate/deactivate member with confirmation alert
  add active column to members
  correct translation promote/demote
  by default users sort by id asc
  keep filter to change the page and back
  users list sort and filter
  users as json
  ...

Conflicts:
	Gemfile.lock
 2014-05-22 01:18:00 +02:00
Saverio Trioni 952ff78089 Añadido post-deploy callback para rollbar. 2014-05-22 01:14:24 +02:00
Saverio Trioni ccea4ff19e added rollbar exception handler 2014-05-22 01:10:10 +02:00
Saverio Trioni 1b08322042 Whoopss.... ✂️ 2014-05-22 00:45:52 +02:00
Saverio Trioni 28c84cc62a Refactor. 
Solamente el listado de usuarios tiene que estar necesariamente
en el template. El controller y el filtro en realidad
son completamente independientes, y se pueden meter
en el javascript principal.
 2014-05-22 00:34:21 +02:00
Saverio Trioni b1fba722ee Whooops.... 2014-05-22 00:29:31 +02:00
Saverio Trioni ed4486bfa5 Usa angular http y modal para los cambios de estado. 2014-05-22 00:19:45 +02:00
Saverio Trioni ac0269ce1a Users helper: 
* Pon los enlaces siempre, así al cambiar de estado se puede mostrar.
* calcula la membership solamente una vez por user
* indent y espacios entre a ? b : c
 2014-05-22 00:19:13 +02:00
Saverio Trioni 75b90defc5 Permite a las acciones con PUT y devuelve ok si se hace en json 2014-05-22 00:15:06 +02:00
Saverio Trioni cc200be4c7 Usa la función de promote en el link. 2014-05-15 05:00:11 +02:00
Saverio Trioni c713a03e8a Función 'promote', que lanza un modal de confirmación, 
hace la llamada y cambia el estad del usuario.

Las 'promises' se pueden encadenar, y solamente después de haber
completado la anterior se ejecuta la siguiente...

$modal.open().result.then(...).then(...).....

(http://angular-ui.github.io/bootstrap/#/modal)
 2014-05-15 04:58:46 +02:00
Saverio Trioni 58396e40be Traducciones para usar en templates de angular 
Usan {{ }} para el binding, en lugar de %{ } que usa jquery
 2014-05-15 04:55:32 +02:00