Code

error photo upload#2

Code

Open

farsidesign wants to merge 183 commits intovitorpacheco:mastervitorpacheco/gallery:masterfrom rchavik:2.1rchavik/gallery:2.1Copy head branch name to clipboard

+10,331-1,085

Commits

Commits on Nov 5, 2010

• vitorpc

  phpedinei

  committed
  2d2e85f

  Copy full SHA for 2d2e85f

Commits on Nov 20, 2010

• fix the model name in the controller and some corrections in indentation

  

  vitorpacheco

  authored and

  phpedinei

  committed
  cb79d01

  Copy full SHA for cb79d01

Commits on Apr 6, 2011

• convert to dos (most files are in dos format)

  rchavik

  committed
  f224758

  Copy full SHA for f224758

• typo in column name

  rchavik

  committed
  bcea0b8

  Copy full SHA for bcea0b8

• adding basic support for nivo-slider

  rchavik

  committed
  5d3e268

  Copy full SHA for 5d3e268

• adding title + clearfix for photo upload area

  rchavik

  committed
  44e1b4a

  Copy full SHA for 44e1b4a

• display field type in admin_[add|index]

  rchavik

  committed
  1b1e704

  Copy full SHA for 1b1e704

Commits on Apr 7, 2011

• title links to albums/edit

  rchavik

  committed
  6fb6a35

  Copy full SHA for 6fb6a35

• fix: button overlaps with upload-list

  rchavik

  committed
  cb13f02

  Copy full SHA for cb13f02

• selectively load jslibs based on settings

  rchavik

  committed
  73976f3

  Copy full SHA for 73976f3

• adding new settings in plugin activation

  rchavik

  committed
  450c8bb

  Copy full SHA for 450c8bb

• configurable gallery parameters for each album

  rchavik

  committed
  6f76fdc

  Copy full SHA for 6f76fdc

• add 'rel' to support thumbs in nav (for future use)

  rchavik

  committed
  6b890e3

  Copy full SHA for 6b890e3

Commits on Apr 25, 2011

• add DDSlider support

  

  Wiena Lorentz

  committed
  384230d

  Copy full SHA for 384230d

• Merge remote branch 'rainextra/slider' into slider

  rchavik

  committed
  5fedecf

  Copy full SHA for 5fedecf

Commits on Apr 26, 2011

• change line endings to UNIX

  rchavik

  committed
  83bba6b

  Copy full SHA for 83bba6b

• tabify

  rchavik

  committed
  076426e

  Copy full SHA for 076426e

• remove trailing whitespace

  rchavik

  committed
  d260dac

  Copy full SHA for d260dac

Commits on May 14, 2011

• Merge pull request #2 from rchavik/slider

  Show description for 9b242be
  phpedinei

  committed
  9b242be

  Copy full SHA for 9b242be

Commits on May 24, 2011

• Add:

  Show description for b3d7518
  

  Wiena Lorentz

  committed
  b3d7518

  Copy full SHA for b3d7518

Commits on May 27, 2011

• Merge pull request #3 from rchavik/whitespace

  Show description for b733d47
  phpedinei

  committed
  b733d47

  Copy full SHA for b733d47

• Edited webroot/plugin.yml via GitHub

  phpedinei

  committed
  0a7dc11

  Copy full SHA for 0a7dc11

Commits on Jun 7, 2011

• make schema gallery

  

  eko

  committed
  25ef008

  Copy full SHA for 25ef008

• add useDbConfig for gallery

  

  eko

  committed
  0b7f74f

  Copy full SHA for 0b7f74f

Commits on Jun 9, 2011

• adding useDbConfig property

  rchavik

  committed
  202eae5

  Copy full SHA for 202eae5

• typo

  rchavik

  committed
  882aa57

  Copy full SHA for 882aa57

• fix indentation level + remove php close tag

  rchavik

  committed
  3349513

  Copy full SHA for 3349513

Commits on Jun 22, 2011

