-
Notifications
You must be signed in to change notification settings - Fork 7
/
Changelog
234 lines (163 loc) · 6.31 KB
/
Changelog
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
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
commit fcb23de7c73a2a38df4c5b4a2fdaaed565b6a580
Merge: d42ec81 051c130
Author: joseluis laso <[email protected]>
Date: Sat Feb 16 21:25:29 2013 +0100
- Merge branch 'feature/bootstrap' into develop
commit 051c13075164e7195b19471df42ebb8d05eb6f26
Author: joseluis laso <[email protected]>
Date: Sat Feb 16 21:24:59 2013 +0100
- Change style of frontend.
commit d42ec810088f840233146590b71e2e3787523a29
Author: joseluis laso <[email protected]>
Date: Tue Feb 5 22:02:28 2013 +0100
- Correct dbconfig_sample.php
commit b4e346f768a96f0e868d66c5d36458ac8fbb712c
Merge: b383be1 a7ee660
Author: joseluis laso <[email protected]>
Date: Sun Jan 20 21:57:19 2013 +0100
Merge branch 'master' into develop
commit a7ee6602c7a286910ac40f01c2e47ae4e88bac75
Merge: 829f3bb f1c8afb
Author: joseluis laso <[email protected]>
Date: Sun Jan 20 21:56:44 2013 +0100
- Merge branch 'master' of github.com:jlaso/my-simple-web
Conflicts:
README.md
commit 829f3bb85ca1b36cc2a8ab657b8b09ee1f87a13f
Merge: a3cf820 b383be1
Author: joseluis laso <[email protected]>
Date: Sun Jan 20 21:53:47 2013 +0100
Merge branch 'develop'
commit b383be12248c0e929260080770d3e76cca41a370
Merge: ddfbc1c 758a0cb
Author: joseluis laso <[email protected]>
Date: Sun Jan 20 21:52:37 2013 +0100
Merge branch 'i18n' into develop
commit 758a0cb3fa90bce987afa41c12cf3ffe977e04e8
Author: joseluis laso <[email protected]>
Date: Sun Jan 20 21:49:16 2013 +0100
- Changes in entities,controllers and templates that permits use
i18n with gettext, close #2
commit a3cf82042ce7d77d978252db2f9a74592cc9c028
Merge: 7655b81 b234102
Author: joseluis laso <[email protected]>
Date: Sun Jan 20 19:49:54 2013 +0100
Merge branch 'feature/fix-readme-info'
commit ddfbc1c3923b316ca6934a064fa8a338697d177f
Merge: fd93e8f b234102
Author: joseluis laso <[email protected]>
Date: Sun Jan 20 19:49:47 2013 +0100
Merge branch 'feature/fix-readme-info' into develop
commit b234102206e51bbf537880d3aa9eabaa60de7a3e
Author: joseluis laso <[email protected]>
Date: Sun Jan 20 19:49:00 2013 +0100
- Changed git repo info
commit 7655b81a43f1cd4920b798f9182dde9038c16cfb
Merge: b47f978 39846e6
Author: joseluis laso <[email protected]>
Date: Sun Jan 20 18:58:30 2013 +0100
Merge branch 'release/1.2'
commit fd93e8fa63b795be3f1f307aff7554568b605efc
Merge: fe02507 39846e6
Author: joseluis laso <[email protected]>
Date: Sun Jan 20 18:58:11 2013 +0100
Merge branch 'release/1.2' into develop
commit 39846e6c9a7e8bc5c84ec3c8fc8df4cbd921b727
Author: joseluis laso <[email protected]>
Date: Sun Jan 20 18:57:43 2013 +0100
- Change to version 1.2.
commit fe025078c15ffc05ca7367a2a6dba627adb7e7a9
Merge: d79815b 0af2f74
Author: joseluis laso <[email protected]>
Date: Sun Jan 20 18:56:09 2013 +0100
Merge branch 'feature/role-user' into develop
commit 0af2f748de51c241afce1c63caf77d6782f5be3e
Author: joseluis laso <[email protected]>
Date: Sun Jan 20 18:55:24 2013 +0100
- Various changes including role_user and master-detail form principles.
commit f1c8afbf0d932fbf0efd2532fdde1d4dee9df18f
Author: Joseluis Laso <[email protected]>
Date: Sun Jan 20 09:52:31 2013 -0800
Initial commit
commit d79815b7bee67ec293f6c8091b3299789400934e
Merge: 74fd63e b47f978
Author: joseluis laso <[email protected]>
Date: Tue Jan 15 23:47:28 2013 +0100
Merge branch 'master' into develop
commit b47f9783f6d47a772773294b4b8b57e4b183d4ff
Author: joseluis laso <[email protected]>
Date: Tue Jan 15 23:47:10 2013 +0100
- ChangeLog
commit d49441879e6deb5fc177a3cd09baceca284d5621
Author: joseluis laso <[email protected]>
Date: Tue Jan 15 23:41:06 2013 +0100
- Untrack custom image files
commit 34f682d6cf84b9b4382424e30d6e3e79c6b55e63
Merge: 97a4d58 74fd63e
Author: joseluis laso <[email protected]>
Date: Tue Jan 15 23:36:46 2013 +0100
Merge branch 'develop'
commit 97a4d580e596490fccfeeeaea5096584b8c8e5b7
Merge: 2ae08e1 954f123
Author: joseluis laso <[email protected]>
Date: Tue Jan 15 23:36:17 2013 +0100
Merge branch 'release/0.1.1'
Conflicts:
ShortLog
VERSION
commit 74fd63e3d2dd36f0a77265dd122ea80161b55321
Merge: 494e05e 954f123
Author: joseluis laso <[email protected]>
Date: Tue Jan 15 23:34:58 2013 +0100
Merge branch 'release/1.1.1' into develop
commit 954f123e807b09dfea04580daa1a59807be23efd
Author: joseluis laso <[email protected]>
Date: Tue Jan 15 23:34:43 2013 +0100
- Change to version 1.1.1.
commit 494e05ea8b37fc73aff70546fe9e2179a0653185
Merge: b31fe2c ba47382
Author: joseluis laso <[email protected]>
Date: Tue Jan 15 23:32:59 2013 +0100
Merge branch 'fix/privacy-policy' into develop
commit ba473828ba6ce75d22545d275608db47c2dfcf7f
Author: joseluis laso <[email protected]>
Date: Tue Jan 15 23:32:14 2013 +0100
- Repair the fixture that creates privacy policy.
commit 2ae08e13dcc8a2c5999ca7ab28415ba27648a857
Merge: a3919de f1a017d
Author: joseluis laso <[email protected]>
Date: Tue Jan 15 23:07:29 2013 +0100
Merge branch 'release/1.1'
commit f1a017db75dd41bb8bf0c213e08da9ec8c700446
Author: joseluis laso <[email protected]>
Date: Tue Jan 15 23:01:57 2013 +0100
- Cambio a version 1.1
commit b31fe2c213252a39615b062d83010d146c13f41f
Merge: a3919de 3eae788
Author: joseluis laso <[email protected]>
Date: Tue Jan 15 22:57:36 2013 +0100
Merge branch 'feature/composer-autoload' into develop
commit 3eae78843c96764184941b279a31cc8a1439e7b5
Author: joseluis laso <[email protected]>
Date: Tue Jan 15 22:56:43 2013 +0100
- Update on models
commit 18e40dfb2a616f9b6568a8068336f0feb8c943ff
Author: joseluis laso <[email protected]>
Date: Sun Jan 13 23:47:33 2013 +0100
- Refactorize core and entities
commit a3919dea9ac647e8d11b2d84a70287c3572bbdc5
Author: joseluis laso <[email protected]>
Date: Sun Jan 6 20:32:09 2013 +0100
- set default_timezone
commit 31c05148abdd6e48ddfb0131fa77b5fd3c7094db
Author: joseluis laso <[email protected]>
Date: Sun Jan 6 20:11:14 2013 +0100
- change dbconfig_sample.php db
commit 18e1d30915027db20b4b959b7cc1e7f9f1b2c0e9
Author: joseluis laso <[email protected]>
Date: Sun Jan 6 20:03:16 2013 +0100
- ignore server dbconfig.php and remote it from the repo
commit 5cea128385351cb7b383ae50f55851dec366fe3c
Author: joseluis laso <[email protected]>
Date: Sun Jan 6 19:37:29 2013 +0100
- initial commit