minicms/core
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
458 Commits 13 Branches 0 Tags
59503baa9c4311adadafb07dd333fcf36e806f3d
Commit Graph
458 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
peter 59503baa9c Merge branch 'test.customwristbands.cz' of binarity.cz:/opt/git/internal/cms/minicms into test.customwristbands.cz 2016-04-07 18:13:53 +02:00
peter b996ef493d FEATURES: changed layout according to what clients asked for, added binarity link into footer, some other small changes 2016-04-07 18:13:29 +02:00
Michal Kváček eb8e7badd6 Merge branch 'customwristbands.cz' into test.customwristbands.cz 2016-04-07 00:23:30 +02:00
peter 0cc1916346 Merge branch 'test.customwristbands.cz' into customwristbands.cz 2016-04-07 00:14:49 +02:00
peter 5116fedac0 FIX: contact layout lat and long changes from parseInt to parseFloat 2016-04-07 00:14:21 +02:00
Michal Kváček 474405c69d FIX: fix ambiguous module_handler in content overview 2016-04-06 23:55:18 +02:00
Michal Kváček 74838f96fa FEATURE: remove page name from button in overview 2016-04-06 20:33:10 +02:00
Michal Kváček d231065fb8 Merge branch 'dev' into test.customwristbands.cz 2016-04-06 20:31:02 +02:00
Michal Kváček 7fc01fa1ec FIX: fix typo in COALESCE and escaping 2016-04-06 20:30:55 +02:00
Michal Kváček 5858820cb7 Merge branch 'dev' into test.customwristbands.cz 2016-04-06 20:28:22 +02:00
Michal Kváček 43051501bd FIX: when user did not fill his name, use email for content overview 2016-04-06 20:28:16 +02:00
Michal Kváček e3d715d2d0 Merge branch 'dev' into test.customwristbands.cz 2016-04-06 20:23:54 +02:00
Michal Kváček a4af5e2bac FIX: fix content page overview - changed join to left join 2016-04-06 20:23:47 +02:00
Michal Kváček 666557b585 Merge branch 'dev' into test.customwristbands.cz 2016-04-06 20:19:27 +02:00
Michal Kváček 85c33e9ada FEATURE: make overview in content pages little bit cleaner 2016-04-06 20:19:11 +02:00
Michal Kváček 6690d7423e FEATURE: swap date and action name in log 2016-04-06 19:13:46 +02:00
Michal Kváček d996c4c800 FIX: fix menu 'active' status when homepage is displayed 2016-04-06 19:10:33 +02:00
Michal Kváček de287abf24 OPTIMALIZATION: cache widget area content for one pageload 2016-04-06 19:06:03 +02:00
Michal Kváček fc9f3a403b FEATURE #1544: add social profile links into settings 2016-04-06 18:55:56 +02:00
Michal Kváček dcce436c59 Merge branch 'test.customwristbands.cz' of binarity.cz:/opt/git/internal/cms/minicms into test.customwristbands.cz 2016-04-06 18:02:25 +02:00
Michal Kváček 543cce17fa FIX: fix exception when debug bar was not installed 2016-04-06 18:01:31 +02:00
peter 2f7a3790b9 Merge branch 'test.customwristbands.cz' of binarity.cz:/opt/git/internal/cms/minicms into test.customwristbands.cz 2016-04-06 17:45:30 +02:00
peter d721aaf185 FEATURES: changes according to clients requests, simple mail template, some other small changes 2016-04-06 17:45:05 +02:00
Michal Kváček 303a84904e Merge branch 'dev' into test.customwristbands.cz 2016-04-06 17:26:15 +02:00
Michal Kváček e2f6fed4b1 Merge branch 'customwristbands.cz' into test.customwristbands.cz 2016-04-06 17:26:12 +02:00
Michal Kváček 87e4e96ca5 Merge branch 'test.customwristbands.cz' of binarity.cz:/opt/git/internal/cms/minicms into test.customwristbands.cz 2016-04-06 17:26:03 +02:00
Michal Kváček d7e5351d5b Merge branch 'widget_menu' into dev 2016-04-06 17:25:01 +02:00
Michal Kváček 1efaaaa4e0 FIX: fix failing menu on non-existing page 2016-04-06 17:24:29 +02:00
Michal Kváček 2eeb3227d3 FEATURE #1546: add subject for contact form 2016-04-06 17:23:46 +02:00
Michal Kváček b7c70bab7e FIX: fix duplicate url 
In this way, deleted page will no longer "occupy" url.
 2016-04-06 02:13:15 +02:00
Michal Kváček c3085180c0 Merge branch 'customwristbands.cz' of binarity.cz:/opt/git/internal/cms/minicms into customwristbands.cz 2016-04-06 02:03:44 +02:00
Michal Kváček 885dc691b2 Merge branch 'dev' into test.customwristbands.cz 2016-04-06 02:03:20 +02:00
Michal Kváček 4594e84945 FIX: change url to something random after content delete. 
In this way, deleted page will no longer "occupy" url.
 2016-04-06 01:48:14 +02:00
peter c42f860e9f Merge branch 'test.customwristbands.cz' into customwristbands.cz 2016-04-05 23:51:03 +02:00
peter 0ba38d146c FEATURE: removed some data from gallery 2016-04-05 23:48:59 +02:00
peter a42c1fb6c7 Merge branch 'customwristbands.cz' of binarity.cz:/opt/git/internal/cms/minicms into customwristbands.cz 2016-04-05 23:38:59 +02:00
peter b46c99efc4 Merge branch 'test.customwristbands.cz' of binarity.cz:/opt/git/internal/cms/minicms into test.customwristbands.cz 2016-04-05 23:38:03 +02:00
peter dddabe7724 FEATURE: added sortiment subpage template 2016-04-05 23:37:40 +02:00
Michal Kváček afc2af6e9b Merge branch 'customwristbands.cz' of binarity.cz:/opt/git/internal/cms/minicms into customwristbands.cz 2016-04-05 22:28:44 +02:00
Michal Kváček 9fe7e04e2f Merge branch 'test.customwristbands.cz' of binarity.cz:/opt/git/internal/cms/minicms into test.customwristbands.cz 2016-04-05 22:28:16 +02:00
Michal Kváček ced6f978a8 FEATURE: add check for failed git pull in update 2016-04-05 22:27:22 +02:00
peter 522110aea1 FIX: homepage error 2016-04-05 22:06:15 +02:00
peter 5d1254da18 FEATURE: changed homepage template 2016-04-05 21:53:52 +02:00
Michal Kváček 7446e2f4ef FEATURE: add unlimited depth of subpages 2016-04-05 21:42:22 +02:00
Michal Kváček 9570ad3da3 FIX: fix view method in creating new user 2016-04-05 21:01:33 +02:00
peter 54f0566ee2 FEATURE: functional gallery template and lightbox 2016-04-05 19:26:56 +02:00
Michal Kváček d17a0ec8ef Merge branch 'dev' into test.customwristbands.cz 2016-04-04 23:40:22 +02:00
Michal Kváček ae1772652f FEATURE: add switch for installing on true - without git@binarity.cz: 2016-04-04 23:02:12 +02:00
Michal Kváček 19ad81a432 Merge branch 'test.customwristbands.cz' of binarity.cz:/opt/git/internal/cms/minicms into test.customwristbands.cz 2016-04-04 22:56:19 +02:00
Michal Kváček dac9de0024 FEATURE: add script for update and improve little bit installation 2016-04-04 22:53:17 +02:00