• support fancybox

  

  Wiena

  committed
  4d72fa3

  Copy full SHA for 4d72fa3

Commits on Jun 29, 2011

• Merge remote-tracking branch 'kahitam/schema' into next

  rchavik

  committed
  0d6672e

  Copy full SHA for 0d6672e

• don't load the gallery javascripts in /admin

  rchavik

  committed
  26c5ed3

  Copy full SHA for 26c5ed3

• split into several helpers

  Show description for bfcc951
  rchavik

  committed
  bfcc951

  Copy full SHA for bfcc951

• fix: displaying description in title column + indentation

  rchavik

  committed
  cc4a2fd

  Copy full SHA for cc4a2fd

• each supported gallery generates its own tag

  rchavik

  committed
  639e692

  Copy full SHA for 639e692

• Merge branch 'split-helpers' into next

  Show description for 5419cc3
  rchavik

  committed
  5419cc3

  Copy full SHA for 5419cc3

• allow separate directory per album via a behavior

  rchavik

  committed
  aa44f04

  Copy full SHA for aa44f04

• enlarge column size

  rchavik

  committed
  bfd864a

  Copy full SHA for bfd864a

• Merge remote-tracking branch 'rainextra/slider' into rainextra

  Show description for 1f673d3
  rchavik

  committed
  1f673d3

  Copy full SHA for 1f673d3

• Merge remote-tracking branch 'rainextra/schema' into rainextra

  Show description for bdcfb74
  rchavik

  committed
  bdcfb74

  Copy full SHA for bdcfb74

• fix broken merge for fancybox

  rchavik

  committed
  39e8abd

  Copy full SHA for 39e8abd

• fix broken merge (pikachoose)

  rchavik

  committed
  ae89449

  Copy full SHA for ae89449

• Merge branch 'rainextra' into next

  rchavik

  committed
  074b6cc

  Copy full SHA for 074b6cc

• removing leftover submodule?

  rchavik

  committed
  61a1c4a

  Copy full SHA for 61a1c4a

• Merge branch 'target-dir' into next

  rchavik

  committed
  ff98242

  Copy full SHA for ff98242

• remove log()

  rchavik

  committed
  e27e70d

  Copy full SHA for e27e70d

• defaults to Galleria when type is unspecified

  rchavik

  committed
  2294353

  Copy full SHA for 2294353

Commits on Jul 6, 2011

• append plugin name in ACOs. incompatible with croogo 1.3

  rchavik

  committed
  611603a

  Copy full SHA for 611603a

• indent + whitespace

  rchavik

  committed
  dfc783c

  Copy full SHA for dfc783c

• remove obsolete methods since we're using schema

  Show description for ac263ac
  rchavik

  committed
  ac263ac

  Copy full SHA for ac263ac

• beforeActivation & beforeDeactivation is required

  rchavik

  committed
  793e960

  Copy full SHA for 793e960

Commits on Jul 7, 2011

• space hunt

  rchavik

  committed
  8ce36de

  Copy full SHA for 8ce36de

• fix: incorrect initializer in Ddslider helper

  rchavik

  committed
  2011092

  Copy full SHA for 2011092

Commits on Jul 14, 2011

• fix: $options was never initialized

  rchavik

  committed
  443bd59

  Copy full SHA for 443bd59

• adding Containable

  rchavik

  committed
  d806273

  Copy full SHA for d806273

• remove addAco for controller

  rchavik

  committed
  404d889

  Copy full SHA for 404d889

Commits on Jul 15, 2011

• Set load galley on windows.load

  Show description for b10af88
  

  Wiena

  committed
  b10af88

  Copy full SHA for b10af88

Commits on Jul 22, 2011

• Update

  Show description for 317d731
  

  Wiena

  committed
  317d731

  Copy full SHA for 317d731

Commits on Aug 3, 2011

• Update:

  Show description for 01a2165
  

  Wiena

  committed
  01a2165

  Copy full SHA for 01a2165

Commits on Aug 15, 2011

