Skip to content
Commits on Mar 19, 2011
  1. @rajpara11
Commits on Mar 18, 2011
  1. @rajpara11
  2. @rajpara11
  3. @rajpara11
  4. @rajpara11
  5. Changed the style for the webapp.

    @deniszgonjanin committed Mar 17, 2011
Commits on Mar 17, 2011
  1. Added a bit of styling to the webapp nav bar. Changed 'Get HTML' butt…

    …on to 'Save Page'
    @deniszgonjanin committed Mar 17, 2011
  2. Merge branch 'master' of github.com:filipmares/Automagical

    @deniszgonjanin committed Mar 17, 2011
  3. Fixed bug with color picker appearing too large. Added color picker t…

    …o editor for externally fetched pages. Fixed some minor bugs and exceptions being thrown.
    @deniszgonjanin committed Mar 17, 2011
  4. @rajpara11

    Can delete elements properly now, added a new colorpicker. Can modify…

    … elements' text as well.
    rajpara11 committed Mar 17, 2011
  5. @rajpara11
  6. @rajpara11
  7. @rajpara11

    Made changes to allow for better editing of Automagical made pages. I…

    …mages are resizable now by means of a wrapping div. Code isn't the prettiest in the world but I think it gets the stuff done, some small bugs like highlighting is a bit off and some other stuff.
    rajpara11 committed Mar 16, 2011
  8. Merge branch 'master' of github.com:filipmares/Automagical

    @deniszgonjanin committed Mar 16, 2011
  9. Stripping all links of hrefs for externally fetched pages. Added hand…

    …lers for links and forms so the user can safely click on them without being redirected or refreshing the page. This allows the user to edit all elements safely.
    @deniszgonjanin committed Mar 16, 2011
  10. @brian1324
  11. @brian1324

    Merge branch 'master' of https://github.com/filipmares/Automagical

    Conflicts:
    	public/src/automagicalCss.js
    brian1324 committed Mar 16, 2011
Commits on Mar 16, 2011
  1. Added proper selectors to match the type of css property being change…

    …d, i.e. color pickers for colors, select box for multiple choice, and input for numbers
    @deniszgonjanin committed Mar 16, 2011
  2. CSS attribute editing for any kind of element now works, for all comm…

    …on css styles. Now starting work on creating a more user friendly attributes box.
    @deniszgonjanin committed Mar 16, 2011
  3. Merge branch 'master' of github.com:filipmares/Automagical

    @deniszgonjanin committed Mar 16, 2011
  4. Rudimentary editing of css for external pages now working. Continuing…

    … to work on it...
    @deniszgonjanin committed Mar 16, 2011
  5. @rajpara11

    Made change so saved pages can be changed after (wasn't sure whether …

    …to move away completely from saving cssInformation or just hack on a solution onto that, so this is the hacked version, if we want to move completely away and do stuff inline we can make this change as well)
    rajpara11 committed Mar 15, 2011
  6. @rajpara11
Commits on Mar 15, 2011
  1. Added formidable to list of dependancies

    @deniszgonjanin committed Mar 15, 2011
  2. Merge branch 'master' of github.com:filipmares/Automagical

    @deniszgonjanin committed Mar 15, 2011
  3. Added some documentation to the docs.js

    @deniszgonjanin committed Mar 15, 2011
  4. @brian1324

    colorpickerImplementation

    brian1324 committed Mar 14, 2011
Commits on Mar 14, 2011
  1. @rajpara11

    Small hack that makes sure the fileUploads directory is created. Ever…

    …ything other than this one file will be ignored by gitIgnore however.
    rajpara11 committed Mar 14, 2011
  2. @rajpara11

    Uploading images works with two caveats. Images aren't resizable (Jqu…

    …ery bug I'm trying to find a good workaround for) and there are times when a blank image is displayed (I think this has something to do with Chrome and the way it's caching and updating indexes once the cache is cleared but I think this should work when it's not running locally)
    rajpara11 committed Mar 14, 2011
  3. @rajpara11
  4. @rajpara11

    Merge branch 'master' of github.com:filipmares/Automagical

    Conflicts:
    	.gitIgnore
    	app.js
    	public/src/automagical.js
    rajpara11 committed Mar 14, 2011
  5. @rajpara11
Commits on Mar 13, 2011
  1. Rendering of externally fetched pages greatly improved. All that does…

    …n't work is anything added to the page with javascript.
    @deniszgonjanin committed Mar 13, 2011
Something went wrong with that request. Please try again.