devin chen
|
e1f161cc5d
|
gridster update
|
2013-06-18 15:28:51 +08:00 |
 Harry Bomrah
|
d61ff5f91c
|
apps update -- app upload and activation
|
2013-06-18 15:27:53 +08:00 |
|
devin chen
|
c9747f9fc6
|
app manager's view update
|
2013-06-18 15:26:53 +08:00 |
|
devin chen
|
269264d232
|
'select2' minor update
|
2013-06-18 15:26:36 +08:00 |
|
Harry Bomrah
|
8b53ad6cc6
|
fixed saving of positions of the tiles again
|
2013-06-18 15:26:15 +08:00 |
|
devin chen
|
41afb46bf6
|
app manager view update
|
2013-06-18 15:25:49 +08:00 |
|
Harry Bomrah
|
7e6433f71c
|
solved desktop conflict during cherry pick
|
2013-06-18 15:24:41 +08:00 |
|
devin chen
|
1a7a199504
|
minor update
|
2013-06-18 15:23:18 +08:00 |
|
devin chen
|
d02806fa58
|
apps setting view
|
2013-06-18 15:22:47 +08:00 |
|
Harry Bomrah
|
3f44804717
|
search fixed again according to devin requirements
|
2013-06-18 15:22:22 +08:00 |
|
Harry Bomrah
|
5b1f5aa64c
|
new search for app manager and few javascript fixes
|
2013-06-18 15:20:40 +08:00 |
|
devin chen
|
1851ebb6f7
|
style for checkbox, radio button
|
2013-06-18 15:20:33 +08:00 |
|
Harry Bomrah
|
93e755b619
|
removing duplicate code from js file
|
2013-06-18 15:20:19 +08:00 |
|
devin chen
|
8fd4eb705b
|
publication's view update
|
2013-06-18 15:20:02 +08:00 |
|
Harry Bomrah
|
4a6313424b
|
duplicate error fixed and css inside widgets fixed, duplicate location fixed
|
2013-06-18 15:19:09 +08:00 |
|
Harry Bomrah
|
d752af8549
|
duplicate error fixed and css inside widgets fixed, duplicate location fixed
|
2013-06-18 15:17:07 +08:00 |
|
Harry Bomrah
|
d651669d5c
|
tiny scrollbar update
|
2013-06-18 15:13:52 +08:00 |
|
devin chen
|
ead749cfed
|
minor update
|
2013-06-18 15:12:52 +08:00 |
iCross
|
f3e1f4057d
|
ask module update css
|
2013-06-07 13:04:00 +08:00 |
|
iCross
|
e353961b21
|
ask moudule: add ask.css
|
2013-06-07 13:04:00 +08:00 |
chris
|
0904978292
|
Remove non resolved conflict
|
2013-06-07 13:02:47 +08:00 |
|
iCross
|
d2f131d160
|
survey module: update css
Conflicts:
app/assets/stylesheets/questionnaire.css
|
2013-06-06 18:43:28 +08:00 |
|
iCross
|
21bf3a0ccd
|
standalone css and icon
|
2013-06-06 18:41:27 +08:00 |
|
iCross
|
443d1c4fbe
|
csv stats & required start
|
2013-06-06 18:38:47 +08:00 |
|
iCross
|
531cee70d2
|
fix
|
2013-06-06 18:31:28 +08:00 |
|
Lukas
|
adc15951bb
|
questionnaire stuff
Conflicts:
vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
|
2013-06-06 18:29:58 +08:00 |
|
Lukas
|
51640423a7
|
survey module initial
|
2013-06-06 18:26:41 +08:00 |
Matt K. Fu
|
3e0b7d81ae
|
clean 403 404 500
|
2013-05-27 16:46:49 +08:00 |
|
Matt K. Fu
|
287e77836d
|
fix css compiling error
|
2013-05-14 14:19:20 +08:00 |
|
Matt K. Fu
|
f2247aab32
|
ray's css fix
|
2013-05-14 11:27:15 +08:00 |
|
Matt K. Fu
|
7e9fce0c2d
|
clean Harry's code
|
2013-04-17 14:31:10 +08:00 |
|
Harry Bomrah
|
38d5a193e0
|
tiny scrollbar trigger fixed and devin branch merged
|
2013-04-17 14:31:09 +08:00 |
|
devin chen
|
989e5aa974
|
minor update
|
2013-04-17 14:29:56 +08:00 |
|
devin chen
|
aedab01ae6
|
minor update
|
2013-04-17 14:29:04 +08:00 |
|
devin chen
|
e3782c9cf7
|
minor update
|
2013-04-17 14:29:04 +08:00 |
|
Harry Bomrah
|
e2802d94d0
|
rake task added
|
2013-04-17 14:28:13 +08:00 |
|
devin chen
|
055d758769
|
Page Loading Effect
tinyscrollbar has problem
|
2013-04-17 14:27:18 +08:00 |
|
Matt K. Fu
|
a4ebe31ada
|
fix for widget edit js missing
|
2013-04-17 14:19:32 +08:00 |
|
Matt K. Fu
|
3de4591413
|
fix frontend ajax respond 404 due to javascript overwritten after assets precompile
|
2013-04-17 14:19:32 +08:00 |
|
devin chen
|
d177fe0369
|
minor update
|
2013-04-17 14:19:32 +08:00 |
|
Harry Bomrah
|
c6868bf2e0
|
small fix in select2.js
|
2013-04-17 14:18:49 +08:00 |
|
devin chen
|
95e308e046
|
minor update
|
2013-04-17 14:18:49 +08:00 |
|
Matt K. Fu
|
425a320c02
|
fix widget and fronted setting interface. checked with Spen
|
2013-04-17 14:16:24 +08:00 |
|
devin chen
|
dc5f24ab22
|
starting new branch ( add rules in .gitignore for SASS cache folder )
|
2013-04-17 14:16:24 +08:00 |
|
Harry Bomrah
|
bc0477a5ed
|
widget and gridster fixes
|
2013-04-17 14:16:24 +08:00 |
|
Matt K. Fu
|
0781779ac0
|
solved conflicts
|
2013-04-17 14:14:24 +08:00 |
devin
|
e7bffe4c0f
|
devin's new branch
|
2013-04-17 14:14:24 +08:00 |
|
chris
|
dd10b3147c
|
Fix js bug and asset url after merge
|
2013-04-17 14:14:24 +08:00 |
|
devin
|
cae43e8acd
|
recover .gitignore file
Conflicts:
.gitignore
|
2013-04-17 14:14:23 +08:00 |
|
Harry Bomrah
|
793d739726
|
features and widgets added
Conflicts:
app/assets/javascripts/orbitdesktop.js
|
2013-04-17 14:14:23 +08:00 |