• ups.. ketinggalan 1 image

  

  Wiena

  committed
  c2abe38

  Copy full SHA for c2abe38

Commits on Aug 22, 2011

• menu visibility

  rchavik

  committed
  4181927

  Copy full SHA for 4181927

Commits on Aug 23, 2011

• miss string or numeric

  

  Wiena

  committed
  94d906a

  Copy full SHA for 94d906a

Commits on Sep 16, 2011

• set default option for pikachoose: once => true

  rchavik

  committed
  509660b

  Copy full SHA for 509660b

Commits on Sep 21, 2011

• init optimizer

  Show description for 6434185
  

  eko

  committed
  6434185

  Copy full SHA for 6434185

• Merge pull request #1 from kahitam/optimizer

  Show description for c529909
  rainextra

  committed
  c529909

  Copy full SHA for c529909

• set generate optimize

  

  arie

  committed
  be5cfb9

  Copy full SHA for be5cfb9

• adjust optimize controller

  

  arie

  committed
  19455f8

  Copy full SHA for 19455f8

• clean up code

  

  arie

  committed
  9e7c453

  Copy full SHA for 9e7c453

• adjust optimize quality setting

  

  arie

  committed
  8f80ee0

  Copy full SHA for 8f80ee0

• optimize moving to component

  

  arie

  committed
  ed9f1d5

  Copy full SHA for ed9f1d5

• add gallery component

  

  arie

  committed
  655d209

  Copy full SHA for 655d209

• Merge branch 'optimizer' into integrations

  

  arie

  committed
  a6003b8

  Copy full SHA for a6003b8

Commits on Sep 22, 2011

• exlude thumb if generated

  

  arie

  committed
  7d40202

  Copy full SHA for 7d40202

• typo

  

  arie

  committed
  2d355d0

  Copy full SHA for 2d355d0

• wording

  

  arie

  committed
  b3fb91e

  Copy full SHA for b3fb91e

• adjust optimize controller

  

  arie

  committed
  1a11869

  Copy full SHA for 1a11869

• thumb no resize

  

  arie

  committed
  be3f55c

  Copy full SHA for be3f55c

• shell for generating

  

  arie

  committed
  abe7ade

  Copy full SHA for abe7ade

Commits on Sep 23, 2011

• set error message

  

  arie

  committed
  a3f2e70

  Copy full SHA for a3f2e70

Commits on Sep 26, 2011

• using end than array_reverse

  

  arie

  committed
  81cf568

  Copy full SHA for 81cf568

Commits on Oct 10, 2011

• Merge remote-tracking branch 'origin/integrations' into next

  rchavik

  committed
  5764a96

  Copy full SHA for 5764a96

Commits on Oct 13, 2011

• set edit photo for admin

  

  arie

  committed
  e2541e8

  Copy full SHA for e2541e8

• cek is ajax on before save

  

  arie

  committed
  a6793e1

  Copy full SHA for a6793e1

• adjust view photo on admin

  

  arie

  committed
  1fa2850

  Copy full SHA for 1fa2850

• admin edit views

  

  arie

  committed
  44e4a44

  Copy full SHA for 44e4a44

• add sql patch

  

  arie

  committed
  9bcae7d

  Copy full SHA for 9bcae7d

Commits on Oct 17, 2011

• rename via upgrade all

  rchavik

  committed
  b96dc68

  Copy full SHA for b96dc68

• __*() upgrades

  rchavik

  committed
  b817e9e

  Copy full SHA for b817e9e

Commits on Oct 18, 2011

• additional file renames

  rchavik

  committed
  c93e829

  Copy full SHA for c93e829

• more upgrade work

  rchavik

  committed
  917f2d3

  Copy full SHA for 917f2d3

• fixing arguments for View::element()

  rchavik

  committed
  efd083d

  Copy full SHA for efd083d

Commits on Nov 1, 2011

• Orbit support

  rchavik

  committed
  57a38a3

  Copy full SHA for 57a38a3

Commits on Nov 23, 2011

