Commit Graph

109 Commits

Author SHA1 Message Date
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
Giulio Cesare Solaroli
e7e021141d Merge pull request #28 from gcsolaroli/master
Added static resources used by /beta when exiting the application
2012-03-03 14:06:27 -08:00
Giulio Cesare Solaroli
cf9c0c34e1 Added static resources used when exiting the application
Signed-off-by: Giulio Cesare Solaroli <giulio.cesare@clipperz.com>
2012-03-03 17:03:57 -05:00
Giulio Cesare Solaroli
a0661c3b02 Merge pull request #25 from gcsolaroli/master
Initial integration of /beta and /gamma with a single backend
2012-02-11 15:48:42 -08:00
Giulio Cesare Solaroli
7804333809 Updated the index_template files
Signed-off-by: Giulio Cesare Solaroli <giulio.cesare@clipperz.com>
2012-02-11 23:37:21 +00:00
Giulio Cesare Solaroli
185949cb77 Improved build scripts
Signed-off-by: Giulio Cesare Solaroli <giulio.cesare@clipperz.com>
2012-02-11 23:34:25 +00:00
Giulio Cesare Solaroli
17efce23d9 Merge branch 'master' of github.com:gcsolaroli/password-manager into php+gamma 2012-02-08 23:08:46 +00:00
Giulio Cesare Solaroli
96d01919d3 Merge pull request #24 from acozzette/master
Trivial change to setup/index.php in the PHP backend
2012-02-06 02:09:26 -08:00
Adam Cozzette
aa25544e0a Removing the @ sign in @mysql_connect so that if the MySQL module is not
installed, the Apache log will have an informative error message.
2012-02-05 21:51:07 +00:00
Giulio Cesare Solaroli
67455b069c Integration of PHP backend with /beta and /gamma front ends
Fixed PHP backend and /beta code to handle request and data format compatible with /gamma.
At the moment adding/deleting/editing records seem to work fine.
2011-10-23 18:36:57 +01:00
Giulio Cesare Solaroli
b312e037eb Merge pull request #10 from jokajak/timestamp_fix
timestamp fix
2011-10-09 06:10:11 -07:00
Josh
2cab484222 make is so that the records table can be created. drop the default/on update clauses 2011-10-07 09:10:14 -04:00
Giulio Cesare Solaroli
647a8a5391 Fixed the formatting of PHP code 2011-10-06 23:57:46 +01:00
Josh
a26b219b6f Fix timestamps on records
- update the access and update date when a record is saved
- set the creation date when a record is created
2011-10-05 21:58:00 -04:00
Giulio Cesare Solaroli
6ba274c79e Fixed the copyright headers 2011-10-06 01:36:10 +01:00
Giulio Cesare Solaroli
13ebf1b198 Merge pull request #7 from themiurgo/master
Fixes shebang for python builder scripts
2011-10-05 15:54:04 -07:00
Giulio Cesare Solaroli
bbd4157694 Merge pull request #8 from mbarulli/master
Revised README.md
2011-10-05 02:04:56 -07:00
Marco Barulli
f4c7a1ce03 Revised README.md 2011-10-05 11:01:44 +02:00
Antonio Lima
2a98e81b95 Fixing python path of builder scripts for environment support 2011-10-05 10:24:32 +02:00
Giulio Cesare Solaroli
3065be1b71 Merge branch 'timeout' 2011-10-05 00:24:50 +01:00
Giulio Cesare Solaroli
bf22713a72 Fixed code indentation 2011-10-05 00:23:06 +01:00
Giulio Cesare Solaroli
c53c209c9b Merge branch 'master' of github.com:clipperz/password-manager 2011-10-04 23:29:11 +01:00
Giulio Cesare Solaroli
eb06183a35 Merge pull request #6 from kuznetz/master
Russian Translate for Clipperz
2011-10-04 15:25:55 -07:00
Giulio Cesare Solaroli
9474b9ba38 Fixed the copyright header on the Russian translation file 2011-10-04 22:52:52 +01:00
kuznetz
212dfb8b02 Added Russian Language 2011-10-04 12:25:04 +03:00
Josh
d6f7343c97 send an exception when a session has timed out on the server side 2011-10-03 20:29:48 -04:00