-
Notifications
You must be signed in to change notification settings - Fork 7
/
Copy pathShortLog
39 lines (37 loc) · 1.49 KB
/
ShortLog
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
Joseluis Laso (1):
Initial commit
joseluis laso (34):
- initial commit
- ignore server dbconfig.php and remote it from the repo
- change dbconfig_sample.php db
- set default_timezone
- Refactorize core and entities
- Update on models
Merge branch 'feature/composer-autoload' into develop
- Cambio a version 1.1
Merge branch 'release/1.1'
- Repair the fixture that creates privacy policy.
Merge branch 'fix/privacy-policy' into develop
- Change to version 1.1.1.
Merge branch 'release/1.1.1' into develop
Merge branch 'release/0.1.1'
Merge branch 'develop'
- Untrack custom image files
- ChangeLog
Merge branch 'master' into develop
- Various changes including role_user and master-detail form principles.
Merge branch 'feature/role-user' into develop
- Change to version 1.2.
Merge branch 'release/1.2' into develop
Merge branch 'release/1.2'
- Changed git repo info
Merge branch 'feature/fix-readme-info' into develop
Merge branch 'feature/fix-readme-info'
- Changes in entities,controllers and templates that permits use i18n with gettext, close #2
Merge branch 'i18n' into develop
Merge branch 'develop'
- Merge branch 'master' of github.com:jlaso/my-simple-web
Merge branch 'master' into develop
- Correct dbconfig_sample.php
- Change style of frontend.
- Merge branch 'feature/bootstrap' into develop