• rename plugin.yml to manifest.php

  rchavik

  committed
  262837f

  Copy full SHA for 262837f

• updating manifest + menus

  rchavik

  committed
  3726fd3

  Copy full SHA for 3726fd3

• fix cache config

  rchavik

  committed
  af55592

  Copy full SHA for af55592

• adjusting regex

  rchavik

  committed
  e22a904

  Copy full SHA for e22a904

Commits on Dec 1, 2011

• adding $paginate property

  rchavik

  committed
  7168cc5

  Copy full SHA for 7168cc5

Commits on Dec 27, 2011

• updating plugin.json

  rchavik

  committed
  8fb819c

  Copy full SHA for 8fb819c

Commits on Jan 17, 2012

• fixing parent model class + visibility

  rchavik

  committed
  37b82f3

  Copy full SHA for 37b82f3

• photo admin_[index|edit]

  rchavik

  committed
  33fbe17

  Copy full SHA for 33fbe17

• adjust admin menu

  rchavik

  committed
  5497d1b

  Copy full SHA for 5497d1b

• params, add new fields for Photo

  Show description for 15755c1
  rchavik

  committed
  15755c1

  Copy full SHA for 15755c1

• Merge branch 'next' into 2.0

  Show description for 98a7b4d
  rchavik

  committed
  98a7b4d

  Copy full SHA for 98a7b4d

• adding Photo.status

  rchavik

  committed
  8d13ceb

  Copy full SHA for 8d13ceb

• adding container for form buttons

  rchavik

  committed
  2e3d2fd

  Copy full SHA for 2e3d2fd

• custom find to retrieve photos by album

  rchavik

  committed
  bf90763

  Copy full SHA for bf90763

• link to photos/upload

  rchavik

  committed
  f3311dd

  Copy full SHA for f3311dd

Commits on Jan 20, 2012

• adding Setting.title

  rchavik

  committed
  1b8671a

  Copy full SHA for 1b8671a

• adding Album config

  rchavik

  committed
  140e6aa

  Copy full SHA for 140e6aa

• use album config during upload

  rchavik

  committed
  41f06ab

  Copy full SHA for 41f06ab

• incorrect Setting key name

  rchavik

  committed
  53706d0

  Copy full SHA for 53706d0

Commits on Feb 8, 2012

• set photofy on activation

  

  arie

  committed
  598baba

  Copy full SHA for 598baba

• add photofy helper

  

  arie

  committed
  37b366b

  Copy full SHA for 37b366b

• add photofy js + photofy default css

  

  arie

  committed
  da1c8ac

  Copy full SHA for da1c8ac

• adjust admin page

  

  arie

  committed
  280621b

  Copy full SHA for 280621b

Commits on Feb 14, 2012

• add kenburn slider

  

  arie

  committed
  761438e

  Copy full SHA for 761438e

Commits on Feb 15, 2012

• removing js and css asset

  

  arie

  committed
  03ce2fb

  Copy full SHA for 03ce2fb

• skip assets when requested

  rchavik

  committed
  05628e0

  Copy full SHA for 05628e0

Commits on Feb 16, 2012

• let's try again

  rchavik

  committed
  0576507

  Copy full SHA for 0576507

• change arguments

  rchavik

  committed
  b10d0ad

  Copy full SHA for b10d0ad

Commits on Feb 17, 2012

• adding weight column

  rchavik

  committed
  f9cfa34

  Copy full SHA for f9cfa34

• fix helper argument

  rchavik

  committed
  d261e90

  Copy full SHA for d261e90

• shorten text

  rchavik

  committed
  a1b8d1a

  Copy full SHA for a1b8d1a

• strip tags

  rchavik

  committed
  c39883f

  Copy full SHA for c39883f

• strip tags

  rchavik

  committed
  214a37c

  Copy full SHA for 214a37c

Commits on Mar 2, 2012

• Update VOD styling

  

  Wiena Lorentz

  committed
  d322940

  Copy full SHA for d322940

