1
0
mirror of http://git.whoc.org.uk/git/password-manager.git synced 2024-11-14 18:09:03 +01:00
Commit Graph

234 Commits

Author SHA1 Message Date
Clipperz
0e9e543614 Simplified Backend property files
Removed extra info not actually used
2013-01-31 14:33:54 +01:00
Clipperz
1e19202f47 Improved the reporting of the MAC while building 2013-01-18 18:17:26 +01:00
Clipperz
969b9f94a2 Fixed error when importing data 2013-01-18 16:02:39 +01:00
Clipperz
fac609cf15 Fixed account preference saving
Saving preferences was still invoking an old method removed since the unification of the backend
2013-01-10 09:37:28 +01:00
Clipperz
6642b868f7 Fixed name of the exit page for /gamma 2013-01-09 15:13:32 +01:00
Clipperz
9741a93a9f Merge latest changes with public repository 2013-01-09 12:45:31 +01:00
Clipperz
8ef30d00eb Fixed conflict 2013-01-09 12:28:56 +01:00
Clipperz
6cfcbb8dee Merge branch 'master' of github.com:clipperz/password-manager
Conflicts:
	frontend/beta/css/yui-extensions/basic-dialog.css
2013-01-09 12:24:13 +01:00
Clipperz
f6903b9a56 Fixed application version display on /gamma 2013-01-09 12:05:50 +01:00
Clipperz
34726bbee8 Fixed application version display on /gamma 2013-01-09 11:56:27 +01:00
Clipperz
5996ee475c Fixed build script
Changed the build script in order to replace placeholders even if present multiple times
2013-01-09 11:37:39 +01:00
Clipperz
813c3245ee Fixed application version ID + link
Fixed the display of application version in /gamma, and added a link to the specific code version on GitHub
2013-01-09 11:06:20 +01:00
Clipperz
33e6f0ae77 Updated .gitignore
Added java source code and build script to the ignore file.

This allows to keep java code into the workarea in order to build release artifacts, without having to commit it to the public repository.
2013-01-09 10:05:40 +01:00
Clipperz
644891059e Added JQTouch and Zepto libraries
JQTouch and Zepto are tentatively used for the mobile version of Clipperz.
No final commitment has been made, though.
2013-01-09 10:03:53 +01:00
Clipperz
a9974c63bd Added properties for 'dev' backend
Added an extra 'dev' backend, useful when testing the application during development.

A dev-proxy script also helps in working separately on frontend and backend code.
2013-01-08 16:22:38 +01:00
Clipperz
816fc35420 Updated version of /gamma
Tons of changes, included a new draft of the mobile version (still VERY rough)
2013-01-08 16:21:04 +01:00
Clipperz
267603e3aa Fixed corrupted card problem
Changes that check for a weird condition that was causing cards to get corrupted.

