Commit Graph

86 Commits

Author SHA1 Message Date
wmcheng e76fb42be6 Merge branch 'master' into 'master'
# Conflicts:
#   app/controllers/galleries_controller.rb
2019-11-05 23:53:44 +08:00
chiu 3925c22408 Update galleries_controller.rb
merge change with eric's
2019-11-05 21:31:11 +08:00
chiu bf0f561c2e fix error 2019-11-05 21:21:00 +08:00
chiu 8577c7e8ad fix recreate thumb problem 2019-11-05 21:14:34 +08:00
EricTYL cb44a8c9af Merge branch 'master' into 'master'
add album name for front-end widget

add album name for front-end widget

See merge request !8
2019-11-05 14:56:31 +08:00
EricTYL ceda58f6da add album-name for front-end widget 2019-11-05 14:53:13 +08:00
EricTYL 809a9fa3b9 auto indent 2019-11-05 14:07:59 +08:00
chiu 86aacba3b6 Update gallery.js 2019-10-30 22:34:41 +08:00
wmcheng 710661a3fb Merge branch 'master' into 'master'
fix multiple thread processing picture feature



See merge request !6
2019-10-26 17:56:20 +08:00
chiu 03510c38da fix multiple thread processing picture feature 2019-10-26 15:36:04 +08:00
wmcheng 78d8b419e1 Merge branch 'master' into 'master'
Master

reverse upload feature to make it work

See merge request !5
2019-10-25 18:17:10 +08:00
chiu f1cdd98ee7 reverse uplaod feature 2019-10-25 08:58:51 +08:00
chiu d6da2bb587 fix? 2019-10-23 13:54:31 +08:00
wmcheng 268016bf8d Merge branch 'master' into 'master'
Update galleries_controller.rb

solve the upload problem for production mode

See merge request !4
2019-10-21 23:17:17 +08:00
chiu c56cfab46d Update galleries_controller.rb
solve the upload problem for production mode
2019-10-21 20:15:29 +08:00
wmcheng c398956832 Merge branch 'master' into 'master'
Update gallery_index1.html.erb

修正跑板問題

See merge request !3
2019-10-14 13:48:12 +08:00
chiu 3789b94041 Update gallery_index1.html.erb
修正跑板問題
2019-10-05 13:49:46 +08:00
wmcheng 7df10fc320 Merge branch 'master' into 'master'
Master

let user can choose whether to show the description and fix the problem of category and tag not showing on sitemap

See merge request !2
2019-09-30 23:23:07 +08:00
chiu 3643f9a4a3 Update gallery.css
fix error
2019-09-30 22:50:14 +08:00
chiu 474a06455b Update galleries_controller.rb
fix the show error of the text have style
2019-09-30 22:38:43 +08:00
chiu 99c1f94515 let user can choose whether to show the description and fix the problem
of category and tag not showing on sitemap
2019-09-30 22:24:14 +08:00
wmcheng 95468cc6c9 Merge branch 'master' into 'master'
add new feature:1.recreate thumb, 2.crop images



See merge request !1
2019-09-27 16:33:06 +08:00
chiu 6740dec500 add new feature:1.recreate thumb, 2.crop iamges 2019-09-25 14:53:46 +08:00
jason c2637fc346 add button for theater RWD 2019-01-17 09:52:34 +08:00
jason 0af824527b jason join edit theater.js 2019-01-16 20:49:43 +08:00
Harry Bomrah 6fa173c91a fixed px to rem 2017-12-11 16:02:37 +08:00
Harry Bomrah 84df879e0a small fix for accessibility 2017-12-03 18:43:30 +08:00
Harry Bomrah 1ed97f0940 notification for gallery upload 2017-04-17 20:38:08 +08:00
Harry Bomrah f384525d29 import from excel for albums 2016-12-20 19:43:54 +08:00
Harry Bomrah 310297f01b added search box 2016-09-02 18:29:50 +08:00
Harry Bomrah a0dec48727 added filter and search 2016-09-02 18:21:00 +08:00
Harry Bomrah afb11a2fa2 now new albums and images are sorted by created date and are on the top. also modified loading new images 2016-06-28 16:40:23 +08:00
Harry Bomrah 1769924137 changed the tag saving method 2016-03-02 12:31:47 +08:00
Harry Bomrah b6bb20d66a tags are now working for gallery 2016-01-15 16:01:39 +08:00
Harry Bomrah 4d1ab7a226 added new thumb size 2015-10-23 14:50:07 +08:00
Harry Bomrah 1628c0d3d2 theater and mobile url added to gallery 2015-10-07 18:09:08 +08:00
Harry Bomrah 1b293c185e description added to theater mode 2015-09-23 15:02:25 +08:00
Ruling-Mac 88eea54f76 Merge branch 'master' of http://gitlab.tp.rulingcom.com/saurabh/gallery 2015-07-20 16:25:25 +08:00
Ruling-Mac 605c7d467f fix orientation problem 2015-07-20 16:21:49 +08:00
Harry Bomrah c66d1fad20 css fix and also modernizr fallback 2015-07-17 14:55:41 +08:00
Harry Bomrah f211afc523 new theater for gallery.. 2015-07-16 19:27:14 +08:00
Harry Bomrah 863d89e46b onclick removed for accessibility 2015-06-01 14:49:59 +08:00
Harry Bomrah 011f1c0f1e image alternate text for all of stuff 2015-05-28 17:48:35 +08:00
Harry Bomrah c98ceae1d6 fix for widget 2015-05-25 21:45:08 +08:00
Harry Bomrah 6da1ceb13f fix for infinite loop if less images 2015-05-25 21:24:19 +08:00
Harry Bomrah 269f7c5121 fake commit 3 2015-04-27 21:24:03 +08:00
Harry Bomrah 5797173668 index order button class 2015-04-27 21:02:14 +08:00
Harry Bomrah 939f13feeb fake commit 1 2015-04-27 20:25:07 +08:00
Harry Bomrah f5fe643c71 fake commit 2015-04-27 20:16:09 +08:00
Harry Bomrah 8bf1baf7f1 class update test 2015-04-27 19:06:53 +08:00