Commits on Mar 15, 2012

• Add new Slider engine to Gallery

  Show description for 90eae4b
  

  Wiena Lorentz

  committed
  90eae4b

  Copy full SHA for 90eae4b

• little adjusment to camera slider

  

  Wiena Lorentz

  committed
  4cc3150

  Copy full SHA for 4cc3150

• Put Camera slider theme style seperated

  

  Wiena Lorentz

  committed
  710c4de

  Copy full SHA for 710c4de

Commits on Mar 21, 2012

• Update Image BG for TV

  

  Wiena Lorentz

  committed
  c822441

  Copy full SHA for c822441

Commits on Mar 27, 2012

• use CakeEvent

  rchavik

  committed
  8010a8a

  Copy full SHA for 8010a8a

• let's just fail

  rchavik

  committed
  7e9c704

  Copy full SHA for 7e9c704

Commits on May 3, 2012

• hack to support 'fake upload'

  rchavik

  committed
  25e5945

  Copy full SHA for 25e5945

Commits on Jul 6, 2012

• disable csrfCheck for ajax upload

  

  Wiena Lorentz

  committed
  f39c4d6

  Copy full SHA for f39c4d6

Commits on Oct 3, 2012

• fix: missing method and bogus data

  rchavik

  committed
  01efb4e

  Copy full SHA for 01efb4e

Commits on Oct 24, 2012

• adding validation rule

  rchavik

  committed
  f715848

  Copy full SHA for f715848

• updating CS in bootstrap

  rchavik

  committed
  815c358

  Copy full SHA for 815c358

• configurable useDbConfig

  rchavik

  committed
  d26b7d6

  Copy full SHA for d26b7d6

• cs fixes

  rchavik

  committed
  de5f2d4

  Copy full SHA for de5f2d4

• rename locale -> Locale

  rchavik

  committed
  fdb873f

  Copy full SHA for fdb873f

• utilize Imagine plugin for image processing

  rchavik

  committed
  b559ddd

  Copy full SHA for b559ddd

• deleting source if Gallery.deleteOriginal = true

  rchavik

  committed
  2dfdd1d

  Copy full SHA for 2dfdd1d

• fixes and style updates

  Show description for 43ecf4e
  rchavik

  committed
  43ecf4e

  Copy full SHA for 43ecf4e

• pagination does not work. removing for now

  rchavik

  committed
  0f2e44c

  Copy full SHA for 0f2e44c

• change to postLink

  rchavik

  committed
  fa49d94

  Copy full SHA for fa49d94

• 'apply' functionality + adding 'thickbox' class

  rchavik

  committed
  b572152

  Copy full SHA for b572152

• rename to markdown

  rchavik

  committed
  b844297

  Copy full SHA for b844297

• document about 1.5 and Imagine dependency

  rchavik

  committed
  b3d5bd5

  Copy full SHA for b3d5bd5

Commits on Oct 25, 2012

• adding thickbox to dynamically added elements

  rchavik

  committed
  8595178

  Copy full SHA for 8595178

• use thickbox's gallery feature

  Show description for 4a97324
  rchavik

  committed
  4a97324

  Copy full SHA for 4a97324

• enable moveup|down by album

  rchavik

  committed
  7138590

  Copy full SHA for 7138590

Commits on Oct 31, 2012

• adding url field for nivoslider

  

  Dimas Abdul Aziz

  committed
  6c40cc6

  Copy full SHA for 6c40cc6

Commits on Dec 26, 2012

• modified with HABTM for photos albums

  

  Eko Tristiyono

  committed
  e472c3b

  Copy full SHA for e472c3b

Commits on Dec 28, 2012

• updating views for 1.5.0

  rchavik

  committed
  b079389

  Copy full SHA for b079389

• set master during first upload

  rchavik

  committed
  d6140be

  Copy full SHA for d6140be

• polaroid image style

  rchavik

  committed
  c9ea670

  Copy full SHA for c9ea670

Commits on Jan 7, 2013

