Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Develop #899

Merged
merged 31 commits into from
Jan 18, 2017
Merged

Develop #899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
a56a1dc
Merge pull request #19 from edemo/master
Jan 11, 2017
a110fa0
#865
Jan 11, 2017
dd38d33
#865
Jan 11, 2017
14762b4
#702
Jan 11, 2017
144cb09
#702
Jan 11, 2017
5a88d5d
#702
Jan 11, 2017
48bfbb4
#702
Jan 11, 2017
655e601
#864
Jan 11, 2017
1cb286b
#864
Jan 11, 2017
7879aa7
#864
Jan 11, 2017
f8968a2
#864
Jan 11, 2017
7505245
Merge pull request #882 from edemo/html-fixes
magwas Jan 12, 2017
601bf10
Merge pull request #20 from edemo/develop
Jan 12, 2017
6e9c649
#885 normalize Id
Jan 12, 2017
ff787ba
Fix #878 Login with enter
Gerviba Jan 12, 2017
8373c73
Fix LoginE2E typo
Gerviba Jan 12, 2017
1698ac5
Fix merge conflicts
Gerviba Jan 13, 2017
9b9d66a
#789 add resend verify email button
Jan 13, 2017
ffad390
#876 checkbox size
Jan 13, 2017
9e5ad81
#871 login.html target _blank
Jan 13, 2017
df3075a
Fix branch conflicts
Gerviba Jan 14, 2017
7990ad4
#893 assurers list visible only on UI if the user have hashgiven & em…
Jan 14, 2017
628c520
Merge pull request #892 from edemo/submit-button
magwas Jan 14, 2017
00f7953
remove unused images
Jan 14, 2017
ef767a3
Merge branch 'UI-fixes' into develop
Jan 14, 2017
38a68e6
po generation cleaned up
magwas Jan 15, 2017
4ad2ab8
#911
Jan 18, 2017
66cc143
Merge branch 'develop' into html-fixes
Jan 18, 2017
0d097c8
reduced line height of the responsive menu items
Jan 18, 2017
c9a4d85
Merge pull request #913 from edemo/html-fixes
magwas Jan 18, 2017
c3534ba
Merge pull request #908 from magwas/feature/po_generation
Jan 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ doc/xml
doc/screenshots
.coverage
.settings
messages.pot
tmp/
lib/
doc/static
Expand Down
2 changes: 2 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,8 @@ doc/html/documentation.html: lib/saxon9he.jar doc/html/documentation.docbook doc
always:

messages.pot: always
rm -f messages.pot
touch messages.pot
xgettext -L Python -j --package-name=PDOauth -o messages.pot src/pdoauth/Messages.py
xgettext -L javascript -j --from-code=utf-8 --package-name=PDOauth -o messages.pot static/js/*.js

Expand Down
Loading