A similar change has been applied also to /gamma (in a different commit, though)
2013-01-08 16:17:30 +01:00
Clipperz
b6a11a37ec Added references to static resources
Added the list of static resources that need to be copied when assembling the application
2013-01-08 16:16:09 +01:00
Clipperz
ea71029b55 Fixed image references 2013-01-08 16:15:20 +01:00
Clipperz
ab84f3c135 Fixed 'dump'
The new application layout (single backend with multiple versions of frontend application) handle 'dump' requests (aka 'offline copy') from a different url
2013-01-08 16:14:42 +01:00
Clipperz
25bd3085c5 Updated builder script 2013-01-08 16:12:19 +01:00
Clipperz
596e94dca4 Updated /beta images
Not sure exactly what the differences are, but 'git' marked them all as modified
2013-01-08 16:10:13 +01:00
Clipperz
2e9f8124d1 Fixed image paths in CSS files
CSS should not use external images (to let the offline copy work smoothly), but some resources are still external
2013-01-08 15:55:07 +01:00
Giulio Cesare Solaroli
0db1d5c8b1 Merge pull request #43 from jokajak/issue39
Add a fall-back repository class for SNAPSHOTS
2012-07-12 06:28:20 -07:00
Josh
28bcbca984 Add a fall-back repository class for SNAPSHOTS
Create a new SnapshotRepository class that returns SNAPSHOT as the version
Should let you build if there are any problems with your git repo
2012-06-19 12:04:50 -04:00
Giulio Cesare Solaroli
59d420a7da Merge pull request #41 from jokajak/compactFix
Fix the Clipperz Compact link
2012-06-16 00:24:17 -07:00
Giulio Cesare Solaroli
215d8fc16f Merge pull request #42 from jokajak/issue38
Remove reference to missing images
2012-06-16 00:23:07 -07:00
Giulio Cesare Solaroli
9ae34bd825 Merge pull request #40 from jokajak/issue37
fix the cancel button for editing cards
2012-06-16 00:22:01 -07:00
Josh
052d053102 Remove reference to missing images
This removes references to image files that are missing that don't
affect the display.
2012-06-15 22:41:01 -04:00
Josh
7bf1c8f74d Fix the Clipperz Compact link
The clipperz compact link should be relative to the current path
2012-06-15 21:46:56 -04:00
Josh
36b3236415 fix the cancel button for editing cards
The javascript was checking for the parameters assuming the backend
provided version information.  The community edition backend does not
supply any versioning information so the javascript checks both
locations
2012-06-15 21:26:30 -04:00
Giulio Cesare Solaroli
36ff1deefc Merge pull request #36 from jokajak/buildFix
add code to handle older version of GitPython
2012-03-18 18:35:36 -07:00
Josh
67ba4cd7b5 add code to handle older version of GitPython 2012-03-18 21:30:36 -04:00
Giulio Cesare Solaroli
758bd68eee Merge pull request #35 from gcsolaroli/master
Merged pull request #33
2012-03-17 14:30:29 -07:00
Giulio Cesare Solaroli
12cd9d47a6 Merge branch 'buildFix' of https://github.com/jokajak/password-manager
Conflicts:
	frontend/gamma/properties/gamma.properties.json
2012-03-17 21:28:40 +00:00
Giulio Cesare Solaroli
288b8df03a Merge pull request #34 from gcsolaroli/master
Fixed some resources
2012-03-17 14:18:52 -07:00
Giulio Cesare Solaroli
25029b9437 Updated /gamma web css 2012-03-17 21:10:14 +00:00
Giulio Cesare Solaroli
928f3f3ed3 Fixed frontend properties and updated MochiKit version 2012-03-17 21:08:23 +00:00
Josh
d791e1df1f define html.template for beta and gamma frontends 2012-03-17 16:47:23 -04:00
Josh
0e396afdc4 Merge remote-tracking branch 'upstream/master' 2012-03-17 15:29:33 -04:00
Giulio Cesare Solaroli
6f7ead0446 Merge pull request #32 from gcsolaroli/master
Improved build scripts
2012-03-17 08:11:14 -07:00
Giulio Cesare Solaroli
bf7d8191a3 Improved build scripts
Improved the detection of the correct repository class to use.

Signed-off-by: Giulio Cesare Solaroli <giulio.cesare@clipperz.com>
2012-03-17 15:10:02 +00:00
Giulio Cesare Solaroli
58ec03cc3d Merge pull request #31 from gcsolaroli/master
Updated build scripts
2012-03-17 07:43:30 -07:00
Giulio Cesare Solaroli
e61e994abb Merge branch 'buildScript' of https://github.com/jokajak/password-manager
Conflicts:
	scripts/builder/repository.py

Signed-off-by: Giulio Cesare Solaroli <giulio.cesare@clipperz.com>
2012-03-17 14:40:38 +00:00
Giulio Cesare Solaroli
65a7a7be3f Some fixes to build scripts getting ready to handle the mobile version
Signed-off-by: Giulio Cesare Solaroli <giulio.cesare@clipperz.com>
2012-03-17 14:26:08 +00:00
Josh
ff33328861 fix python backend properties 2012-03-13 10:34:16 -04:00
Josh
24f7bfcbe3 switch from dulwich to git-python
this fixes the areTherePendingChanges check
2012-03-06 22:09:32 -05:00
Josh
fc528c0f65 fix GitRepository revision function 2012-03-06 10:47:34 -05:00
Josh
5115ce2faf Check to make sure dulwich is available and print error 2012-03-06 10:44:48 -05:00
Josh
ba9eff02a0 Fix syntax problem in php.properties.json
was missing a ,
2012-03-06 10:43:42 -05:00