• CS fixes

  rchavik

  committed
  a850915

  Copy full SHA for a850915

• change default gallery directory

  rchavik

  committed
  01e512d

  Copy full SHA for 01e512d

• updating schema: adding created rename join table

  rchavik

  committed
  494093a

  Copy full SHA for 494093a

• fix habtm ordering

  rchavik

  committed
  dae6a67

  Copy full SHA for dae6a67

• Merge branch '2.1-habtm-updates' into 2.1

  rchavik

  committed
  2d29ca0

  Copy full SHA for 2d29ca0

Commits on Jan 21, 2013

• change link into icon

  rchavik

  committed
  8a24fe9

  Copy full SHA for 8a24fe9

Commits on Jan 29, 2013

• cs fixes in View/Helper

  rchavik

  committed
  9de966f

  Copy full SHA for 9de966f

• load gallery.js for slug

  rchavik

  committed
  a2a585b

  Copy full SHA for a2a585b

• add AlbumsPhoto model file

  rchavik

  committed
  01f2839

  Copy full SHA for 01f2839

• add missing column header

  rchavik

  committed
  4fe6409

  Copy full SHA for 4fe6409

Commits on Mar 5, 2013

• add new library layer slider

  

  Arie Sutanto

  committed
  875674e

  Copy full SHA for 875674e

Commits on Mar 11, 2013

• searching photo via a popup

  rchavik

  committed
  9617346

  Copy full SHA for 9617346

• updating search plugin usage

  rchavik

  committed
  e5a15a9

  Copy full SHA for e5a15a9

• fix: incorrect variable returned

  rchavik

  committed
  b957f1f

  Copy full SHA for b957f1f

Commits on Mar 28, 2013

• Add Controller Helper for PhotoSwipe

  

  Wiena Lorentz

  committed
  04893da

  Copy full SHA for 04893da

• Helper for PhotoSwipe & basic css

  

  Wiena Lorentz

  committed
  599f8f3

  Copy full SHA for 599f8f3

Commits on Apr 2, 2013

• Update Title Image = Description Album

  

  Wiena Lorentz

  committed
  fa75e3a

  Copy full SHA for fa75e3a

Commits on Apr 23, 2013

• make layer slider elements is able to use URL

  

  Arie Sutanto

  committed
  15b29c4

  Copy full SHA for 15b29c4

Commits on Sep 4, 2013

• adding migration file

  

  Arie Sutanto

  committed
  2b29ef7

  Copy full SHA for 2b29ef7

• adding migration file

  

  Arie Sutanto

  committed
  d41744b

  Copy full SHA for d41744b

• adjust table and columns when activating migration

  

  Arie Sutanto

  committed
  2f04243

  Copy full SHA for 2f04243

Commits on Oct 18, 2013

• Update gallery.js

  Show description for d7eeb36
  

  Thomas Rader

  committed
  d7eeb36

  Copy full SHA for d7eeb36

Commits on Nov 4, 2013

• Recreate using fields as defined in schema and remove invalid steps

  rchavik

  committed
  af7d828

  Copy full SHA for af7d828

• Merge branch '2.0' into 2.1

  Show description for ea7c693
  rchavik

  committed
  ea7c693

  Copy full SHA for ea7c693

• Migrations for albums_photos join table

  rchavik

  committed
  33513bc

  Copy full SHA for 33513bc

Commits on Nov 26, 2013

• misc small fixes

  rchavik

  committed
  5899581

  Copy full SHA for 5899581

Commits on Dec 2, 2013

• Update GalleryHelper.php

  Show description for a2fc644
  

  Thomas Rader

  committed
  a2fc644

  Copy full SHA for a2fc644

Commits on Dec 10, 2013

• Add length check as per #2 (comment)

  rchavik

  committed
  8ffe4b0

  Copy full SHA for 8ffe4b0

• Merge branch 'pr/2' into 2.1

  rchavik

  committed
  b873b6c

  Copy full SHA for b873b6c