Commit Graph

123 Commits

Author SHA1 Message Date
Harry Bomrah 04469ff845 Minor update for gallery frontend 2012-11-19 18:18:46 +08:00
Harry Bomrah 46f80ade6a Merge branch 'gallery_orbit' of https://github.com/Rulingcom/orbit into gallery_orbit
Conflicts:
	vendor/built_in_modules/gallery/config/routes.rb
2012-11-14 16:25:02 +08:00
Harry Bomrah d7d1b9e31b widget update 2012-11-14 15:28:55 +08:00
chris 9095713769 Fix bugs in Json when missing files 2012-11-13 15:21:59 +08:00
Rueshyna 275c6f4c8a get_album_json function can get readable json 2012-11-09 16:25:11 +08:00
Rueshyna b4f5a0b04b all of user can get json of gallery from outside 2012-11-08 01:24:01 +08:00
chris 63a57682e6 Fix bugs:
TinyMCE: the size of the textarea change depending on the language
	Page content edit: no tab selected on first load
2012-10-30 17:09:00 +08:00
devin 8c6e5deb64 gallery update
please don't forget to add translation in other language
2012-10-26 11:15:37 +08:00
Christophe Vilayphiou 4dff15cffb Add before_filter in gallery 2012-09-12 17:52:24 +08:00
Harry Bomrah 4ea0c0ec9c minor fix for sidebar 2012-09-12 02:14:50 +08:00
Harry Bomrah 8dd69a140f frontend commits 2012-09-12 02:12:15 +08:00
Harry Bomrah 3749e919cb front ends updates 2012-09-12 02:12:15 +08:00
Harry Bomrah a42a651f90 frontend updates 2012-09-12 02:08:02 +08:00
Harry Bomrah 199839a42a frontend update 2012-09-12 02:08:02 +08:00
Harry Bomrah 3fc07b9ff1 one more modification 2012-09-12 02:07:40 +08:00
Harry Bomrah 2a66b89d33 Modifications in ruby 2012-09-12 02:07:40 +08:00
Harry Bomrah 7ae1dcd8e0 Calendar Module 2012-09-12 02:06:22 +08:00
devin a05fff98ac front update 2012-09-12 02:05:10 +08:00
devin 4e662c744a backend update 2012-09-12 02:05:10 +08:00
Harry Bomrah 97923a4d31 resize thumbnails 2012-09-12 02:05:10 +08:00
Harry Bomrah 7903d2ae36 ruby update for form and edit tagging 2012-09-12 02:05:10 +08:00
devin 789c2df7fd gallery frontend update 2012-09-12 02:05:10 +08:00
Harry Bomrah 8259dee4a3 Ruby update 2012-09-12 02:05:10 +08:00
devin cc6986cb16 language fix 2012-09-12 02:05:10 +08:00
devin 0be494c62b front end added 2012-09-12 02:05:09 +08:00
Harry Bomrah 6a23e29f33 Ruby structure implementation 2012-09-12 02:05:09 +08:00
Harry Bomrah 26ff2af078 View only update 2012-09-12 02:04:36 +08:00
Harry Bomrah f62eba182e Commit for view only 2012-09-12 02:04:36 +08:00
Harry Bomrah f4dde67344 frontend fixes 2012-09-12 02:04:36 +08:00
Harry Bomrah 8caa798c08 frontend updates 2012-09-12 02:04:36 +08:00
devin 29c5126455 gallery update 2012-09-12 02:04:36 +08:00
devin 4b6eebba7c gallery update 2012-09-12 02:04:08 +08:00
devin b6f10951b8 gallery update
especially upload panel
2012-09-12 02:04:07 +08:00
Harry Bomrah 6e6d441b26 code merged … ui updated 2012-09-12 02:03:02 +08:00
devin 2274df4111 gallery update 2012-09-12 02:02:29 +08:00
devin 584d1eb0e0 gallery update 2012-09-12 02:02:01 +08:00
devin ede9727a18 gallery update 2012-09-12 02:02:00 +08:00
devin 0e5a305f39 gallery update 2012-09-12 01:58:23 +08:00
devin 0c624794d5 gallery update 2012-09-12 01:58:23 +08:00
devin 887b2d528d gallery update
especially upload panel
2012-09-12 01:58:23 +08:00
Harry Bomrah ad431b1d06 Minor update 2012-09-12 01:58:23 +08:00
Harry Bomrah 91d45b64da code merged … ui updated 2012-09-12 01:58:23 +08:00
devin 17c4b9a1bf gallery update 2012-09-12 01:58:22 +08:00
devin 01eae75ad0 gallery update 2012-09-12 01:58:22 +08:00
devin a2ed9e3350 gallery update 2012-09-12 01:58:22 +08:00
Harry Bomrah 6e90196b77 updates for tagging and language fix 2012-08-20 22:00:57 +08:00
Harry Bomrah e86d5ab338 tagging 2012-08-13 16:43:23 +08:00
Harry Bomrah 4d676d9ee9 Merge 2012-08-13 16:17:23 +08:00
Harry Bomrah 34e4928ee1 authorization 2012-08-11 17:28:49 +08:00
devin 7fb6a1e86b gallery update 2012-08-11 01:32:53 +08:00
devin 50baac2cb7 gallery update
add "tag panel", not complete
2012-08-09 18:09:36 +08:00
Harry Bomrah ee03bd5b65 code merge 2012-08-08 19:35:36 +08:00
devin b5227c7b6c gallery update 2012-08-07 14:33:30 +08:00
devin 0f5707394b encoding fixed
Maybe there are some "chinese" in galleryAPI.js.erb and Ruby treat them
all US-ASCII, so everything crash.
see this post
"http://stackoverflow.com/questions/7761540/encoding-issues-in-javascrip
t-files-using-rails-asset-pipeline"
2012-08-06 22:11:36 +08:00
Harry Bomrah 13f3d4db70 tp 2012-08-06 20:10:38 +08:00
Harry Bomrah a08f85a3e2 Button fixes 2012-08-06 17:49:10 +08:00
Harry Bomrah 5f0d6c9003 Code Merge 2012-08-06 17:05:12 +08:00
Harry Bomrah 47408f4467 UI modifications 2012-08-06 17:01:53 +08:00
devin 9ebee5daea gallery update 2012-08-06 14:02:55 +08:00
devin 337d690c54 gallery update 2012-08-06 11:07:58 +08:00
Harry Bomrah 6159c04da6 Merge branch 'gallery_orbit' into desktop_devin 2012-08-01 20:09:58 +08:00
Harry Bomrah b0ef2b6957 Multi language and side bar update 2012-08-01 20:07:54 +08:00
devin eaa8171689 gallery update 2012-08-01 16:35:59 +08:00
Harry Bomrah 7accbed1a0 gallery translation supported 2012-07-31 21:15:42 +08:00
Harry Bomrah 45da2971ef Merge branch 'gallery_orbit' into desktop_harry 2012-07-31 01:16:22 +08:00
Harry Bomrah 17dffb15e1 Major updates for gallery 2012-07-31 01:15:48 +08:00
Harry Bomrah 929cd3b0cc Gallery update.. 2012-07-29 18:52:30 +08:00
Harry Bomrah 584d5d388e Merge branch 'gallery_orbit' into desktop_harry 2012-07-25 16:21:03 +08:00
Harry Bomrah 8f23755c0d Gallery update 2012-07-25 16:20:07 +08:00
Harry Bomrah 59ab1e6d17 Got gallery update 2012-07-19 15:51:41 +08:00
Harry Bomrah 37f6037333 Gallery started. 2012-07-19 15:44:44 +08:00
Harry Bomrah 87be934aa3 gallery module update 2012-07-16 20:26:04 +08:00
Harry Bomrah ba3d13790c gallery module update 2012-07-10 17:43:21 +08:00