Peng DU
|
d0956bb0aa
|
show wallet transactions of user
|
2016-07-21 16:32:54 +02:00 |
|
Peng DU
|
db8a6e8a32
|
application can show user wallet
|
2016-07-21 16:32:53 +02:00 |
|
Peng DU
|
61b9cf71f0
|
add log level to env
|
2016-07-19 16:37:25 +02:00 |
|
Peng DU
|
79ef7f4188
|
refactoring show training controller and add a new action avaibilities
|
2016-07-19 12:16:41 +02:00 |
|
Peng DU
|
e504f035d3
|
fix orthographie
|
2016-07-18 17:52:03 +02:00 |
|
Peng DU
|
120df2e716
|
add an aside for filter caldendar in mobile
|
2016-07-18 16:31:14 +02:00 |
|
Peng DU
|
70d623f65a
|
filter calendar by machine/formation/event or disponible
|
2016-07-14 18:36:52 +02:00 |
|
Peng DU
|
f26e211acb
|
update locale
|
2016-07-14 12:20:03 +02:00 |
|
Peng DU
|
fb26a2e358
|
add public calendar menu, view, controller, routes and refactoring calldendar config
|
2016-07-14 12:20:02 +02:00 |
|
Peng DU
|
1529e4b14e
|
allow active/disactive a training to show in training lists
|
2016-07-14 12:18:24 +02:00 |
|
Sylvain
|
6839e8db38
|
Merge branch 'events' into dev
Conflicts:
CHANGELOG.md
config/locales/app.shared.en.yml
config/locales/app.shared.fr.yml
|
2016-07-13 18:32:30 +02:00 |
|
Sylvain
|
90142ae3bb
|
Merge branch 'training' into dev
|
2016-07-13 18:15:14 +02:00 |
|
Sylvain
|
68f9324725
|
Merge branch 'steps' into dev
Conflicts:
app/assets/javascripts/controllers/projects.coffee.erb
db/schema.rb
|
2016-07-13 16:10:18 +02:00 |
|
Sylvain
|
2c8001f38f
|
Merge branch 'projects' into dev
Conflicts:
app/views/api/members/show.json.jbuilder
|
2016-07-13 15:57:45 +02:00 |
|
Sylvain
|
3413c3040b
|
[ongoing] members export full infos
|
2016-07-12 17:46:19 +02:00 |
|
Sylvain
|
827b3334e1
|
migrate export subscriptions to axlsx
|
2016-07-12 13:10:06 +02:00 |
|
Sylvain
|
85912603a2
|
migrate export reservations to axlsx
|
2016-07-12 13:00:56 +02:00 |
|
Sylvain
|
d72e39f716
|
migrate export members to axlsx
|
2016-07-12 12:48:26 +02:00 |
|
Sylvain
|
022db4e486
|
export all stats indices to excel
|
2016-07-07 16:26:25 +02:00 |
|
Sylvain
|
8e8bd3f9eb
|
full subscriptions export
|
2016-07-07 15:31:22 +02:00 |
|
Sylvain
|
d307f91983
|
use an hidden form to post export data
|
2016-07-05 17:23:14 +02:00 |
|
Sylvain
|
4dcab27af2
|
API generate valid xlsx files
|
2016-07-05 16:13:11 +02:00 |
|
Sylvain
|
b26bbd18ef
|
API accessing service & conforming server-side access points
|
2016-07-05 12:21:55 +02:00 |
|
Sylvain
|
38c00391fc
|
basic UI and API for exporting stats to excel
|
2016-07-04 17:15:37 +02:00 |
|
Sylvain
|
fda619e422
|
add info message on categories management + fix existing categories slugs
|
2016-06-30 16:12:24 +02:00 |
|
Sylvain
|
471fe971bc
|
remove course & workshop from seeds file
|
2016-06-30 15:13:58 +02:00 |
|
Sylvain
|
e930e04ed6
|
add age&theme filters to statistics
|
2016-06-30 12:48:46 +02:00 |
|
Sylvain
|
e36df94f0f
|
server-side protection against deleting used filters
|
2016-06-30 11:39:56 +02:00 |
|
Sylvain
|
c8b42f1b7f
|
add slugs to event filters + add categories into statistics + prevent remove linked elements in front
|
2016-06-30 11:24:57 +02:00 |
|
Sylvain
|
bb6295c487
|
prevent from removing the last category
|
2016-06-30 09:51:06 +02:00 |
|
Sylvain
|
859960ce3e
|
confirmation on event filter deletion
|
2016-06-30 09:34:26 +02:00 |
|
Sylvain
|
e13870555b
|
ability to link filters to events
|
2016-06-29 17:05:42 +02:00 |
|
Sylvain
|
bdda4cd7b0
|
[feature] ability to filter events by category, theme and age
|
2016-06-29 16:09:27 +02:00 |
|
Sylvain
|
79b97eb113
|
[feature] manage event's age range
|
2016-06-29 11:21:21 +02:00 |
|
Sylvain
|
51cce7bbc3
|
[feature] manage event themes
|
2016-06-29 10:38:04 +02:00 |
|
Sylvain
|
9adc219edb
|
[feature] manage events categories
|
2016-06-28 17:06:33 +02:00 |
|
Sylvain
|
4d4248bcca
|
Merge branch 'dev' into events
Conflicts:
db/seeds.rb
|
2016-06-28 14:18:15 +02:00 |
|
Sylvain
|
99aa8120fc
|
i18n statistics
|
2016-06-28 14:07:59 +02:00 |
|
Sylvain
|
9000305a11
|
fix missing translation in API doc
|
2016-06-28 11:57:04 +02:00 |
|
Sylvain
|
7d02fa9d9a
|
rename Courses/Workshops to Events
|
2016-06-28 11:42:20 +02:00 |
|
Sylvain
|
d5b06d08ad
|
[feature] confirmation on project deletion
|
2016-06-28 10:02:36 +02:00 |
|
Sylvain
|
f6f539d2fc
|
link to openAPI documentation in front interface
|
2016-06-27 17:23:05 +02:00 |
|
Sylvain
|
875e513f1c
|
Merge remote-tracking branch 'origin/open-api' into dev
|
2016-06-27 16:31:50 +02:00 |
|
Peng DU
|
df8dbfae8c
|
fix conflt of changelog
|
2016-06-27 12:42:57 +02:00 |
|
Sylvain
|
24f963645b
|
optimize usernames mapping in statistics
|
2016-06-21 14:39:44 +02:00 |
|
Sylvain
|
4639a15e2f
|
[feature] paginate statistics
|
2016-06-21 13:16:42 +02:00 |
|
Peng DU
|
8b699153cc
|
update jbuilder and add cache in progress
|
2016-06-20 19:41:05 +02:00 |
|
Sylvain
|
ba4115a1da
|
Merge remote-tracking branch 'origin/plugin' into dev
|
2016-06-16 17:13:36 +02:00 |
|
Sylvain
|
f7d8d18bc8
|
[feature] paginate public list of members
|
2016-06-16 16:09:22 +02:00 |
|
Sylvain
|
ddbb043a41
|
do not retrieve full users list on plans page
|
2016-06-16 14:26:10 +02:00 |
|